From mboxrd@z Thu Jan 1 00:00:00 1970 From: Efraim Flashner Subject: Re: [PATCH 1/2] gnu: man-db: Use modify-phases syntax. Date: Wed, 7 Sep 2016 12:05:17 +0300 Message-ID: <20160907090517.GD25070@macbook42.flashner.co.il> References: <20160907084707.11557-1-rekado@elephly.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="0H629O+sVkh21xTi" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:42630) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhYnV-00074C-7N for guix-devel@gnu.org; Wed, 07 Sep 2016 05:05:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bhYnP-0005JF-8W for guix-devel@gnu.org; Wed, 07 Sep 2016 05:05:32 -0400 Received: from flashner.co.il ([178.62.234.194]:39373) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhYnO-0005Hs-Ss for guix-devel@gnu.org; Wed, 07 Sep 2016 05:05:27 -0400 Content-Disposition: inline In-Reply-To: <20160907084707.11557-1-rekado@elephly.net> 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: Ricardo Wurmus Cc: guix-devel@gnu.org --0H629O+sVkh21xTi Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Sep 07, 2016 at 10:47:06AM +0200, Ricardo Wurmus wrote: > * gnu/packages/man.scm (man-db)[arguments]: Use modify-phases syntax. > --- > gnu/packages/man.scm | 25 ++++++++++++------------- > 1 file changed, 12 insertions(+), 13 deletions(-) >=20 > diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm > index 9ffbba9..a5ee2d3 100644 > --- a/gnu/packages/man.scm > +++ b/gnu/packages/man.scm > @@ -1,7 +1,7 @@ > ;;; GNU Guix --- Functional package management for GNU > ;;; Copyright =C2=A9 2012, 2014, 2015 Ludovic Court=C3=A8s > ;;; Copyright =C2=A9 2014 David Thompson > -;;; Copyright =C2=A9 2015 Ricardo Wurmus > +;;; Copyright =C2=A9 2015, 2016 Ricardo Wurmus > ;;; Copyright =C2=A9 2015 Alex Kost > ;;; Copyright =C2=A9 2015, 2016 Efraim Flashner > ;;; > @@ -69,18 +69,17 @@ a flexible and convenient way.") > (build-system gnu-build-system) > (arguments > '(#:phases > - (alist-cons-after > - 'patch-source-shebangs 'patch-test-shebangs > - (lambda* (#:key outputs #:allow-other-keys) > - ;; Patch shebangs in test scripts. > - (let ((out (assoc-ref outputs "out"))) > - (for-each (lambda (file) > - (substitute* file > - (("#! /bin/sh") > - (string-append "#!" (which "sh"))))) > - (remove file-is-directory? > - (find-files "src/tests" ".*"))))) > - %standard-phases) > + (modify-phases %standard-phases > + (add-after 'patch-source-shebangs 'patch-test-shebangs > + (lambda* (#:key outputs #:allow-other-keys) > + ;; Patch shebangs in test scripts. > + (let ((out (assoc-ref outputs "out"))) > + (for-each (lambda (file) > + (substitute* file > + (("#! /bin/sh") > + (string-append "#!" (which "sh"))))) > + (remove file-is-directory? > + (find-files "src/tests" ".*"))))))) > #:configure-flags > (let ((groff (assoc-ref %build-inputs "groff")) > (less (assoc-ref %build-inputs "less")) > --=20 > 2.9.2 >=20 The patches look good to me. Also my quick test didn't show it causing mass rebuilds. --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --0H629O+sVkh21xTi Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJXz9hNAAoJEPTB05F+rO6TOt4P/328QSZR381LPC7EXN6jU5dH xXda+Vthej94AOojIsZAs8y7rbG8GnjA/SLK7a9H3EKXvae4z9+WVneEhIUKK41z c+mgRNEkVVdseENOuEALEWp+GQGQh1PomVeKXmXOigOwB51QrZ9oHsKjVnjQbRrb 0WEn5i/oo4WHRQXDYzuHbdIOhgrUZ25qbt1JrRRNL0wN5VWMjEtcU3H68+HNzE2r FZhATBiKyWztV2HdOhLdmPMoX8lA3MuiSMWkX2ItMvy8uOlxAqttSV0dYqbTxi8u Pfw/YkTjYqO7V/Nai7VafbWsQaFDljB2v3kVA8uzKFwQ4X+yehc9Bf4B0LYOq8uV QCjjx6p6h5l/QoBk7ZWKMG6Z+SwpdYv4TrnqcUgi4gl4zc3qQJ1Vo9ICA8vC0pYf eimP/gUPnANa+b2i0tJBsFzNtYeSS1WTDN4Bgu+4VaJN36n/NzHGnVnDQc1kJimu 0NAKLjnMlO3KPKn8ws07CTRBta+BVs7tYn7WkBlqT4LDoMgPDs5sVV0tYb4Tuf1S ulkSUgeeOF3F614Ax3ffv38diwmeuQlHYiozqpHuWfqDTj26yFpveJkKb5k6x5O0 vJ74akSXi4RScw2ZzMZJE2JbRNJ2vajwP376IhHg5WswlTvyvIvimF8mxC08pXq4 lwykkbd3vteOu5nF7W8q =IDhd -----END PGP SIGNATURE----- --0H629O+sVkh21xTi--