[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/10: build-system/gnu: Simplify 'dist-package'.
From: |
guix-commits |
Subject: |
06/10: build-system/gnu: Simplify 'dist-package'. |
Date: |
Wed, 17 Jun 2020 13:33:14 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 7488d70c555e9ecb9e41fad1b3cfd1234edbaa9d
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Jun 17 15:31:04 2020 +0200
build-system/gnu: Simplify 'dist-package'.
* guix/build-system/gnu.scm (dist-package): Use default keyword
arguments in 'substitute-keyword-arguments'.
---
guix/build-system/gnu.scm | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index 1085c62..60851c5 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -235,19 +235,15 @@ exact build phases are defined by PHASES."
(source s)
(arguments
;; Use the right phases and modules.
- (let* ((args (default-keyword-arguments (package-arguments p)
- `(#:phases #f
- #:modules ,%default-modules
- #:imported-modules ,%gnu-build-system-modules))))
- (substitute-keyword-arguments args
- ((#:modules modules)
- `((guix build gnu-dist)
- ,@modules))
- ((#:imported-modules modules)
- `((guix build gnu-dist)
- ,@modules))
- ((#:phases _)
- phases))))
+ (substitute-keyword-arguments (package-arguments p)
+ ((#:modules modules %default-modules)
+ `((guix build gnu-dist)
+ ,@modules))
+ ((#:imported-modules modules %gnu-build-system-modules)
+ `((guix build gnu-dist)
+ ,@modules))
+ ((#:phases _ #f)
+ phases)))
(native-inputs
;; Add autotools & co. as inputs.
(let ((ref (lambda (module var)
- branch master updated (94e72b7 -> 8b1f7c0), guix-commits, 2020/06/17
- 04/10: build-system/gnu: Remove Hydra-specific code from 'gnu-dist'., guix-commits, 2020/06/17
- 06/10: build-system/gnu: Simplify 'dist-package'.,
guix-commits <=
- 05/10: build-system/gnu: Remove redundant 'unpack' phase from 'gnu-dist'., guix-commits, 2020/06/17
- 02/10: build-system/gnu: Adjust 'dist-package' to current 'autoconf-wrapper' API., guix-commits, 2020/06/17
- 07/10: build-system/gnu: Rename "make dist" phase to 'build-dist'., guix-commits, 2020/06/17
- 01/10: gnu: gnurl: Update home page., guix-commits, 2020/06/17
- 03/10: build-system/gnu: Remove 'autoreconf' phase from 'gnu-dist'., guix-commits, 2020/06/17
- 08/10: news: Add entry for authenticated channels., guix-commits, 2020/06/17
- 09/10: channels: Warn when pulling from a mirror., guix-commits, 2020/06/17
- 10/10: .guix-channel: Add primary URL., guix-commits, 2020/06/17