diff options
Diffstat (limited to 'gnu/packages/shells.scm')
| -rw-r--r-- | gnu/packages/shells.scm | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 0d93a1b5cc..25ae0d8fe3 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -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> ;;; Copyright © 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net> ;;; @@ -296,12 +297,13 @@ and syntax highlighting.") ,(string-append func-path "/fenv.apply.fish") ,(string-append func-path "/fenv.main.fish")) (("bash") - (string-append (assoc-ref %build-inputs "bash") "/bin/bash")) + (search-input-file %build-inputs "/bin/bash")) (("sed") - (string-append (assoc-ref %build-inputs "sed") "/bin/sed")) + (search-input-file %build-inputs "/bin/sed")) ((" tr ") - (string-append " " (assoc-ref %build-inputs "coreutils") - "/bin/tr "))))))) + (string-append " " + (search-input-file %build-inputs "/bin/tr") + " "))))))) (inputs `(("bash" ,bash) ("coreutils" ,coreutils) @@ -392,7 +394,7 @@ written by Paul Haahr and Byron Rakitzis.") (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/. @@ -402,7 +404,7 @@ written by Paul Haahr and Byron Rakitzis.") "old/tcsh-" version ".tar.gz"))) (sha256 (base32 - "0nw8prz1n0lmr82wnpyhrzmki630afn7p9cfgr3vl00vr9c72a7d")) + "1dv24bsp6faayinvwds092ylk9sb6894rl9ddm87y31a7mjzsb5y")) (patches (search-patches "tcsh-fix-autotest.patch")) (patch-flags '("-p0")))) (build-system gnu-build-system) @@ -427,6 +429,16 @@ written by Paul Haahr and Byron Rakitzis.") ;; 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")) @@ -954,8 +966,7 @@ files and text.") (base32 "1db521jrs0yxwmvkkl8wssa8qyi0m62n69l7xxl2gpyz1v8nvw76")))) (build-system cargo-build-system) (arguments - `(#:rust ,rust-1.52 - #:tests? #false ;missing files + `(#:tests? #false ;missing files #:features '("extra") #:cargo-inputs (("rust-ctrlc" ,rust-ctrlc-3) |