From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42782) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e2Cyo-0007av-Ms for guix-patches@gnu.org; Wed, 11 Oct 2017 05:07:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e2Cyk-0002OZ-PJ for guix-patches@gnu.org; Wed, 11 Oct 2017 05:07:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:52583) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e2Cyk-0002OM-Lg for guix-patches@gnu.org; Wed, 11 Oct 2017 05:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1e2Cyk-0003Et-C9 for guix-patches@gnu.org; Wed, 11 Oct 2017 05:07:02 -0400 Subject: [bug#28782] [PATCH] gnu: Add python-jupyter-console as input to python-ipython. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:42691) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e2CyF-0007TE-7a for guix-patches@gnu.org; Wed, 11 Oct 2017 05:06:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e2CyB-0001xg-8Q for guix-patches@gnu.org; Wed, 11 Oct 2017 05:06:31 -0400 Received: from li622-129.members.linode.com ([212.71.249.129]:53003 helo=mira.cbaines.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e2CyB-0001vo-1g for guix-patches@gnu.org; Wed, 11 Oct 2017 05:06:27 -0400 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 9488C154C5A for ; Wed, 11 Oct 2017 10:06:24 +0100 (BST) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 383aba85 for ; Wed, 11 Oct 2017 09:06:24 +0000 (UTC) From: Christopher Baines Date: Wed, 11 Oct 2017 10:06:24 +0100 Message-Id: <20171011090624.11181-1-mail@cbaines.net> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 28782@debbugs.gnu.org This fixes running ipython console and ipython3 console. As python-ipython is an input to python-jupyter-console, depend on a modified version of the package which doesn't have this input. * gnu/packages/python.scm (python-ipython)[propagated-inputs]: Add a modified version of python-jupyter-console. --- gnu/packages/python.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8521ab352..6921a8944 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5851,6 +5851,31 @@ tools for mocking system commands and recording calls to those.") ("python-numpy" ,python-numpy) ("python-numpydoc" ,python-numpydoc) ("python-jinja2" ,python-jinja2) + ("python-jupyter-console" + ;; The python-ipython and python-jupyter-console require each + ;; other. To get the functionality in both packages working, strip + ;; down the python-jupyter-console package when using it as an input + ;; to python-ipython. + ,(package + (inherit python-jupyter-console) + (arguments + (substitute-keyword-arguments + (package-arguments python-jupyter-console) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'delete-bin + (lambda* (#:key outputs #:allow-other-keys) + ;; Delete the bin files, to avoid conflicts in profiles + ;; where python-ipython and python-jupyter-console are + ;; both present. + (delete-file-recursively + (string-append + (assoc-ref outputs "out") "/bin")))))))) + ;; Remove the python-ipython propagated input, to avoid the cycle + (propagated-inputs + (remove (lambda (input) + (string=? (car input) name)) + (package-propagated-inputs python-jupyter-console))))) ("python-mistune" ,python-mistune) ("python-pexpect" ,python-pexpect) ("python-pickleshare" ,python-pickleshare) -- 2.14.2