--- Begin Message ---
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 <address@hidden>
---
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
--- End Message ---
--- Begin Message ---
Subject: |
Re: bug#26790: [PATCH] bash.scm: fix keyword order in 'bash-minimal' |
Date: |
Tue, 30 May 2017 22:00:05 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) |
Sergei Trofimovich <address@hidden> skribis:
> '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
Pushed to ‘core-updates’ as a30188f561af3f84a1da687dffb4192e621929fc
where I adjusted the commit log.
Thank you!
Ludo’.
--- End Message ---