[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/08: gnu: Refer to %GNU-BUILD-SYSTEM-MODULES instead of listing module
From: |
Ludovic Courtès |
Subject: |
06/08: gnu: Refer to %GNU-BUILD-SYSTEM-MODULES instead of listing modules. |
Date: |
Wed, 01 Apr 2015 15:11:15 +0000 |
civodul pushed a commit to branch core-updates
in repository guix.
commit 8ff3df5baa061d1de4fb999921a7db33bcbeb2ff
Author: Ludovic Courtès <address@hidden>
Date: Wed Apr 1 15:41:55 2015 +0200
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.
---
gnu/packages/cdrom.scm | 3 +--
gnu/packages/emacs.scm | 12 ++++--------
gnu/packages/haskell.scm | 3 +--
gnu/packages/samba.scm | 5 ++---
gnu/packages/video.scm | 3 +--
5 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index 9af0ea7..e93503f 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 b844661..dd4eb23 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 183d0eb..a5656d0 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 c147abc..d26d2d7 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 <address@hidden>
+;;; Copyright © 2013, 2015 Ludovic Courtès <address@hidden>
;;; Copyright © 2015 Mark H Weaver <address@hidden>
;;;
;;; 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 8223a3f..b8b9d4b 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
- branch core-updates updated (4c0d38b -> 112da58), Ludovic Courtès, 2015/04/01
- 03/08: gremlin: Guard against invalid ELF segments., Ludovic Courtès, 2015/04/01
- 01/08: gnu: node: Remove unneeded import., Ludovic Courtès, 2015/04/01
- 05/08: gnu: Remove unneeded uses of #:imported-modules., Ludovic Courtès, 2015/04/01
- 04/08: build-system: Factorize the list of modules imported on the build side., Ludovic Courtès, 2015/04/01
- 02/08: gremlin: Add libnsl to libc's library list., Ludovic Courtès, 2015/04/01
- 06/08: gnu: Refer to %GNU-BUILD-SYSTEM-MODULES instead of listing modules.,
Ludovic Courtès <=
- 07/08: utils: Make the second 'find-files' argument optional., Ludovic Courtès, 2015/04/01
- 08/08: build-system/gnu: Add 'validate-runpath' phase., Ludovic Courtès, 2015/04/01