[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/05: build-system/gnu: Make 'package-with-explicit-inputs' idempotent.
From: |
Ludovic Courtès |
Subject: |
05/05: build-system/gnu: Make 'package-with-explicit-inputs' idempotent. |
Date: |
Wed, 06 Jan 2016 22:08:34 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit d4aaf954011646413e7c2ca39a34030821e84910
Author: Ludovic Courtès <address@hidden>
Date: Wed Jan 6 22:56:01 2016 +0100
build-system/gnu: Make 'package-with-explicit-inputs' idempotent.
* guix/build-system/gnu.scm (package-with-explicit-inputs): Use
'ensure-keyword-arguments' instead of appending to ARGS.
* gnu/packages/commencement.scm (static-bash-for-glibc): Add missing
#:guile argument.
---
gnu/packages/commencement.scm | 5 +++--
guix/build-system/gnu.scm | 9 +++++----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 73b0ce4..73b27a2 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
;;; Copyright © 2014 Andreas Enge <address@hidden>
;;; Copyright © 2012 Nikita Karetnikov <address@hidden>
;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
@@ -434,7 +434,8 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a
\"address@hidden"~%"
("libc" ,glibc-final-with-bootstrap-bash)
,@(fold alist-delete %boot1-inputs
'("gcc" "libc")))
- (current-source-location)))))
+ (current-source-location)
+ #:guile %bootstrap-guile))))
(define gettext-boot0
;; A minimal gettext used during bootstrap.
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index c83c50b..9c53825 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -96,10 +96,11 @@ builder, or the distro's final Guile when GUILE is #f."
(package (inherit p)
(location (if (pair? loc) (source-properties->location loc) loc))
(arguments
- (let ((args (package-arguments p)))
- `(#:guile ,guile
- #:implicit-inputs? #f
- ,@args)))
+ ;; 'ensure-keyword-arguments' guarantees that this procedure is
+ ;; idempotent.
+ (ensure-keyword-arguments (package-arguments p)
+ `(#:guile ,guile
+ #:implicit-inputs? #f)))
(replacement
(let ((replacement (package-replacement p)))
(and replacement