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

guix: build all Python packages with --single-version-externally-managed. 

This requires setuptools to be installed together with python, which is
the case for Python 3 anyway and which we do for our build of Python 2
(see last commit).

* guix/build/python-build-system.scm (install): Add
  "--single-version-externally-managed" and "--root=/" to params to be
  passed to call-setuppy. Remove thus needless manipulation of
  PYTHONPATH. Remove now unused argument "inputs".
This commit is contained in:
Hartmut Goebel 2016-09-28 10:42:35 +02:00
parent aaf75c890b
commit 7db40bce58
No known key found for this signature in database
GPG Key ID: 634A8DFFD3F631DF
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -60,25 +61,15 @@
(major+minor (take components 2))) (major+minor (take components 2)))
(string-join major+minor "."))) (string-join major+minor ".")))
(define* (install #:key outputs inputs (configure-flags '()) (define* (install #:key outputs (configure-flags '())
#:allow-other-keys) #:allow-other-keys)
"Install a given Python package." "Install a given Python package."
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(params (append (list (string-append "--prefix=" out)) (params (append (list (string-append "--prefix=" out)
configure-flags)) "--single-version-externally-managed"
(python-version (get-python-version (assoc-ref inputs "python"))) "--root=/")
(old-path (getenv "PYTHONPATH")) configure-flags)))
(add-path (string-append out "/lib/python" python-version (call-setuppy "install" params)))
"/site-packages/")))
;; create the module installation directory and add it to PYTHONPATH
;; to make setuptools happy
(mkdir-p add-path)
(setenv "PYTHONPATH"
(string-append (if old-path
(string-append old-path ":")
"")
add-path))
(call-setuppy "install" params)))
(define* (wrap #:key inputs outputs #:allow-other-keys) (define* (wrap #:key inputs outputs #:allow-other-keys)
(define (list-of-files dir) (define (list-of-files dir)