From 4dbef671029f6553b7c24bd3f7a831725c976b85 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Sep 2018 21:59:38 +0200 Subject: gnu: zsh: Use HTTPS. * gnu/packages/shells.scm (zsh)[source, home-page]: Use HTTPS. --- gnu/packages/shells.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/shells.scm') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 900c8ec686..684d723959 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -296,10 +296,10 @@ (define-public zsh (source (origin (method url-fetch) (uri (list (string-append - "http://www.zsh.org/pub/zsh-" version + "https://www.zsh.org/pub/zsh-" version ".tar.xz") (string-append - "http://www.zsh.org/pub/old/zsh-" version + "https://www.zsh.org/pub/old/zsh-" version ".tar.xz"))) (sha256 (base32 @@ -360,7 +360,7 @@ (define-public zsh for shell scripting. Zsh can be thought of as an extended Bourne shell with a large number of improvements, including some features of bash, ksh, and tcsh.") - (home-page "http://www.zsh.org/") + (home-page "https://www.zsh.org/") ;; The whole thing is under an MIT/X11-style license, but there's one ;; command, 'Completion/Unix/Command/_darcs', which is under GPLv2+. -- cgit v1.2.3 From 5a5d3e356311620df253d7c213c1bda79cd20128 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Sep 2018 21:58:34 +0200 Subject: gnu: zsh: Update to 5.6.1. * gnu/packages/shells.scm (zsh): Update to 5.6.1. --- gnu/packages/shells.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/shells.scm') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 684d723959..73e51da1cd 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -292,7 +292,7 @@ (define-public tcsh (define-public zsh (package (name "zsh") - (version "5.6") + (version "5.6.1") (source (origin (method url-fetch) (uri (list (string-append @@ -303,7 +303,7 @@ (define-public zsh ".tar.xz"))) (sha256 (base32 - "1mp6h2452z2029n12mxipjv4b0cc8i8sb72g8p8jklg8275iysvl")))) + "1s5kzfbfvixibb1sbzmmlrrx898zqwi5cfmnnq4bhcbx64zparlm")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre") #:phases -- cgit v1.2.3 From ff9008d8debae7b32a8d27da7ab2fef7c9322196 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 12 Sep 2018 15:17:45 -0400 Subject: gnu: Zsh: Remove workaround required for Zsh 5.6. This is a followup to commit 5a5d3e356311620df253d7c213c1bda79cd20128. * gnu/packages/shells.scm (zsh)[arguments]: Remove substitutions in 'patch-test' phase. --- gnu/packages/shells.scm | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'gnu/packages/shells.scm') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 73e51da1cd..c0f1c479ef 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -336,19 +336,6 @@ (define-public zsh (("command -pv") "command -v") (("command -p") "command ") (("'command' -p") "'command' ")) - ;; This file is ISO-8859-1 encoded. - (with-fluids ((%default-port-encoding #f)) - (substitute* "Test/A05execution.ztst" - ;; Help it find `sh` - (("PATH=/bin:\\$\\{ZTST_testdir\\}/command.tmp/ tstcmd-slashless") - (string-append "PATH=/bin:" - (assoc-ref %build-inputs "bash") "/bin:" - "${ZTST_testdir}/command.tmp/ tstcmd-slashless")) - ;; Help it find `echo` - (("PATH=/bin:\\$\\{ZTST_testdir\\}/command.tmp tstcmd-arg") - (string-append "PATH=/bin:" - (assoc-ref %build-inputs "coreutils") "/bin:" - "PATH=/bin:${ZTST_testdir}/command.tmp tstcmd-arg")))) #t))))) (native-inputs `(("autoconf" ,autoconf))) (inputs `(("ncurses" ,ncurses) -- cgit v1.2.3