From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: Re: [PATCH 2/2] gnu: tcsh: Use modify-phases. Date: Fri, 24 Feb 2017 11:46:27 +0100 Message-ID: <8760jzhnng.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> References: <4c58555031f1a1c287bed3cf4a06054075498017.1487923947.git.leo@famulari.name> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37955) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chDOZ-0000A6-30 for guix-devel@gnu.org; Fri, 24 Feb 2017 05:46:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chDOV-0001JZ-Ve for guix-devel@gnu.org; Fri, 24 Feb 2017 05:46:39 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:35901) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1chDOV-0001HL-Qw for guix-devel@gnu.org; Fri, 24 Feb 2017 05:46:35 -0500 In-Reply-To: <4c58555031f1a1c287bed3cf4a06054075498017.1487923947.git.leo@famulari.name> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Leo Famulari , guix-devel@gnu.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable 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 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. Er= k. > + (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") >=20=20 > - ;; 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 > --=20 > 2.11.1 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAliwDwMACgkQoqBt8qM6 VPp5kwf/WSby4tVXpVG74bMLBXyKyuC4rP+iBkFhwH+hZ7tPGIWKFy2B0cq2uVTA oSV27nYzUpFMALvrSPIY3KW4WsekUodXLkRJWMPtCLOD4wmUa+gqXAaj7Yxr/eqc sjGHUCmifF4rXOOyYznyM6gqhibphqR6Uyb5xt9OOw3ZZaf+QK/ujgzx/G8u5Ha5 fsBhcv6WW7kWAMTZngNtw9XS/EydptId7L1Ie7ETSwIKwWsEiBYGeMtby2uUP5le A3WHeL5xBNwJqBhDdX6Ucfqop5ZLMmuH76b5KofuEPoQy1hMVhX8cg25jO/2MxC9 3yHZFHH7ZTou+5FKU49DdC2T698WAg== =OrEb -----END PGP SIGNATURE----- --=-=-=--