aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-04-01 15:41:55 +0200
committerLudovic Courtès <ludo@gnu.org>2015-04-01 15:41:55 +0200
commit8ff3df5baa061d1de4fb999921a7db33bcbeb2ff (patch)
treea5ec4822c5497300cb83c0e597ce8f52248ffaa7
parent8f3c3e84c2af8185483119adbdaebc253f149dfb (diff)
downloadguix-8ff3df5baa061d1de4fb999921a7db33bcbeb2ff.tar
guix-8ff3df5baa061d1de4fb999921a7db33bcbeb2ff.tar.gz
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.
-rw-r--r--gnu/packages/cdrom.scm3
-rw-r--r--gnu/packages/emacs.scm12
-rw-r--r--gnu/packages/haskell.scm3
-rw-r--r--gnu/packages/samba.scm5
-rw-r--r--gnu/packages/video.scm3
5 files changed, 9 insertions, 17 deletions
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index 9af0ea7b09..e93503f25a 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -169,8 +169,7 @@ files.")
(guix build utils)
(guix build rpath)
(srfi srfi-26))
- #:imported-modules ((guix build gnu-build-system)
- (guix build utils)
+ #:imported-modules (,@%gnu-build-system-modules
(guix build rpath))
#:phases
(alist-cons-after
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index b844661fa1..dd4eb23cb4 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -247,8 +247,7 @@ when typing parentheses directly or commenting out code line by line.")
`(#:modules ((guix build gnu-build-system)
(guix build utils)
(guix build emacs-utils))
- #:imported-modules ((guix build gnu-build-system)
- (guix build utils)
+ #:imported-modules (,@%gnu-build-system-modules
(guix build emacs-utils))
#:tests? #f ; no check target
#:phases
@@ -308,8 +307,7 @@ operations.")
'(#:modules ((guix build gnu-build-system)
(guix build utils)
(guix build emacs-utils))
- #:imported-modules ((guix build gnu-build-system)
- (guix build utils)
+ #:imported-modules (,@%gnu-build-system-modules
(guix build emacs-utils))
#:configure-flags
(let ((out (assoc-ref %outputs "out")))
@@ -376,8 +374,7 @@ operations.")
'(#:modules ((guix build gnu-build-system)
(guix build utils)
(guix build emacs-utils))
- #:imported-modules ((guix build gnu-build-system)
- (guix build utils)
+ #:imported-modules (,%gnu-build-system-modules
(guix build emacs-utils))
#:tests? #f ; no check target
#:phases
@@ -444,8 +441,7 @@ operations.")
'(#:modules ((guix build gnu-build-system)
(guix build utils)
(guix build emacs-utils))
- #:imported-modules ((guix build gnu-build-system)
- (guix build utils)
+ #:imported-modules (,%gnu-build-system-modules
(guix build emacs-utils))
#:phases (alist-replace
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 183d0eb4cb..a5656d0b91 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -110,8 +110,7 @@
(guix build rpath)
(srfi srfi-26)
(srfi srfi-1))
- #:imported-modules ((guix build gnu-build-system)
- (guix build utils)
+ #:imported-modules (,%gnu-build-system-modules
(guix build rpath))
#:configure-flags
(list
diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index c147abcaab..d26d2d7789 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -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 © 2015 Mark H Weaver <mhw@netris.org>
;;;
;;; This file is part of GNU Guix.
@@ -127,8 +127,7 @@ anywhere.")
(guix build utils)
(guix build rpath)
(srfi srfi-26))
- #:imported-modules ((guix build gnu-build-system)
- (guix build utils)
+ #:imported-modules (,%gnu-build-system-modules
(guix build rpath))
;; This flag is required to allow for "make test".
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 8223a3fa70..b8b9d4bd9c 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -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 rpath)
(srfi srfi-26))
- #:imported-modules ((guix build gnu-build-system)
- (guix build utils)
+ #:imported-modules (,@%gnu-build-system-modules
(guix build rpath))
#:phases
(alist-replace