Hi Leo, thanks for this update! The patch looks good, but please add a #t at the end of the 'patch-test-scripts' and 'post-install' phases with the second commit.
Leo Famulari <l...@famulari.name> writes: > * gnu/packages/shells.scm (tcsh)[arguments]: Use modify-phases. > --- > gnu/packages/shells.scm | 48 +++++++++++++++++++++++------------------------- > 1 file changed, 23 insertions(+), 25 deletions(-) > > diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm > index d9e0f93a1..ef5ed8040 100644 > --- a/gnu/packages/shells.scm > +++ b/gnu/packages/shells.scm > @@ -240,32 +240,30 @@ written by Paul Haahr and Byron Rakitzis.") > `(("ncurses" ,ncurses))) > (arguments > `(#:phases > - (alist-cons-before > - 'check 'patch-test-scripts > - (lambda _ > - ;; Take care of pwd > - (substitute* '("tests/commands.at" "tests/variables.at") > - (("/bin/pwd") (which "pwd"))) > - ;; The .at files create shell scripts without shebangs. Erk. > - (substitute* "tests/commands.at" > - (("./output.sh") "/bin/sh output.sh")) > - (substitute* "tests/syntax.at" > - (("; other_script.csh") "; /bin/sh other_script.csh")) > - ;; Now, let's generate the test suite and patch it > - (system* "make" "tests/testsuite") > + (modify-phases %standard-phases > + (add-before 'check 'patch-test-scripts > + (lambda _ > + ;; Take care of pwd > + (substitute* '("tests/commands.at" "tests/variables.at") > + (("/bin/pwd") (which "pwd"))) > + ;; The .at files create shell scripts without shebangs. Erk. > + (substitute* "tests/commands.at" > + (("./output.sh") "/bin/sh output.sh")) > + (substitute* "tests/syntax.at" > + (("; other_script.csh") "; /bin/sh other_script.csh")) > + ;; Now, let's generate the test suite and patch it > + (system* "make" "tests/testsuite") > > - ;; This file is ISO-8859-1 encoded. > - (with-fluids ((%default-port-encoding #f)) > - (substitute* "tests/testsuite" > - (("/bin/sh") (which "sh"))))) > - (alist-cons-after > - 'install 'post-install > - (lambda* (#:key inputs outputs #:allow-other-keys) > - (let* ((out (assoc-ref %outputs "out")) > - (bin (string-append out "/bin"))) > - (with-directory-excursion bin > - (symlink "tcsh" "csh")))) > - %standard-phases)))) > + ;; This file is ISO-8859-1 encoded. > + (with-fluids ((%default-port-encoding #f)) > + (substitute* "tests/testsuite" > + (("/bin/sh") (which "sh")))))) > + (add-after 'install 'post-install > + (lambda* (#:key inputs outputs #:allow-other-keys) > + (let* ((out (assoc-ref %outputs "out")) > + (bin (string-append out "/bin"))) > + (with-directory-excursion bin > + (symlink "tcsh" "csh")))))))) > (home-page "http://www.tcsh.org/") > (synopsis "Unix shell based on csh") > (description > -- > 2.11.1
signature.asc
Description: PGP signature