[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/10: build-system/python: Use 'ensure-keyword-arguments'.
From: |
Ludovic Courtès |
Subject: |
09/10: build-system/python: Use 'ensure-keyword-arguments'. |
Date: |
Mon, 01 Feb 2016 09:13:01 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit f0907d97d43937d5bdde3b6440184325a80e0528
Author: Ludovic Courtès <address@hidden>
Date: Sun Jan 31 23:25:27 2016 +0100
build-system/python: Use 'ensure-keyword-arguments'.
* guix/build-system/python.scm (package-with-explicit-python): Use
'ensure-keyword-arguments'.
---
guix/build-system/python.scm | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm
index 86efc1a..9a80bd6 100644
--- a/guix/build-system/python.scm
+++ b/guix/build-system/python.scm
@@ -101,14 +101,11 @@ NEW-PREFIX; otherwise, NEW-PREFIX is prepended to the
name."
(string-length
old-prefix))
name))))
(arguments
- (let ((arguments (package-arguments p))
- (python (if (promise? python)
- (force python)
- python)))
- (if (member #:python arguments)
- (substitute-keyword-arguments arguments
- ((#:python p) python))
- (append arguments `(#:python ,python)))))
+ (let ((python (if (promise? python)
+ (force python)
+ python)))
+ (ensure-keyword-arguments (package-arguments p)
+ `(#:python ,python))))
(inputs (map rewrite (package-inputs p)))
(propagated-inputs (map rewrite (package-propagated-inputs p)))
(native-inputs (map rewrite (package-native-inputs p))))
- branch master updated (e3f755f -> 47c0f92), Ludovic Courtès, 2016/02/01
- 02/10: install: Make it clear that we refer to the root by label., Ludovic Courtès, 2016/02/01
- 01/10: build: Use the right section and source for man pages., Ludovic Courtès, 2016/02/01
- 06/10: guix package: Support package transformation options., Ludovic Courtès, 2016/02/01
- 07/10: build: Really enable Guile warnings., Ludovic Courtès, 2016/02/01
- 08/10: build: Remove semicolons from Guile warnings., Ludovic Courtès, 2016/02/01
- 05/10: guix build: Separate transformation options., Ludovic Courtès, 2016/02/01
- 04/10: doc: Add subsections to 'Invoking guix build'., Ludovic Courtès, 2016/02/01
- 03/10: guix build: Transformations operate on single objects., Ludovic Courtès, 2016/02/01
- 09/10: build-system/python: Use 'ensure-keyword-arguments'.,
Ludovic Courtès <=
- 10/10: guix build: Add '--with-input'., Ludovic Courtès, 2016/02/01