diff mbox

[v2] gnu: Add python-jedi.

Message ID 20160709144832.7bd38995@scratchpost.org
State New
Headers show

Commit Message

Danny Milosavljevic July 9, 2016, 12:48 p.m. UTC
* gnu/packages/python.scm (python-jedi, python2-jedi): New variables.

Signed-off-by: Danny Milosavljevic <dannym+a@scratchpost.org>
---
 gnu/packages/python.scm | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

Comments

Leo Famulari July 9, 2016, 6:13 p.m. UTC | #1
On Sat, Jul 09, 2016 at 02:48:32PM +0200, Danny Milosavljevic wrote:
> * gnu/packages/python.scm (python-jedi, python2-jedi): New variables.

Thanks for this patch! Pushed as a502dfbf with the following changes:

>                  #:select (asl2.0 bsd-4 bsd-3 bsd-2 non-copyleft cc0 x11 x11-style
>                            gpl2 gpl2+ gpl3 gpl3+ lgpl2.0+ lgpl2.1 lgpl2.1+ lgpl3+ agpl3+
>                            isc mpl2.0 psfl public-domain repoze unlicense x11-style
> -                          zpl2.1))
> +                          zpl2.1 expat))
>    #:use-module ((guix licenses) #:select (expat zlib) #:prefix license:)

We need to use (license license:expat) to use the Expat license in
(gnu packages python), to avoid ambiguity between the license and the
package. So, I removed this change and adjusted the license field in
python-jedi.

> +        (uri (string-append
> +               "https://pypi.python.org/packages/"
> +               "3a/37/629080b92b87bc65e3b1b4f5d539e22aa5dc45637eab0dd4b0cd8cf236c2/jedi-"
> +               version
> +               ".tar.gz"))

Pypi-uri works again, so I made it use that instead.
Leo Famulari Oct. 24, 2016, 9:03 p.m. UTC | #2
On Sat, Jul 09, 2016 at 02:48:32PM +0200, Danny Milosavljevic wrote:
> * gnu/packages/python.scm (python-jedi, python2-jedi): New variables.

This package is failing to build on core-updates:

https://hydra.gnu.org/job/gnu/core-updates-2/python-jedi-0.9.0.x86_64-linux

Can you take a look?
diff mbox

Patch

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index ccbed0f..ffd4d56 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -45,7 +45,7 @@ 
                 #:select (asl2.0 bsd-4 bsd-3 bsd-2 non-copyleft cc0 x11 x11-style
                           gpl2 gpl2+ gpl3 gpl3+ lgpl2.0+ lgpl2.1 lgpl2.1+ lgpl3+ agpl3+
                           isc mpl2.0 psfl public-domain repoze unlicense x11-style
-                          zpl2.1))
+                          zpl2.1 expat))
   #:use-module ((guix licenses) #:select (expat zlib) #:prefix license:)
   #:use-module (gnu packages)
   #:use-module (gnu packages algebra)
@@ -9724,3 +9724,35 @@  characters, mouse support, and auto suggestions.")
       (native-inputs
        `(("python2-setuptools" ,python2-setuptools)
          ,@(package-native-inputs base))))))
+
+(define-public python-jedi
+  (package
+    (name "python-jedi")
+    (version "0.9.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "https://pypi.python.org/packages/"
+               "3a/37/629080b92b87bc65e3b1b4f5d539e22aa5dc45637eab0dd4b0cd8cf236c2/jedi-"
+               version
+               ".tar.gz"))
+        (sha256
+          (base32
+            "0c8x962ynpx001fdvp07m2q5jk4igkxbj3rmnydavphvlgxijk1v"))))
+    (build-system python-build-system)
+    (home-page "https://github.com/davidhalter/jedi")
+    (synopsis
+      "Autocompletion for Python that can be used for text editors")
+    (description
+      "Jedi is an autocompletion tool for Python that can be used for text editors.")
+    (license expat)
+    (properties `((python2-variant . ,(delay python2-jedi))))))
+
+(define-public python2-jedi
+  (let ((base (package-with-python2 (strip-python2-variant python-jedi))))
+    (package
+      (inherit base)
+      (native-inputs
+       `(("python2-setuptools" ,python2-setuptools)
+         ,@(package-native-inputs base))))))