build-system: Use 'modify-phases'.
* guix/build/cmake-build-system.scm (%standard-phases): Use 'modify-phases' instead of alist-*. * 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.
This commit is contained in:
		
							parent
							
								
									8ddc41e1f2
								
							
						
					
					
						commit
						f84218acae
					
				
					 7 changed files with 39 additions and 60 deletions
				
			
		|  | @ -1,5 +1,5 @@ | |||
| ;;; GNU Guix --- Functional package management for GNU | ||||
| ;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> | ||||
| ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> | ||||
| ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> | ||||
| ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr> | ||||
| ;;; | ||||
|  | @ -72,9 +72,9 @@ | |||
| (define %standard-phases | ||||
|   ;; Everything is as with the GNU Build System except for the `configure' | ||||
|   ;; and 'check' phases. | ||||
|   (alist-replace 'configure configure | ||||
|     (alist-replace 'check check | ||||
|                    gnu:%standard-phases))) | ||||
|   (modify-phases gnu:%standard-phases | ||||
|     (replace check check) | ||||
|     (replace configure configure))) | ||||
| 
 | ||||
| (define* (cmake-build #:key inputs (phases %standard-phases) | ||||
|                       #:allow-other-keys #:rest args) | ||||
|  |  | |||
|  | @ -239,13 +239,10 @@ needed." | |||
|          outputs)) | ||||
| 
 | ||||
| (define %standard-phases | ||||
|   (alist-cons-after | ||||
|    'install 'glib-or-gtk-wrap wrap-all-programs | ||||
|    (alist-cons-after | ||||
|     'install 'glib-or-gtk-icon-cache generate-icon-cache | ||||
|     (alist-cons-after | ||||
|      'install 'glib-or-gtk-compile-schemas compile-glib-schemas | ||||
|      gnu:%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))) | ||||
| 
 | ||||
| (define* (glib-or-gtk-build #:key inputs (phases %standard-phases) | ||||
|                             #:allow-other-keys #:rest args) | ||||
|  |  | |||
|  | @ -1,5 +1,5 @@ | |||
| ;;; GNU Guix --- Functional package management for GNU | ||||
| ;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org> | ||||
| ;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org> | ||||
| ;;; | ||||
| ;;; This file is part of GNU Guix. | ||||
| ;;; | ||||
|  | @ -82,14 +82,11 @@ | |||
| 
 | ||||
| (define %dist-phases | ||||
|   ;; Phases for building a source tarball. | ||||
|   (alist-replace | ||||
|    'unpack copy-source | ||||
|    (alist-cons-before | ||||
|     'configure 'autoreconf autoreconf | ||||
|     (alist-replace | ||||
|      'build build | ||||
|      (alist-replace | ||||
|       'install install-dist | ||||
|       (alist-delete 'strip %standard-phases)))))) | ||||
|   (modify-phases %standard-phases | ||||
|     (delete strip) | ||||
|     (replace install install-dist) | ||||
|     (replace build build) | ||||
|     (add-before configure autoreconf autoreconf) | ||||
|     (replace unpack copy-source))) | ||||
| 
 | ||||
| ;;; gnu-dist.scm ends here | ||||
|  |  | |||
|  | @ -1,5 +1,5 @@ | |||
| ;;; GNU Guix --- Functional package management for GNU | ||||
| ;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org> | ||||
| ;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org> | ||||
| ;;; | ||||
| ;;; This file is part of GNU Guix. | ||||
| ;;; | ||||
|  | @ -71,15 +71,11 @@ | |||
| (define %standard-phases | ||||
|   ;; Everything is as with the GNU Build System except for the `configure', | ||||
|   ;; `build', `check', and `install' phases. | ||||
|   (alist-replace | ||||
|    'configure configure | ||||
|    (alist-replace | ||||
|     'build build | ||||
|     (alist-replace | ||||
|      'check check | ||||
|      (alist-replace | ||||
|       'install install | ||||
|       gnu:%standard-phases))))) | ||||
|   (modify-phases gnu:%standard-phases | ||||
|     (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) | ||||
|  |  | |||
|  | @ -1,5 +1,5 @@ | |||
| ;;; GNU Guix --- Functional package management for GNU | ||||
| ;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org> | ||||
| ;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org> | ||||
| ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> | ||||
| ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> | ||||
| ;;; | ||||
|  | @ -122,19 +122,13 @@ installed with setuptools." | |||
| (define %standard-phases | ||||
|   ;; 'configure' and 'build' phases are not needed.  Everything is done during | ||||
|   ;; 'install'. | ||||
|   (alist-cons-before | ||||
|    'strip 'rename-pth-file | ||||
|    rename-pth-file | ||||
|    (alist-cons-after | ||||
|     'install 'wrap | ||||
|     wrap | ||||
|     (alist-replace | ||||
|      'build build | ||||
|      (alist-replace | ||||
|       'check check | ||||
|       (alist-replace 'install install | ||||
|                      (alist-delete 'configure | ||||
|                                    gnu:%standard-phases))))))) | ||||
|   (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))) | ||||
| 
 | ||||
| (define* (python-build #:key inputs (phases %standard-phases) | ||||
|                        #:allow-other-keys #:rest args) | ||||
|  |  | |||
|  | @ -62,13 +62,11 @@ directory." | |||
|                     (first-matching-file "\\.gem$"))))) | ||||
| 
 | ||||
| (define %standard-phases | ||||
|   (alist-replace | ||||
|    'build build | ||||
|    (alist-replace | ||||
|     'install install | ||||
|     (alist-replace | ||||
|      'check check | ||||
|      (alist-delete 'configure gnu:%standard-phases))))) | ||||
|   (modify-phases gnu:%standard-phases | ||||
|     (delete configure) | ||||
|     (replace build build) | ||||
|     (replace install install) | ||||
|     (replace check check))) | ||||
| 
 | ||||
| (define* (ruby-build #:key inputs (phases %standard-phases) | ||||
|                      #:allow-other-keys #:rest args) | ||||
|  |  | |||
|  | @ -69,14 +69,11 @@ | |||
|         (call-waf "install" params))) | ||||
| 
 | ||||
| (define %standard-phases | ||||
|   (alist-replace | ||||
|    'configure configure | ||||
|    (alist-replace | ||||
|     'build build | ||||
|     (alist-replace | ||||
|      'check check | ||||
|      (alist-replace 'install install | ||||
|                     gnu:%standard-phases))))) | ||||
|   (modify-phases gnu:%standard-phases | ||||
|     (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) | ||||
|  |  | |||
		Reference in a new issue