From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: [PATCH] gnu: Add inputs for xonsh. Date: Thu, 29 Sep 2016 12:44:24 -0400 Message-ID: <20160929164424.GA22100@jasmine> References: <20160929105016.15727-1-dannym@scratchpost.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="vtzGhvizbBRQ85DL" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:33617) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpeRt-0003Aq-5V for guix-devel@gnu.org; Thu, 29 Sep 2016 12:44:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpeRo-0001Od-4O for guix-devel@gnu.org; Thu, 29 Sep 2016 12:44:40 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:50531) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpeRm-0001LP-Q9 for guix-devel@gnu.org; Thu, 29 Sep 2016 12:44:36 -0400 Content-Disposition: inline In-Reply-To: <20160929105016.15727-1-dannym@scratchpost.org> 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: Danny Milosavljevic Cc: guix-devel@gnu.org --vtzGhvizbBRQ85DL Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Sep 29, 2016 at 12:50:16PM +0200, Danny Milosavljevic wrote: > * gnu/packages/shells.scm (xonsh): Add inputs. > (base32 > - "0byxd9kjl99q2pyvjh9jy18l0di1i35wr0qqgnw4i6jh6ig3zcki")))) > + "0byxd9kjl99q2pyvjh9jy18l0di1i35wr0qqgnw4i6jh6ig3zcki")) > + (modules '((guix build utils))) > + (snippet > + `(begin > + ;; Delete bundled ply. > + (delete-file-recursively "xonsh/ply") > + (substitute* '("setup.py") > + (("'xonsh\\.ply',") "")) > + #t)))) > (build-system python-build-system) > + (native-inputs > + `(("python-numpydoc" ,python-numpydoc))) > + (inputs > + ;; TODO jupyter distro cloud Sphinx-Theme > + `(("python-ply" ,python-ply) > + ("python-sphinx" ,python-sphinx) > + ("python-prompt-toolkit" ,python-prompt-toolkit))) I think this should be two commits. What do you think of the patches I attached? --vtzGhvizbBRQ85DL Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-xonsh-Remove-bundled-PLY.patch" >From b51f7cbba85caf8ca8376762fb6e8d0578056f08 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 29 Sep 2016 12:39:42 -0400 Subject: [PATCH 1/2] gnu: xonsh: Remove bundled PLY. * gnu/packages/shells.scm (xonsh)[source]: Add snippet to remove bundled python-ply. [inputs]: Add python-ply. Signed-off-by: Leo Famulari --- gnu/packages/shells.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index c165f99..cbf5b42 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -281,8 +281,19 @@ ksh, and tcsh.") (uri (pypi-uri "xonsh" version)) (sha256 (base32 - "0byxd9kjl99q2pyvjh9jy18l0di1i35wr0qqgnw4i6jh6ig3zcki")))) + "0byxd9kjl99q2pyvjh9jy18l0di1i35wr0qqgnw4i6jh6ig3zcki")) + (modules '((guix build utils))) + (snippet + `(begin + ;; Delete bundled ply. + (delete-file-recursively "xonsh/ply") + (substitute* '("setup.py") + (("'xonsh\\.ply',") "")) + #t)))) (build-system python-build-system) + (inputs + ;; TODO jupyter distro cloud Sphinx-Theme + `(("python-ply" ,python-ply))) (home-page "http://xon.sh/") (synopsis "Python-ish shell") (description -- 2.10.0 --vtzGhvizbBRQ85DL Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0002-gnu-xonsh-Add-inputs.patch" >From 2f699ee6dfc333bd6594249e5e7136372ba17b3d Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 29 Sep 2016 12:41:28 -0400 Subject: [PATCH 2/2] gnu: xonsh: Add inputs. * gnu/packages/shells.scm (xonsh)[native-inputs]: Add python-numpydoc. [inputs]: Add python-sphinx, python-prompt-toolkit. Signed-off-by: Leo Famulari --- gnu/packages/shells.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index cbf5b42..e8ad701 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -291,9 +291,13 @@ ksh, and tcsh.") (("'xonsh\\.ply',") "")) #t)))) (build-system python-build-system) + (native-inputs + `(("python-numpydoc" ,python-numpydoc))) (inputs ;; TODO jupyter distro cloud Sphinx-Theme - `(("python-ply" ,python-ply))) + `(("python-ply" ,python-ply) + ("python-sphinx" ,python-sphinx) + ("python-prompt-toolkit" ,python-prompt-toolkit))) (home-page "http://xon.sh/") (synopsis "Python-ish shell") (description -- 2.10.0 --vtzGhvizbBRQ85DL--