diff options
| author | Andreas Enge <andreas@enge.fr> | 2013-09-04 18:04:15 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2013-09-04 18:07:55 +0200 |
| commit | 3df47231e6c632aadcd7b103bb5b399a8d29772d (patch) | |
| tree | 423260305ff37b1b742399d3c1021a0c472a37f0 | |
| parent | ee3e314bb7ba376c7e8c95c3da1f64ba07d57847 (diff) | |
| download | patches-3df47231e6c632aadcd7b103bb5b399a8d29772d.tar patches-3df47231e6c632aadcd7b103bb5b399a8d29772d.tar.gz | |
guix: python: Switch to python-wrapper as the default version for the python
build system (switches to Python 3) and compute python-version instead of
passing it as a parameter.
* guix/build-system/python.scm (default-python): Switch to python-wrapper.
* guix/build-system/python.scm (python-build): Drop parameter #:python-version.
* guix/build/python-build-system.scm (wrap): Compute python version from input.
| -rw-r--r-- | guix/build-system/python.scm | 6 | ||||
| -rw-r--r-- | guix/build/python-build-system.scm | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm index b60adb182f..7ac93b296b 100644 --- a/guix/build-system/python.scm +++ b/guix/build-system/python.scm @@ -39,13 +39,11 @@ "Return the default Python package." ;; Lazily resolve the binding to avoid a circular dependency. (let ((python (resolve-interface '(gnu packages python)))) - (module-ref python 'python))) + (module-ref python 'python-wrapper))) (define* (python-build store name source inputs #:key (python (default-python)) - (python-version - (string-take (package-version (default-python)) 3)) (tests? #t) (configure-flags ''()) (phases '(@ (guix build python-build-system) @@ -62,6 +60,7 @@ (guix build utils)))) "Build SOURCE using PYTHON, and with INPUTS. This assumes that SOURCE provides a 'setup.py' file as its build system." + (define python-search-paths (append (package-native-search-paths python) (standard-search-paths))) @@ -78,7 +77,6 @@ provides a 'setup.py' file as its build system." #:test-target "test" #:tests? ,tests? #:outputs %outputs - #:python-version ,python-version #:search-paths ',(map search-path-specification->sexp (append python-search-paths search-paths)) diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index 84299798b0..04c223bb85 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -53,7 +53,7 @@ (zero? (apply system* "python" args))) (error "no setup.py found"))) -(define* (wrap #:key outputs python-version #:allow-other-keys) +(define* (wrap #:key inputs outputs #:allow-other-keys) (define (list-of-files dir) (map (cut string-append dir "/" <>) (or (scandir dir (lambda (f) @@ -69,6 +69,8 @@ outputs)) (let* ((out (assoc-ref outputs "out")) + (python (assoc-ref inputs "python")) + (python-version (string-take (string-take-right python 5) 3)) (var `("PYTHONPATH" prefix ,(cons (string-append out "/lib/python" python-version "/site-packages") |