GNU bug report logs - #26790
[PATCH] bash.scm: fix keyword order in 'bash-minimal'

Previous Next

Full log

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Sergei Trofimovich <slyfox <at> inbox.ru>
To: guix-patches <at> gnu.org
Cc: Andy Wingo <wingo <at> igalia.com>, rennes <rennes <at> openmailbox.org>, Ludovic Courtès <ludo <at> gnu.org>, Manolis Ragkousis <manolis837 <at> gmail.com>, Sergei Trofimovich <slyfox <at> inbox.ru>
Subject: [PATCH] bash.scm: fix keyword order in 'bash-minimal'
Date: Fri,  5 May 2017 22:51:25 +0100

'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 <slyfox <at> inbox.ru>
---
 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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.