* [PATCH] gnu: Add inputs for xonsh.
@ 2016-09-29 10:50 Danny Milosavljevic
2016-09-29 16:44 ` Leo Famulari
0 siblings, 1 reply; 6+ messages in thread
From: Danny Milosavljevic @ 2016-09-29 10:50 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: Type: text/plain, Size: 156 bytes --]
* gnu/packages/shells.scm (xonsh): Add inputs.
---
gnu/packages/shells.scm | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-inputs-for-xonsh.patch --]
[-- Type: text/x-patch; name="0001-gnu-Add-inputs-for-xonsh.patch", Size: 1095 bytes --]
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index c165f99..e8ad701 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -281,8 +281,23 @@ 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)
+ (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)))
(home-page "http://xon.sh/")
(synopsis "Python-ish shell")
(description
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] gnu: Add inputs for xonsh.
2016-09-29 10:50 [PATCH] gnu: Add inputs for xonsh Danny Milosavljevic
@ 2016-09-29 16:44 ` Leo Famulari
2016-09-29 19:08 ` Danny Milosavljevic
0 siblings, 1 reply; 6+ messages in thread
From: Leo Famulari @ 2016-09-29 16:44 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: guix-devel
[-- 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] gnu: Add inputs for xonsh.
2016-09-29 16:44 ` Leo Famulari
@ 2016-09-29 19:08 ` Danny Milosavljevic
2016-09-29 19:39 ` Danny Milosavljevic
2016-09-29 21:13 ` Leo Famulari
0 siblings, 2 replies; 6+ messages in thread
From: Danny Milosavljevic @ 2016-09-29 19:08 UTC (permalink / raw)
To: Leo Famulari; +Cc: guix-devel
> I think this should be two commits. What do you think of the patches I
> attached?
LGTM!
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] gnu: Add inputs for xonsh.
2016-09-29 19:08 ` Danny Milosavljevic
@ 2016-09-29 19:39 ` Danny Milosavljevic
2016-09-29 21:10 ` Leo Famulari
2016-09-29 21:13 ` Leo Famulari
1 sibling, 1 reply; 6+ messages in thread
From: Danny Milosavljevic @ 2016-09-29 19:39 UTC (permalink / raw)
To: Leo Famulari; +Cc: guix-devel
Oops, I don't think the xonsh tarball contains the docs. In which case we need neither sphinx nor numpydoc.
Strange, does it have online-only docs? Or do we need another tarball?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] gnu: Add inputs for xonsh.
2016-09-29 19:39 ` Danny Milosavljevic
@ 2016-09-29 21:10 ` Leo Famulari
0 siblings, 0 replies; 6+ messages in thread
From: Leo Famulari @ 2016-09-29 21:10 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: guix-devel
On Thu, Sep 29, 2016 at 09:39:58PM +0200, Danny Milosavljevic wrote:
> Oops, I don't think the xonsh tarball contains the docs. In which case we need neither sphinx nor numpydoc.
>
> Strange, does it have online-only docs? Or do we need another tarball?
It turns out the GitHub tarball does include the docs. I think we should
use that source and add a 'docs' phase as in the certbot package
definition [0].
Can you also ask upstream if they meant to leave the docs out of the
PyPi download?
Too bad the docs Makefile doesn't have a target for info or man pages. I
guess that's a "bonus" goal :)
[0]
http://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/tls.scm#n524
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] gnu: Add inputs for xonsh.
2016-09-29 19:08 ` Danny Milosavljevic
2016-09-29 19:39 ` Danny Milosavljevic
@ 2016-09-29 21:13 ` Leo Famulari
1 sibling, 0 replies; 6+ messages in thread
From: Leo Famulari @ 2016-09-29 21:13 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: guix-devel
On Thu, Sep 29, 2016 at 09:08:08PM +0200, Danny Milosavljevic wrote:
> > I think this should be two commits. What do you think of the patches I
> > attached?
>
> LGTM!
Okay, I pushed the "unbundle ply" patch as cfb7e269e9d.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-09-29 21:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-29 10:50 [PATCH] gnu: Add inputs for xonsh Danny Milosavljevic
2016-09-29 16:44 ` Leo Famulari
2016-09-29 19:08 ` Danny Milosavljevic
2016-09-29 19:39 ` Danny Milosavljevic
2016-09-29 21:10 ` Leo Famulari
2016-09-29 21:13 ` Leo Famulari
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.