TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: tcsh: Update to 6.22.03.

Browse source 
* gnu/packages/patches/tcsh-fix-autotest.patch: Remove test hunk that no
longer applies.
* gnu/packages/shells.scm (tcsh): Update to 6.22.03.
[arguments]: Patch /usr/bin/env invocation.  Adjust the test mention above
with a substitution instead.
This commit is contained in:
Marius Bakke 2020-12-16 00:28:51 +01:00
parent 420ddd0a91
commit bca05d0709
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/patches/tcsh-fix-autotest.patch
View file

@ -63,17 +63,6 @@
AT_DATA([comment2.csh],
[[echo testing...@%:@\
--- tests/subst.at
+++ tests/subst.at
@@ -54,7 +54,7 @@ AT_CHECK([export HOME=$(getent passwd $(id -un) | awk -F: '{ print $(NF - 1) }')
, [1
])
-AT_CHECK([export HOME=$(getent passwd $(id -un) | awk -F: '{ print $(NF - 1) }'); echo "echo ~$(id -un)/foo; echo \"\$HOME/foo\"" | tcsh -f | uniq dnl
+AT_CHECK([export HOME=$(getent passwd $(id -un) | awk -F: '{ print $(NF - 1) }'); echo "echo ~$(id -un)//foo; echo \"\$HOME/foo\"" | tcsh -f | uniq dnl
| wc -l | tr -d ' \t'], , [1
])
--- tests/variables.at
+++ tests/variables.at
@@ -666,7 +666,8 @@ set listflags=(-xA $cwd/args.sh)

15
gnu/packages/shells.scm
View file

@ -16,6 +16,7 @@
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -372,7 +373,7 @@ (define-public es
(define-public tcsh
(package
(name "tcsh")
(version "6.22.02")
(version "6.22.03")
(source (origin
(method url-fetch)
;; Old tarballs are moved to old/.
@ -382,7 +383,7 @@ (define-public tcsh
"old/tcsh-" version ".tar.gz")))
(sha256
(base32
"0nw8prz1n0lmr82wnpyhrzmki630afn7p9cfgr3vl00vr9c72a7d"))
"1dv24bsp6faayinvwds092ylk9sb6894rl9ddm87y31a7mjzsb5y"))
(patches (search-patches "tcsh-fix-autotest.patch"))
(patch-flags '("-p0"))))
(build-system gnu-build-system)
@ -407,6 +408,16 @@ (define-public tcsh
;; Take care of pwd
(substitute* '("tests/commands.at" "tests/variables.at")
(("/bin/pwd") (which "pwd")))
(substitute* "Makefile"
;; Likewise for /usr/bin/env.
(("/usr/bin/env") "env")
;; Don't reset the environment (PATH, etc).
(("\\$\\(ENVCMD\\) -") "$(ENVCMD)"))
;; This test does not expect the home directory from
;; /etc/passwd to be '/'.
(substitute* "tests/subst.at"
(("\\$\\(id -un\\)/foo")
"$(id -un)//foo"))
;; The .at files create shell scripts without shebangs. Erk.
(substitute* "tests/commands.at"
(("./output.sh") "/bin/sh output.sh"))