nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build-system/python: 'package-with-explicit-python' uses 'package-mapping'. 

* guix/build-system/python.scm (package-with-explicit-python)
[package-variant, cut?]: New procedures.
[transform]: Remove 'mlambdaq' form and input tuple handling.
Use 'package-mapping'.
This commit is contained in:
Ludovic Courtès 2017-04-05 21:32:13 +02:00
parent f37f2b83fa
commit 1618006d0b
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 34 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
guix/build-system/python.scm
View File

@ -83,54 +83,43 @@ pre-defined variants of this transformation recorded in the 'properties' field
of packages. The property value must be the promise of a package. This is a of packages. The property value must be the promise of a package. This is a
convenient way for package writers to force the transformation to use convenient way for package writers to force the transformation to use
pre-defined variants." pre-defined variants."
(define transform (define package-variant
;; Memoize the transformations. Failing to do that, we would build a huge (if variant-property
;; object graph with lots of duplicates, which in turns prevents us from (lambda (package)
;; benefiting from memoization in 'package-derivation'. (assq-ref (package-properties package)
(mlambdaq (p) variant-property))
(let* ((rewrite-if-package (const #f)))
(lambda (content)
;; CONTENT may be a file name, in which case it is returned,
;; or a package, which is rewritten with the new PYTHON and
;; NEW-PREFIX.
(if (package? content)
(transform content)
content)))
(rewrite
(match-lambda
((name content . rest)
(append (list name (rewrite-if-package content)) rest)))))
(cond (define (transform p)
;; If VARIANT-PROPERTY is present, use that. (cond
((and variant-property ;; If VARIANT-PROPERTY is present, use that.
(assoc-ref (package-properties p) variant-property)) ((package-variant p)
=> force) => force)
;; Otherwise build the new package object graph. ;; Otherwise build the new package object graph.
((eq? (package-build-system p) python-build-system) ((eq? (package-build-system p) python-build-system)
(package (package
(inherit p) (inherit p)
(location (package-location p)) (location (package-location p))
(name (let ((name (package-name p))) (name (let ((name (package-name p)))
(string-append new-prefix (string-append new-prefix
(if (string-prefix? old-prefix name) (if (string-prefix? old-prefix name)
(substring name (substring name
(string-length old-prefix)) (string-length old-prefix))
name)))) name))))
(arguments (arguments
(let ((python (if (promise? python) (let ((python (if (promise? python)
(force python) (force python)
python))) python)))
(ensure-keyword-arguments (package-arguments p) (ensure-keyword-arguments (package-arguments p)
`(#:python ,python)))) `(#:python ,python))))))
(inputs (map rewrite (package-inputs p))) (else p)))
(propagated-inputs (map rewrite (package-propagated-inputs p)))
(native-inputs (map rewrite (package-native-inputs p)))))
(else
p)))))
transform) (define (cut? p)
(or (not (eq? (package-build-system p) python-build-system))
(package-variant p)))
(package-mapping transform cut?))
(define package-with-python2 (define package-with-python2
;; Note: delay call to 'default-python2' until after the 'arguments' field ;; Note: delay call to 'default-python2' until after the 'arguments' field