From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hartmut Goebel Subject: [PATCH 4/5] gnu: python-numpy: Fix inputs. Date: Fri, 2 Dec 2016 15:55:04 +0100 Message-ID: <1480690505-21501-5-git-send-email-h.goebel@crazy-compilers.com> References: <1480690505-21501-1-git-send-email-h.goebel@crazy-compilers.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCpF6-0003Cc-Ag for guix-devel@gnu.org; Fri, 02 Dec 2016 09:55:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cCpF5-0003FG-L2 for guix-devel@gnu.org; Fri, 02 Dec 2016 09:55:16 -0500 Received: from mail-out.m-online.net ([212.18.0.10]:51689) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cCpF5-0003Bh-FX for guix-devel@gnu.org; Fri, 02 Dec 2016 09:55:15 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3tVcdZ3ZfXz3hn17 for ; Fri, 2 Dec 2016 15:55:14 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3tVcdZ3T7Lzvm0T for ; Fri, 2 Dec 2016 15:55:14 +0100 (CET) Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id Zurpq8c6hdHZ for ; Fri, 2 Dec 2016 15:55:12 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-188-174-150-110.dynamic.mnet-online.de [188.174.150.110]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for ; Fri, 2 Dec 2016 15:55:12 +0100 (CET) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id 3A3AD606BD for ; Fri, 2 Dec 2016 15:55:06 +0100 (CET) In-Reply-To: <1480690505-21501-1-git-send-email-h.goebel@crazy-compilers.com> 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" To: guix-devel@gnu.org This fixes 2efabc5589dc641dce75702b99253a3fb40bb2eb, where some inputs have been changed to propagated-inputs, but the propagated-inputs are still extended from inputs and the inputs are not extended at all. * gnu/packages/python.scm (python-numpy, python2-numpy)[inputs]: Extend from python-numpy-bootstrap's package-inputs. [propagated-inputs]: Extend from python-numpy-bootstrap's package-propagated-inputs. --- gnu/packages/python.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c2dac25..e373869 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3261,11 +3261,12 @@ association studies (GWAS) on extremely large data sets.") (name "python-numpy") (outputs '("out" "doc")) (inputs - `(("which" ,which))) + `(("which" ,which) + ,@(package-inputs python-numpy-bootstrap))) (propagated-inputs `(("python-matplotlib" ,python-matplotlib) ("python-pyparsing" ,python-pyparsing) - ,@(package-inputs python-numpy-bootstrap))) + ,@(package-propagated-inputs python-numpy-bootstrap))) (native-inputs `(("pkg-config" ,pkg-config) ("python-sphinx" ,python-sphinx) -- 2.7.4