me
/
guix
Archived
1
0
Fork 0
Code

gnu: Refer to %GNU-BUILD-SYSTEM-MODULES instead of listing modules. 

* gnu/packages/cdrom.scm (cdparanoia)[arguments]: Refer to
  %GNU-BUILD-SYSTEM-MODULES instead of providing the actual list.
* gnu/packages/emacs.scm (magit, emacs-w3m, emacs-wget, emms):
  Likewise.
* gnu/packages/haskell.scm (ghc): Likewise.
* gnu/packages/samba.scm (samba): Likewise.
* gnu/packages/video.scm (ffmpeg): Likewise.
master
Ludovic Courtès 2015-04-01 15:41:55 +02:00
parent 8f3c3e84c2
commit 8ff3df5baa
5 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnu/packages/cdrom.scm
View File

@ -169,8 +169,7 @@ files.")
(guix build utils) (guix build utils)
(guix build rpath) (guix build rpath)
(srfi srfi-26)) (srfi srfi-26))
#:imported-modules ((guix build gnu-build-system) #:imported-modules (,@%gnu-build-system-modules
(guix build utils)
(guix build rpath)) (guix build rpath))
#:phases #:phases
(alist-cons-after (alist-cons-after

12
gnu/packages/emacs.scm
View File

@ -247,8 +247,7 @@ when typing parentheses directly or commenting out code line by line.")
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
(guix build utils) (guix build utils)
(guix build emacs-utils)) (guix build emacs-utils))
#:imported-modules ((guix build gnu-build-system) #:imported-modules (,@%gnu-build-system-modules
(guix build utils)
(guix build emacs-utils)) (guix build emacs-utils))
#:tests? #f ; no check target #:tests? #f ; no check target
#:phases #:phases
@ -308,8 +307,7 @@ operations.")
'(#:modules ((guix build gnu-build-system) '(#:modules ((guix build gnu-build-system)
(guix build utils) (guix build utils)
(guix build emacs-utils)) (guix build emacs-utils))
#:imported-modules ((guix build gnu-build-system) #:imported-modules (,@%gnu-build-system-modules
(guix build utils)
(guix build emacs-utils)) (guix build emacs-utils))
#:configure-flags #:configure-flags
(let ((out (assoc-ref %outputs "out"))) (let ((out (assoc-ref %outputs "out")))
@ -376,8 +374,7 @@ operations.")
'(#:modules ((guix build gnu-build-system) '(#:modules ((guix build gnu-build-system)
(guix build utils) (guix build utils)
(guix build emacs-utils)) (guix build emacs-utils))
#:imported-modules ((guix build gnu-build-system) #:imported-modules (,%gnu-build-system-modules
(guix build utils)
(guix build emacs-utils)) (guix build emacs-utils))
#:tests? #f ; no check target #:tests? #f ; no check target
#:phases #:phases
@ -444,8 +441,7 @@ operations.")
'(#:modules ((guix build gnu-build-system) '(#:modules ((guix build gnu-build-system)
(guix build utils) (guix build utils)
(guix build emacs-utils)) (guix build emacs-utils))
#:imported-modules ((guix build gnu-build-system) #:imported-modules (,%gnu-build-system-modules
(guix build utils)
(guix build emacs-utils)) (guix build emacs-utils))
#:phases (alist-replace #:phases (alist-replace

3
gnu/packages/haskell.scm
View File

@ -110,8 +110,7 @@
(guix build rpath) (guix build rpath)
(srfi srfi-26) (srfi srfi-26)
(srfi srfi-1)) (srfi srfi-1))
#:imported-modules ((guix build gnu-build-system) #:imported-modules (,%gnu-build-system-modules
(guix build utils)
(guix build rpath)) (guix build rpath))
#:configure-flags #:configure-flags
(list (list

5
gnu/packages/samba.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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 © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -127,8 +127,7 @@ anywhere.")
(guix build utils) (guix build utils)
(guix build rpath) (guix build rpath)
(srfi srfi-26)) (srfi srfi-26))
#:imported-modules ((guix build gnu-build-system) #:imported-modules (,%gnu-build-system-modules
(guix build utils)
(guix build rpath)) (guix build rpath))
;; This flag is required to allow for "make test". ;; This flag is required to allow for "make test".

3
gnu/packages/video.scm
View File

@ -283,8 +283,7 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).")
(guix build utils) (guix build utils)
(guix build rpath) (guix build rpath)
(srfi srfi-26)) (srfi srfi-26))
#:imported-modules ((guix build gnu-build-system) #:imported-modules (,@%gnu-build-system-modules
(guix build utils)
(guix build rpath)) (guix build rpath))
#:phases #:phases
(alist-replace (alist-replace