From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Woodcroft Subject: [PATCH v2 08/10] gnu: python-ipython: Use 'python2-variant'. Date: Sun, 24 Apr 2016 23:06:22 +1000 Message-ID: <1461503184-8841-9-git-send-email-donttrustben@gmail.com> References: <1461244921-7412-1-git-send-email-donttrustben@gmail.com> <1461503184-8841-1-git-send-email-donttrustben@gmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:33564) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1auJke-0002HU-73 for Guix-devel@gnu.org; Sun, 24 Apr 2016 09:07:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1auJkd-0007IB-AG for Guix-devel@gnu.org; Sun, 24 Apr 2016 09:07:04 -0400 Received: from mail-pa0-x241.google.com ([2607:f8b0:400e:c03::241]:33513) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1auJkd-0007HZ-2d for Guix-devel@gnu.org; Sun, 24 Apr 2016 09:07:03 -0400 Received: by mail-pa0-x241.google.com with SMTP id vv3so14873641pab.0 for ; Sun, 24 Apr 2016 06:07:02 -0700 (PDT) Received: from localhost.localdomain ([103.25.181.216]) by smtp.googlemail.com with ESMTPSA id a64sm2229285pfa.6.2016.04.24.06.06.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 24 Apr 2016 06:07:01 -0700 (PDT) In-Reply-To: <1461503184-8841-1-git-send-email-donttrustben@gmail.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 * gnu/packages/python.scm (python-ipython)[properties]: New field. (python2-ipython): Use 'strip-python2-variant'. [inputs, propagated-inputs]: Do not redefine inherited values. --- gnu/packages/python.scm | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ee2cab8..40d28b1 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4359,29 +4359,21 @@ without using the configuration machinery.") Powerful interactive shells, a browser-based notebook, support for interactive data visualization, embeddable interpreters and tools for parallel computing.") - (license bsd-3))) + (license bsd-3) + (properties `((python2-variant . ,(delay python2-ipython)))))) (define-public python2-ipython - (let ((ipython (package-with-python2 python-ipython))) + (let ((base (package-with-python2 + (strip-python2-variant python-ipython)))) (package - (inherit ipython) + (inherit base) ;; FIXME: some tests are failing - (arguments - `(#:tests? #f ,@(package-arguments ipython))) - ;; Make sure we use custom python2-NAME packages. ;; FIXME: add pyreadline once available. - (propagated-inputs - `(("python2-terminado" ,python2-terminado) - ,@(alist-delete "python-terminado" - (package-propagated-inputs ipython)))) + (arguments + `(#:tests? #f ,@(package-arguments base))) (inputs - `(("python2-jsonschema" ,python2-jsonschema) - ("python2-mock" ,python2-mock) - ("python2-matplotlib" ,python2-matplotlib) - ("python2-numpy" ,python2-numpy) - ("python2-requests" ,python2-requests) - ,@(fold alist-delete (package-inputs ipython) - '("python-jsonschema" "python-matplotlib" "python-numpy" "python-requests"))))))) + `(("python2-mock" ,python2-mock) + ,@(package-inputs base)))))) (define-public python-isodate (package -- 2.5.0