Subject: [PATCH] bash.scm: fix keyword order in 'bash-minimal'
From: Sergei Trofimovich <[email-masked]>
To: [email-masked]
Cc: Andy Wingo <[email-masked]>, rennes <[email-masked]>, Ludovic Courtès <[email-masked]>, Manolis Ragkousis <[email-masked]>, Sergei Trofimovich <[email-masked]>
Date: Fri, 5 May 2017 22:51:25 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

'bash-minimal' is a package derived from 'bash' package.
'bash-minimal' is supposed to override keywords from
'bash', but does not do it due to ordering issue.

Patch changes order
from "#:modules ... 'bash'-keywords"
to   "'bash'-keywords #:modules ..."

That fixes guix bootstrap failure on core-updates
reported by rennes, Manolis Ragkousis and tracked
down by Andy Wingo in:
    https://lists.gnu.org/archive/html/guix-devel/2017-05/msg00010.html

* gnu/packages/bash.scm(bash-minimal): fix #:modules ordering

Signed-off-by: Sergei Trofimovich <[email-masked]>
---
 gnu/packages/bash.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm
index ef22728a9..38aa1786e 100644
--- a/gnu/packages/bash.scm
+++ b/gnu/packages/bash.scm
@@ -211,11 +211,11 @@ without modification.")
     (outputs (delete "include" (package-outputs bash)))
 
     (arguments
-     (let ((args `(#:modules ((guix build gnu-build-system)
+     (let ((args `(,@(package-arguments bash)
+                   #:modules ((guix build gnu-build-system)
                               (guix build utils)
                               (srfi srfi-1)
-                              (srfi srfi-26))
-                   ,@(package-arguments bash))))
+                              (srfi srfi-26)))))
        (substitute-keyword-arguments args
          ((#:configure-flags flags)
           `(list "--without-bash-malloc"
-- 
2.12.2