guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#27922] [PATCH] gnu: python-numpy: Update to 1.12.1.


From: Thomas Danckaert
Subject: [bug#27922] [PATCH] gnu: python-numpy: Update to 1.12.1.
Date: Wed, 27 Sep 2017 08:36:46 +0200 (CEST)

From: address@hidden (Ludovic Courtès)
Subject: Re: [bug#27922] [PATCH] gnu: python-numpy: Update to 1.12.1.
Date: Tue, 26 Sep 2017 22:08:32 +0200

This is weird: bash-minimal is an implicit input already. What was the
error exactly?

Oops, just setting (setenv "SHELL" "bash") is enough. Indeed, bash is already there.

(I've been looking in (guix build-system ...) to try to find out the default native inputs for the different build systems, but couldn't find it. Where are they set?)

Thomas
>From f60e8593ca572477e2444a57ad508b9c558316ee Mon Sep 17 00:00:00 2001
From: Thomas Danckaert <address@hidden>
Date: Tue, 26 Sep 2017 16:26:08 +0200
Subject: [PATCH] gnu: python-numpy: Update to 1.13.1.

* gnu/packages/python.scm (python-numpy, python2-numpy): Update to 1.13.1.
[source]: Download the zip release from pypi instead of a git snapshot.
[native-inputs]: Add unzip.
[arguments]: Set SHELL environment variable.

Co-authored by Leo Famulari <address@hidden>
---
 gnu/packages/python.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 5dcb5a05c..6988b44a9 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3720,22 +3720,21 @@ between language specification and implementation 
aspects.")
 (define-public python-numpy
   (package
     (name "python-numpy")
-    (version "1.12.0")
+    (version "1.13.1")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append
-             "https://github.com/numpy/numpy/archive/v"; version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
+       (uri (pypi-uri "numpy" version ".zip"))
        (sha256
         (base32
-         "025d4j4aakcp8w5i5diqh812cbbjgac7jszx1j56ivrbi1i8vv7d"))))
+         "1fsgkhh1vdkhmlz8vmdgxnj9n9yaanckxxzz9s0b4p08fqvjic69"))))
     (build-system python-build-system)
     (inputs
      `(("openblas" ,openblas)
        ("lapack" ,lapack)))
     (native-inputs
-     `(("python-cython" ,python-cython)
+     `(("unzip" ,unzip)
+       ("python-cython" ,python-cython)
        ("python-nose" ,python-nose)
        ("gfortran" ,gfortran)))
     (arguments
@@ -3743,6 +3742,8 @@ between language specification and implementation 
aspects.")
        (modify-phases %standard-phases
         (add-before 'build 'set-environment-variables
          (lambda* (#:key inputs #:allow-other-keys)
+           ;; numpy's distutils uses $SHELL to run external commands.
+          (setenv "SHELL" "bash")
           (call-with-output-file "site.cfg"
             (lambda (port)
               (format port
-- 
2.14.1


reply via email to

[Prev in Thread] Current Thread [Next in Thread]