Re: [PATCH] gnu: Add inputs for xonsh.

[Leo Famulari <leo@famulari.name>]

[-- Attachment #1: Type: text/plain, Size: 968 bytes --]

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?

[-- Attachment #2: 0001-gnu-xonsh-Remove-bundled-PLY.patch --]
[-- Type: text/plain, Size: 1385 bytes --]

From b51f7cbba85caf8ca8376762fb6e8d0578056f08 Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic <dannym@scratchpost.org>
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 <leo@famulari.name>
---
 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


[-- Attachment #3: 0002-gnu-xonsh-Add-inputs.patch --]
[-- Type: text/plain, Size: 1158 bytes --]

From 2f699ee6dfc333bd6594249e5e7136372ba17b3d Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic <dannym@scratchpost.org>
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 <leo@famulari.name>
---
 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