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(-)
>
> 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 © 2012, 2014, 2015 Ludovic Courtès
> ;;; Copyright © 2014 David Thompson
> -;;; Copyright © 2015 Ricardo Wurmus
> +;;; Copyright © 2015, 2016 Ricardo Wurmus
> ;;; Copyright © 2015 Alex Kost
> ;;; Copyright © 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"))
> --
> 2.9.2
>
The patches look good to me. Also my quick test didn't show it causing
mass rebuilds.
--
Efraim Flashner אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
signature.asc
Description: PGP signature
