From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52222) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e2j9J-0003Tr-7E for guix-patches@gnu.org; Thu, 12 Oct 2017 15:28:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e2j9G-0004LY-I0 for guix-patches@gnu.org; Thu, 12 Oct 2017 15:28:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:55909) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e2j9G-0004LL-EB for guix-patches@gnu.org; Thu, 12 Oct 2017 15:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1e2j9G-00009y-1l for guix-patches@gnu.org; Thu, 12 Oct 2017 15:28:02 -0400 Subject: bug#28782: [PATCH] gnu: Add python-jupyter-console as input to python-ipython. Resent-To: guix-patches@gnu.org Resent-Message-ID: Date: Thu, 12 Oct 2017 20:27:35 +0100 From: Christopher Baines Message-ID: <20171012202735.462934b2@cbaines.net> In-Reply-To: <87efq9a26t.fsf@gnu.org> References: <20171011090624.11181-1-mail@cbaines.net> <87efq9a26t.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/XYQ=.03eUVRAa=QWvW=I74N"; protocol="application/pgp-signature" 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" Cc: 28782-done@debbugs.gnu.org --Sig_/XYQ=.03eUVRAa=QWvW=I74N Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Wed, 11 Oct 2017 21:56:26 +0200 ludo@gnu.org (Ludovic Court=C3=A8s) wrote: > Hello, >=20 > Christopher Baines skribis: >=20 > > 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. =20 >=20 > [...] >=20 > > @@ -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=3D? (car input) name)) > > + (package-propagated-inputs > > python-jupyter-console))))) =20 >=20 > For clarity, perhaps we should declare the above as > =E2=80=98python-jupyter-console-minimal=E2=80=99 (also with a =E2=80=98na= me=E2=80=99 field)? >=20 > Also, the (remove =E2=80=A6) expression at the end can be rewritten as: >=20 > (alist-delete name (package-propagated-inputs > python-jupyter-console)) >=20 > Otherwise LGTM, thanks! Thanks for reviewing Ludo, I've made these changes and pushed :) --Sig_/XYQ=.03eUVRAa=QWvW=I74N Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAlnfwidfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9Xexow//Sh6SvIqmPFVazgmHbr0f1yKsh/ATMNYJqMUhlzrqF0IkFzNHV6Q3cidf AQWRcrXGo8n3qNBJNKTMXoSlfvfSepxSjxc9u+d5OQU+5NUYIM5A1lb+EgoWYFKL BtItNL8fA7YQSMMNV4BH/f+KfbL79Pqr+0owFvPJJfBD62AL+hKGgPzY1LcFyBfz iJwJc7OVhu5ns77wyEQNvsQYUMbb6dPw35HVWEeOmctcMIECovEJzdaDSyt8xxPQ nm0lOK6VxqfoV1Am/dkY8ZEqnPX7/F/rLogEd06gMuwrskvhdwIS0Zy1lf9m5FMp upU33udGGnU7lYJBWI2DJYZJvoUQjbx9yWw60+3D7c59oFcYQYKJHSEy4j3zFiMl Ly0DKFsvnr9flMBIiuXZh3PgQjTKxz8GdWzQ25KHFedrb3vgzLx1ieKHIvGMVMGE 2HiU5NmPGmMh7it+pdY74Od/15+cjI3Pgi8yZqmIHIWu5EkhMxTr1eU2nzzfC1rG u+0cvEtE4BVOZhtdR+kfXI0mxWPXHGcTv2b9yHbqd4rxUFCL1x+wa3lTYlQ5ripa mr1QbvRDKtHZC6FGsUKhihw7t75hubsOHj5c/oxTJN+N5K8cMWwrDUktWKdCNqfl uh+dYt+/+s37hrlYVjWE+Wezfij1PPKSfTwae8WGABYdl+1xAQA= =bIsl -----END PGP SIGNATURE----- --Sig_/XYQ=.03eUVRAa=QWvW=I74N--