~ruther/guix-local

f8503e2b2588391c4c0f8d8dd11ef3e9449a2884 — Ludovic Courtès 11 years ago 023dd28
utils: 'modify-phases' no longer introduces quotes.

Suggested by Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>.

* guix/build/utils.scm (%modify-phases): Remove quotes.
* guix/build/cmake-build-system.scm (%standard-phases): Adjust
  accordingly.
* guix/build/glib-or-gtk-build-system.scm (%standard-phases): Likewise.
* guix/build/gnu-dist.scm (%dist-phases): Likewise.
* guix/build/perl-build-system.scm (%standard-phases): Likewise.
* guix/build/python-build-system.scm (%standard-phases): Likewise.
* guix/build/ruby-build-system.scm (%standard-phases): Likewise.
* guix/build/waf-build-system.scm (%standard-phases): Likewise.
* gnu/packages/bash.scm, gnu/packages/code.scm, gnu/packages/gl.scm,
  gnu/packages/gnome.scm, gnu/packages/graphics.scm,
  gnu/packages/image.scm, gnu/packages/key-mon.scm,
  gnu/packages/ocr.scm, gnu/packages/plotutils.scm,
  gnu/packages/search.scm, gnu/packages/video.scm: Likewise.
M gnu/packages/bash.scm => gnu/packages/bash.scm +2 -2
@@ 193,8 193,8 @@ number/base32-hash tuples, directly usable in the 'patch-series' form."
        #:tests? #f

        #:phases (modify-phases %standard-phases
                   (add-after install post-install ,post-install-phase)
                   (add-after install install-headers
                   (add-after 'install 'post-install ,post-install-phase)
                   (add-after 'install 'install-headers
                              ,install-headers-phase))))
     (synopsis "The GNU Bourne-Again SHell")
     (description

M gnu/packages/code.scm => gnu/packages/code.scm +4 -4
@@ 142,8 142,8 @@ a large, deeply nested project.")
    (build-system gnu-build-system)
    (arguments
     '(#:phases (modify-phases %standard-phases
                  (delete configure)
                  (add-before build make-dotl-files-older
                  (delete 'configure)
                  (add-before 'build 'make-dotl-files-older
                              (lambda _
                                ;; Make the '.l' files as old as the '.c'
                                ;; files to avoid triggering the rule that


@@ 155,7 155,7 @@ a large, deeply nested project.")
                                            (set-file-time file ref))
                                          (find-files "." "\\.[chl]$"))
                                #t))
                  (add-before install make-target-directories
                  (add-before 'install 'make-target-directories
                              (lambda* (#:key outputs #:allow-other-keys)
                                (let ((out (assoc-ref outputs "out")))
                                  (mkdir-p (string-append out "/bin"))


@@ 163,7 163,7 @@ a large, deeply nested project.")
                                                          "/share/man/man1"))
                                  (mkdir-p (string-append out
                                                          "/share/doc")))))
                  (replace check
                  (replace 'check
                           (lambda _
                             (setenv "HOME" (getcwd))
                             (setenv "PATH"

M gnu/packages/gl.scm => gnu/packages/gl.scm +6 -6
@@ 149,7 149,7 @@ Polygon meshes, and Extruded polygon meshes")
    (arguments
     '(#:phases
       (modify-phases %standard-phases
         (add-after unpack autogen
         (add-after 'unpack 'autogen
          (lambda _
            (zero? (system* "sh" "autogen.sh")))))))
    (home-page "https://github.com/divVerent/s2tc")


@@ 282,10 282,10 @@ emulation to complete hardware acceleration for modern GPUs.")
    (arguments
     '(#:phases
       (modify-phases %standard-phases
         (delete configure)
         (delete build)
         (delete check)
         (replace install
         (delete 'configure)
         (delete 'build)
         (delete 'check)
         (replace 'install
                  (lambda* (#:key outputs #:allow-other-keys)
                    (copy-recursively "include" (string-append
                                                 (assoc-ref outputs "out")


@@ 318,7 318,7 @@ emulation to complete hardware acceleration for modern GPUs.")
     '(#:phases
       (modify-phases %standard-phases
         (replace
          install
          'install
          (lambda* (#:key outputs #:allow-other-keys)
            (let ((out (assoc-ref outputs "out")))
              (mkdir-p (string-append out "/bin"))

M gnu/packages/gnome.scm => gnu/packages/gnome.scm +2 -2
@@ 1639,11 1639,11 @@ library.")
    (arguments
     '(#:phases
       (modify-phases %standard-phases
         (add-before configure patch-/bin/true
         (add-before 'configure 'patch-/bin/true
                     (lambda _
                       (substitute* "configure"
                         (("/bin/true") (which "true")))))
         (add-after install wrap-pixbuf
         (add-after 'install 'wrap-pixbuf
                    ;; Use librsvg's loaders.cache to support SVG files.
                    (lambda* (#:key inputs outputs #:allow-other-keys)
                      (let* ((out    (assoc-ref outputs "out"))

M gnu/packages/graphics.scm => gnu/packages/graphics.scm +2 -2
@@ 181,14 181,14 @@ output.")
    (build-system gnu-build-system)
    (arguments
     `(#:phases (modify-phases %standard-phases
                  (replace configure
                  (replace 'configure
                           (lambda* (#:key outputs #:allow-other-keys)
                             (let ((out (assoc-ref outputs "out")))
                               (chdir "trunk")
                               (zero? (system* "qmake"
                                               (string-append
                                                "prefix=" out))))))
                  (add-after install wrap-program
                  (add-after 'install 'wrap-program
                             (lambda* (#:key outputs #:allow-other-keys)
                               (let* ((out (assoc-ref outputs "out"))
                                      (bin (string-append out "/bin"))

M gnu/packages/image.scm => gnu/packages/image.scm +2 -2
@@ 204,11 204,11 @@ the W3C's XML-based Scaleable Vector Graphic (SVG) format.")
       (modify-phases %standard-phases
         ;; Prevent make from trying to regenerate config.h.in.
         (add-after
          unpack set-config-h-in-file-time
          'unpack 'set-config-h-in-file-time
          (lambda _
            (set-file-time "config/config.h.in" (stat "configure"))))
         (add-after
          unpack patch-reg-wrapper
          'unpack 'patch-reg-wrapper
          (lambda _
            (substitute* "prog/reg_wrapper.sh"
              ((" /bin/sh ")

M gnu/packages/key-mon.scm => gnu/packages/key-mon.scm +1 -1
@@ 42,7 42,7 @@
    (arguments
     `(#:python ,python-2                    ;uses the Python 2 'print' syntax
       #:phases (modify-phases %standard-phases
                  (add-after install wrap
                  (add-after 'install 'wrap
                             (lambda* (#:key inputs outputs #:allow-other-keys)
                               (let* ((out  (assoc-ref outputs "out"))
                                      (bin  (string-append out "/bin"))

M gnu/packages/ocr.scm => gnu/packages/ocr.scm +1 -1
@@ 76,7 76,7 @@ it produces text in 8-bit or UTF-8 formats.")
     '(#:phases
       (modify-phases %standard-phases
         (add-after
          unpack autogen
          'unpack 'autogen
          (lambda _
            (zero? (system* "sh" "autogen.sh")))))
       #:configure-flags

M gnu/packages/plotutils.scm => gnu/packages/plotutils.scm +3 -3
@@ 118,13 118,13 @@ using the Cairo drawing library.")
     '(#:tests? #f
       #:phases
       (modify-phases %standard-phases
         (replace configure (lambda _ (chdir "src")))
         (add-before install make-target-directories
         (replace 'configure (lambda _ (chdir "src")))
         (add-before 'install 'make-target-directories
                     (lambda* (#:key outputs #:allow-other-keys)
                       (let ((out (assoc-ref outputs "out")))
                         (mkdir-p (string-append out "/bin"))
                         #t)))
         (add-after install install-prefabs
         (add-after 'install 'install-prefabs
                    (lambda* (#:key outputs #:allow-other-keys)
                      (let* ((out (assoc-ref outputs "out"))
                             (dir (string-append out

M gnu/packages/search.scm => gnu/packages/search.scm +3 -3
@@ 76,10 76,10 @@ rich set of boolean query operators.")
    (arguments
     `(#:phases (modify-phases %standard-phases
                  (add-before
                   configure chdir-source
                   'configure 'chdir-source
                   (lambda _ (chdir "libtocc/src")))
                  (replace
                   check
                   'check
                   (lambda _
                     (with-directory-excursion "../tests"
                       (and (zero? (system* "./configure"


@@ 113,7 113,7 @@ files and directories.")
     `(#:tests? #f                      ;No tests
       #:phases (modify-phases %standard-phases
                  (add-after
                   unpack chdir-source
                   'unpack 'chdir-source
                   (lambda _ (chdir "cli/src"))))))
    (home-page "http://t-o-c-c.com/")
    (synopsis "Command-line interface to libtocc")

M gnu/packages/video.scm => gnu/packages/video.scm +3 -3
@@ 738,12 738,12 @@ several areas.")
     '(#:phases
       (modify-phases %standard-phases
         (add-before
          configure setup-waf
          'configure 'setup-waf
          (lambda* (#:key inputs #:allow-other-keys)
            (copy-file (assoc-ref inputs "waf") "waf")
            (setenv "CC" "gcc")))
         (add-before
          configure patch-wscript
          'configure 'patch-wscript
          (lambda* (#:key inputs #:allow-other-keys)
            (substitute* "wscript"
              ;; XXX Remove this when our Samba package provides a .pc file.


@@ 1219,7 1219,7 @@ capabilities.")
     '(#:phases
       (modify-phases %standard-phases
         (add-after
          unpack autogen
          'unpack 'autogen
          (lambda _
            (zero? (system* "sh" "autogen.sh")))))))
    (home-page "http://www.vapoursynth.com/")

M guix/build/cmake-build-system.scm => guix/build/cmake-build-system.scm +2 -2
@@ 73,8 73,8 @@
  ;; Everything is as with the GNU Build System except for the `configure'
  ;; and 'check' phases.
  (modify-phases gnu:%standard-phases
    (replace check check)
    (replace configure configure)))
    (replace 'check check)
    (replace 'configure configure)))

(define* (cmake-build #:key inputs (phases %standard-phases)
                      #:allow-other-keys #:rest args)

M guix/build/glib-or-gtk-build-system.scm => guix/build/glib-or-gtk-build-system.scm +3 -3
@@ 240,9 240,9 @@ needed."

(define %standard-phases
  (modify-phases gnu:%standard-phases
    (add-after install glib-or-gtk-compile-schemas compile-glib-schemas)
    (add-after install glib-or-gtk-icon-cache generate-icon-cache)
    (add-after install glib-or-gtk-wrap wrap-all-programs)))
    (add-after 'install 'glib-or-gtk-compile-schemas compile-glib-schemas)
    (add-after 'install 'glib-or-gtk-icon-cache generate-icon-cache)
    (add-after 'install 'glib-or-gtk-wrap wrap-all-programs)))

(define* (glib-or-gtk-build #:key inputs (phases %standard-phases)
                            #:allow-other-keys #:rest args)

M guix/build/gnu-dist.scm => guix/build/gnu-dist.scm +5 -5
@@ 83,10 83,10 @@
(define %dist-phases
  ;; Phases for building a source tarball.
  (modify-phases %standard-phases
    (delete strip)
    (replace install install-dist)
    (replace build build)
    (add-before configure autoreconf autoreconf)
    (replace unpack copy-source)))
    (delete 'strip)
    (replace 'install install-dist)
    (replace 'build build)
    (add-before 'configure 'autoreconf autoreconf)
    (replace 'unpack copy-source)))

;;; gnu-dist.scm ends here

M guix/build/perl-build-system.scm => guix/build/perl-build-system.scm +4 -4
@@ 72,10 72,10 @@
  ;; Everything is as with the GNU Build System except for the `configure',
  ;; `build', `check', and `install' phases.
  (modify-phases gnu:%standard-phases
    (replace install install)
    (replace check check)
    (replace build build)
    (replace configure configure)))
    (replace 'install install)
    (replace 'check check)
    (replace 'build build)
    (replace 'configure configure)))

(define* (perl-build #:key inputs (phases %standard-phases)
                     #:allow-other-keys #:rest args)

M guix/build/python-build-system.scm => guix/build/python-build-system.scm +6 -6
@@ 123,12 123,12 @@ installed with setuptools."
  ;; 'configure' and 'build' phases are not needed.  Everything is done during
  ;; 'install'.
  (modify-phases gnu:%standard-phases
    (delete configure)
    (replace install install)
    (replace check check)
    (replace build build)
    (add-after install wrap wrap)
    (add-before strip rename-pth-file rename-pth-file)))
    (delete 'configure)
    (replace 'install install)
    (replace 'check check)
    (replace 'build build)
    (add-after 'install 'wrap wrap)
    (add-before 'strip 'rename-pth-file rename-pth-file)))

(define* (python-build #:key inputs (phases %standard-phases)
                       #:allow-other-keys #:rest args)

M guix/build/ruby-build-system.scm => guix/build/ruby-build-system.scm +5 -5
@@ 72,11 72,11 @@ directory."

(define %standard-phases
  (modify-phases gnu:%standard-phases
    (delete configure)
    (add-after unpack gitify gitify)
    (replace build build)
    (replace install install)
    (replace check check)))
    (delete 'configure)
    (add-after 'unpack 'gitify gitify)
    (replace 'build build)
    (replace 'install install)
    (replace 'check check)))

(define* (ruby-build #:key inputs (phases %standard-phases)
                     #:allow-other-keys #:rest args)

M guix/build/utils.scm => guix/build/utils.scm +4 -4
@@ 446,13 446,13 @@ an expression evaluating to a procedure."
(define-syntax %modify-phases
  (syntax-rules (delete replace add-before add-after)
    ((_ phases (delete old-phase-name))
     (alist-delete 'old-phase-name phases))
     (alist-delete old-phase-name phases))
    ((_ phases (replace old-phase-name new-phase))
     (alist-replace 'old-phase-name new-phase phases))
     (alist-replace old-phase-name new-phase phases))
    ((_ phases (add-before old-phase-name new-phase-name new-phase))
     (alist-cons-before 'old-phase-name 'new-phase-name new-phase phases))
     (alist-cons-before old-phase-name new-phase-name new-phase phases))
    ((_ phases (add-after old-phase-name new-phase-name new-phase))
     (alist-cons-after 'old-phase-name 'new-phase-name new-phase phases))))
     (alist-cons-after old-phase-name new-phase-name new-phase phases))))


;;;

M guix/build/waf-build-system.scm => guix/build/waf-build-system.scm +4 -4
@@ 70,10 70,10 @@

(define %standard-phases
  (modify-phases gnu:%standard-phases
    (replace configure configure)
    (replace build build)
    (replace check check)
    (replace install install)))
    (replace 'configure configure)
    (replace 'build build)
    (replace 'check check)
    (replace 'install install)))

(define* (waf-build #:key inputs (phases %standard-phases)
                       #:allow-other-keys #:rest args)