diff options
| -rw-r--r-- | gn/packages/python.scm | 28 | ||||
| -rw-r--r-- | gn/packages/python24.scm | 26 |
2 files changed, 32 insertions, 22 deletions
diff --git a/gn/packages/python.scm b/gn/packages/python.scm index 0eda295..e56844b 100644 --- a/gn/packages/python.scm +++ b/gn/packages/python.scm @@ -675,6 +675,34 @@ version ".tgz")) (description #f) (license #f))) +(define-public python2-piddle-1.0.15 + (package + (name "python2-piddle") + (version "1.0.15") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/piddle/piddle/" + version "/piddle-" version ".zip")) + (sha256 + (base32 + "0jaxfsrcgqb5cf2wznxnpdws5khlrdixmg85lrhq2zl9cy6dfdya")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2 + #:use-setuptools? #f + #:tests? #f)) ; tests are interactive + (native-inputs + `(("unzip" ,unzip))) + (propagated-inputs + `(("python2-pil" ,python2-pil1))) + (home-page "http://www.strout.net/info/coding/python/piddle/") + (synopsis "Plug-In Drawing, Does Little Else") + (description "PIDDLE is designed for vector graphics -- i.e., drawing of +primitives such as lines and ellipses, rather than manipulation of individual +pixels.") + (license license:gpl2+))) + (define-public python2-parallel ; guix fix number of things (package (name "python2-parallel") diff --git a/gn/packages/python24.scm b/gn/packages/python24.scm index 1751c0b..cc5e61c 100644 --- a/gn/packages/python24.scm +++ b/gn/packages/python24.scm @@ -212,31 +212,13 @@ spreadsheets without the need for COM objects.") (define-public python24-piddle (package + (inherit python2-piddle-1.0.15) (name "python24-piddle") - (version "1.0.15") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/piddle/piddle/" - version "/piddle-" version ".zip")) - (sha256 - (base32 - "0jaxfsrcgqb5cf2wznxnpdws5khlrdixmg85lrhq2zl9cy6dfdya")))) - (build-system python-build-system) (arguments - `(#:python ,python-2.4 - #:use-setuptools? #f - #:tests? #f)) ; tests are interactive - (native-inputs - `(("unzip" ,unzip))) + (substitute-keyword-arguments (package-arguments python2-piddle-1.0.15) + ((#:python _) python-2.4))) (propagated-inputs - `(("python24-pil" ,python24-pil))) - (home-page "http://www.strout.net/info/coding/python/piddle/") - (synopsis "Plug-In Drawing, Does Little Else") - (description "PIDDLE is designed for vector graphics -- i.e., drawing of -primitives such as lines and ellipses, rather than manipulation of individual -pixels.") - (license license:gpl2+))) + `(("python24-pil" ,python24-pil))))) ;; Apparently this is the library which mimics python-2.6+'s json library (define-public python24-simplejson |