From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: [PATCH] Fix scipy Date: Tue, 13 Oct 2015 13:37:34 +0200 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zlxtw-0002cn-Bh for guix-devel@gnu.org; Tue, 13 Oct 2015 07:37:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zlxtr-0001VB-8X for guix-devel@gnu.org; Tue, 13 Oct 2015 07:37:52 -0400 Received: from venus.bbbm.mdc-berlin.de ([141.80.25.30]:50597) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zlxtq-0001Uq-SG for guix-devel@gnu.org; Tue, 13 Oct 2015 07:37:47 -0400 Received: from localhost (localhost [127.0.0.1]) by venus.bbbm.mdc-berlin.de (Postfix) with ESMTP id 3B46F38077C for ; Tue, 13 Oct 2015 13:37:45 +0200 (CEST) Received: from venus.bbbm.mdc-berlin.de ([127.0.0.1]) by localhost (venus.bbbm.mdc-berlin.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8Pgl5QBgXvbs for ; Tue, 13 Oct 2015 13:37:39 +0200 (CEST) Received: from HTCAONE.mdc-berlin.net (mab.citx.mdc-berlin.de [141.80.36.102]) by venus.bbbm.mdc-berlin.de (Postfix) with ESMTP for ; Tue, 13 Oct 2015 13:37:39 +0200 (CEST) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: "guix-devel@gnu.org" --=-=-= Content-Type: text/plain The attached patch fixes python{,2}-scipy. Currently, it does not propagate Python modules it depends on at runtime, such as numpy. I suspect that we need to fix many more Python packages in a similar manner. ~~ Ricardo --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename="0001-gnu-python-scipy-python2-scipy-Propagate-Python-inpu.patch" >From 73199a178d34eb5202906ea7ef6921c09d42ea28 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Oct 2015 13:29:49 +0200 Subject: [PATCH] gnu: python-scipy, python2-scipy: Propagate Python inputs. * gnu/packages/python.scm (python-scipy)[inputs]: Move "python-numpy", "python-matplotlib", and "python-pyparsing" to propagated-inputs; move "python-nose" and "python-sphinx" to native-inputs. [propagated-inputs]: New field. [native-inputs]: Move "python-nose" and "python-sphinx" from inputs field here. (python2-scipy): Modify propagated-inputs instead of inputs field. --- gnu/packages/python.scm | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 72d353d..5c44a92 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3244,16 +3244,17 @@ functions.") (base32 "0fsqi05s035d7p6s8h3h2pvk1axias16chy17rw9l1bxvrfhmncf")))) (build-system python-build-system) - (inputs + (propagated-inputs `(("python-numpy" ,python-numpy) ("python-matplotlib" ,python-matplotlib) - ("python-pyparsing" ,python-pyparsing) - ("python-nose" ,python-nose) - ("python-sphinx" ,python-sphinx) - ("lapack" ,lapack) + ("python-pyparsing" ,python-pyparsing))) + (inputs + `(("lapack" ,lapack) ("openblas" ,openblas))) (native-inputs - `(("gfortran" ,gfortran) + `(("python-nose" ,python-nose) + ("python-sphinx" ,python-sphinx) + ("gfortran" ,gfortran) ("texlive" ,texlive) ("perl" ,perl))) (outputs '("out" "doc")) @@ -3322,11 +3323,12 @@ routines such as routines for numerical integration and optimization.") (let ((scipy (package-with-python2 python-scipy))) (package (inherit scipy) ;; Use packages customized for python-2. - (inputs `(("python2-matplotlib" ,python2-matplotlib) - ("python2-numpy" ,python2-numpy) - ,@(alist-delete "python-matplotlib" - (alist-delete "python-numpy" - (package-inputs scipy)))))))) + (propagated-inputs + `(("python2-matplotlib" ,python2-matplotlib) + ("python2-numpy" ,python2-numpy) + ,@(alist-delete "python-matplotlib" + (alist-delete "python-numpy" + (package-propagated-inputs scipy)))))))) (define-public python-sqlalchemy (package -- 2.1.0 --=-=-=--