From d4aaf954011646413e7c2ca39a34030821e84910 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 6 Jan 2016 22:56:01 +0100 Subject: 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 73b0ce4364..73b27a290a 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 +;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2014 Andreas Enge ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2014, 2015 Mark H Weaver @@ -434,7 +434,8 @@ (define static-bash-for-glibc ("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 c83c50b76e..9c53825c4a 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -96,10 +96,11 @@ (define rewritten-input (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 -- cgit v1.2.3