(define-public python2-psutil
(let ((base (package-with-python2 (strip-python2-variant python-psutil))))
- (package
- (inherit base)
+ (package/inherit base
(propagated-inputs
`(("python2-enum34" ,python2-enum34) ;optional
,@(package-propagated-inputs base))))))
(define-public python2-serpent
(let ((base (package-with-python2 (strip-python2-variant python-serpent))))
- (package
- (inherit base)
+ (package/inherit base
(propagated-inputs
`(("python-enum34" ,python2-enum34)
,@(package-propagated-inputs base))))))
(define-public python2-humanfriendly
(let ((base (package-with-python2
(strip-python2-variant python-humanfriendly))))
- (package (inherit base)
+ (package/inherit base
(propagated-inputs
`(("python2-monotonic" ,python2-monotonic)
,@(package-propagated-inputs base))))))
(define-public python2-empy
(let ((base (package-with-python2 (strip-python2-variant python-empy))))
- (package
- (inherit base)
+ (package/inherit base
(arguments `(,@(package-arguments base)
#:tests? #t)))))
(define-public python2-parse-type
(let ((base (package-with-python2
(strip-python2-variant python-parse-type))))
- (package (inherit base)
+ (package/inherit base
(propagated-inputs
`(("python2-enum34" ,python2-enum34)
,@(package-propagated-inputs base))))))
(define-public python2-polib
(let ((base (package-with-python2 (strip-python2-variant python-polib))))
- (package
- (inherit base)
+ (package/inherit base
(arguments `(,@(package-arguments base)
;; Tests don't work with python2.
#:tests? #f)))))
(define-public python2-jsonschema
(let ((jsonschema (package-with-python2
(strip-python2-variant python-jsonschema))))
- (package (inherit jsonschema)
+ (package/inherit jsonschema
(propagated-inputs
`(("python2-functools32" ,python2-functools32)
,@(package-propagated-inputs jsonschema))))))
(properties `((python2-variant . ,(delay python2-pystache))))))
(define-public python2-pystache
- (package (inherit (package-with-python2
- (strip-python2-variant python-pystache)))
- (arguments
- `(#:python ,python-2
- #:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda _
- (invoke "python" "test_pystache.py"))))))))
+ (let ((base (package-with-python2
+ (strip-python2-variant python-pystache))))
+ (package/inherit base
+ (arguments
+ `(#:python ,python-2
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda _
+ (invoke "python" "test_pystache.py")))))))))
(define-public python-joblib
(package
(define-public python2-cython
(let ((base (package-with-python2 (strip-python2-variant python-cython))))
- (package
- (inherit base)
+ (package/inherit base
(name "python2-cython")
(inputs
`(("python-2" ,python-2))) ;this is not automatically changed
(define-public python2-numpydoc
(let ((base (package-with-python2
(strip-python2-variant python-numpydoc))))
- (package
- (inherit base)
+ (package/inherit base
(propagated-inputs
`(("python2-jinja2" ,python2-jinja2)
,@(package-propagated-inputs base))))))
(define-public python2-ipyparallel
(let ((ipyparallel (package-with-python2 python-ipyparallel)))
- (package
- (inherit ipyparallel)
+ (package/inherit ipyparallel
(propagated-inputs
`(("python2-futures" ,python2-futures)
,@(package-propagated-inputs ipyparallel))))))
(define-public python2-traitlets
(let ((traitlets (package-with-python2 (strip-python2-variant python-traitlets))))
- (package
- (inherit traitlets)
+ (package/inherit traitlets
(propagated-inputs
`(("python2-enum34" ,python2-enum34)
,@(package-propagated-inputs traitlets))))))
(license license:expat)))
(define-public python2-dbus
- (package (inherit python-dbus)
+ (package/inherit python-dbus
(name "python2-dbus")
(inputs `(("python" ,python-2)
,@(alist-delete "python"
(properties `((python2-variant . ,(delay python2-beautifulsoup4))))))
(define-public python2-beautifulsoup4
- (package
- (inherit (package-with-python2
- (strip-python2-variant python-beautifulsoup4)))
- (arguments `(#:python ,python-2))))
+ (let ((base (package-with-python2
+ (strip-python2-variant python-beautifulsoup4))))
+ (package/inherit base
+ (arguments `(#:python ,python-2)))))
(define-public python-soupsieve
(package
(define-public python2-pep517
(let ((base (package-with-python2
(strip-python2-variant python-pep517))))
- (package
- (inherit base)
+ (package/inherit base
(name "python2-pep517")
(arguments
`(#:tests? #f
(define-public python2-flake8
(let ((base (package-with-python2 (strip-python2-variant python-flake8))))
- (package (inherit base)
+ (package/inherit base
(propagated-inputs
`(("python2-configparser" ,python2-configparser)
("python2-enum34" ,python2-enum34)
(properties `((python2-variant . ,(delay python2-llfuse))))))
(define-public python2-llfuse
- (package (inherit (package-with-python2
- (strip-python2-variant python-llfuse)))
- (propagated-inputs `(("python2-contextlib2" ,python2-contextlib2)))))
+ (let ((base (package-with-python2
+ (strip-python2-variant python-llfuse))))
+ (package/inherit base
+ (propagated-inputs `(("python2-contextlib2" ,python2-contextlib2))))))
(define-public python-msgpack
(package
(license license:asl2.0)))
(define-public python2-tlsh
- (package
- (inherit python-tlsh)
+ (package/inherit python-tlsh
(name "python2-tlsh")
(inputs `(("python" ,python-2)))))
(package-with-python2 python-libarchive-c))
(define-public python-file
- (package
- (inherit file)
+ (package/inherit file
(name "python-file")
(build-system python-build-system)
(arguments
(define-public python2-notebook
(let ((base (package-with-python2
(strip-python2-variant python-notebook))))
- (package (inherit base)
+ (package/inherit base
(native-inputs
`(("python2-mock" ,python2-mock)
,@(package-native-inputs base)))
;; the functionality in both packages working, strip down the
;; python-jupyter-console package when using it as an input to python-ipython.
(define python-jupyter-console-minimal
- (package
- (inherit python-jupyter-console)
+ (package/inherit python-jupyter-console
(name "python-jupyter-console-minimal")
(arguments
(substitute-keyword-arguments
(define-public python2-contextlib2
(let ((base (package-with-python2
(strip-python2-variant python-contextlib2))))
- (package
- (inherit base)
+ (package/inherit base
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:phases phases)
(define-public python2-promise
(let ((promise (package-with-python2
(strip-python2-variant python-promise))))
- (package (inherit promise)
+ (package/inherit promise
(arguments (substitute-keyword-arguments (package-arguments promise)
((#:tests? _) #t)))
(native-inputs
(define-public python2-anyjson
(let ((anyjson (package-with-python2
(strip-python2-variant python-anyjson))))
- (package
- (inherit anyjson)
+ (package/inherit anyjson
(arguments `(;; Unlike the python 3 variant, we do run tests. See above!
#:tests? #t
,@(package-arguments anyjson)))
(define-public python2-amqp
(let ((amqp (package-with-python2
(strip-python2-variant python-amqp))))
- (package
- (inherit amqp)
+ (package/inherit amqp
(arguments `(;; Tries to run coverage tests with nose-cover3, which seems
;; unmaintained. Weirdly, does not do this on the python 3
;; version?
(define-public python2-kombu
(let ((kombu (package-with-python2
(strip-python2-variant python-kombu))))
- (package
- (inherit kombu)
+ (package/inherit kombu
(arguments `(;; FIXME: 'TestTransport.test_del_sync' fails on python2.
;; It works fine on the python3 variant.
#:tests? #f
(define-public python2-billiard
(let ((billiard (package-with-python2
(strip-python2-variant python-billiard))))
- (package
- (inherit billiard)
+ (package/inherit billiard
(native-inputs `(("python2-unittest2" ,python2-unittest2)
("python2-mock" ,python2-mock)
,@(package-native-inputs billiard))))))
(define-public python2-celery
(let ((celery (package-with-python2
(strip-python2-variant python-celery))))
- (package
- (inherit celery)
+ (package/inherit celery
(native-inputs `(("python2-unittest2" ,python2-unittest2)
("python2-mock" ,python2-mock)
,@(package-native-inputs celery))))))
(define-public python2-whoosh
(let ((whoosh (package-with-python2 (strip-python2-variant python-whoosh))))
- (package (inherit whoosh)
+ (package/inherit whoosh
(propagated-inputs
`(("python2-backport-ssl-match-hostname"
,python2-backport-ssl-match-hostname)
(define-public python2-jellyfish
(let ((jellyfish (package-with-python2
(strip-python2-variant python-jellyfish))))
- (package (inherit jellyfish)
+ (package/inherit jellyfish
(native-inputs `(("python2-unicodecsv" ,python2-unicodecsv)
,@(package-native-inputs jellyfish))))))
(license license:gpl2)))
(define-public python-rope
- (package
- (inherit python2-rope)
+ (package/inherit python2-rope
(name "python-rope")
(arguments `(#:python ,python-wrapper
;; XXX: Only partial python3 support, results in some failing
(define-public ptpython-2
(let ((base (package-with-python2 (strip-python2-variant ptpython))))
- (package
- (inherit base)
+ (package/inherit base
(name "ptpython2"))))
(define-public python-stem
(define-public python2-binaryornot
(let ((base (package-with-python2 (strip-python2-variant python-binaryornot))))
- (package (inherit base)
+ (package/inherit base
(propagated-inputs
`(("python2-enum34" ,python2-enum34)
,@(package-propagated-inputs base))))))
(define-public python2-setproctitle
(let ((base (package-with-python2
(strip-python2-variant python-setproctitle))))
- (package
- (inherit base)
+ (package/inherit base
(native-inputs `(("python2-nose" ,python2-nose)
,@(package-native-inputs base))))))
(define-public python2-argcomplete
(let ((variant (package-with-python2
(strip-python2-variant python-argcomplete))))
- (package
- (inherit variant)
+ (package/inherit variant
(arguments
(substitute-keyword-arguments (package-arguments variant)
((#:phases phases '%standard-phases)
(define-public python2-xopen
(let ((base (package-with-python2
(strip-python2-variant python-xopen))))
- (package
- (inherit base)
+ (package/inherit base
(propagated-inputs `(("python2-bz2file" ,python2-bz2file)
,@(package-propagated-inputs base))))))
(define-public python2-isort
(let ((base (package-with-python2
(strip-python2-variant python-isort))))
- (package (inherit base)
+ (package/inherit base
(native-inputs
`(("python2-futures" ,python2-futures)
,@(package-native-inputs base))))))
(define-public python2-radon
(let ((base (package-with-python2 (strip-python2-variant python-radon))))
- (package
- (inherit base)
+ (package/inherit base
(propagated-inputs
`(("python-configparser" ,python2-configparser)
("python-future" ,python2-future)
(define-public python2-rfc6555
(let ((base (package-with-python2
(strip-python2-variant python-rfc6555))))
- (package
- (inherit base)
+ (package/inherit base
(propagated-inputs
`(("python2-selectors2" ,python2-selectors2))))))
(define-public python2-activepapers
(let ((base (package-with-python2
(strip-python2-variant python-activepapers))))
- (package
- (inherit base)
+ (package/inherit base
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:phases phases)
(license license:bsd-3)))
(define-public python2-send2trash
- (package
- (inherit (package-with-python2 (strip-python2-variant python-send2trash)))
- (arguments
- (substitute-keyword-arguments (package-arguments python-send2trash)
- ((#:phases phases)
- `(modify-phases ,phases
- (add-before 'check 'setenv
- (lambda _
- (setenv "PYTHONPATH"
- (string-append (getcwd) ":" (getenv "PYTHONPATH")))
- #t))))))))
+ (let ((base (package-with-python2
+ (strip-python2-variant python-send2trash))))
+ (package/inherit base
+ (arguments
+ (substitute-keyword-arguments (package-arguments python-send2trash)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-before 'check 'setenv
+ (lambda _
+ (setenv "PYTHONPATH"
+ (string-append (getcwd) ":" (getenv "PYTHONPATH")))
+ #t)))))))))
(define-public python-pyfavicon
(package
(define-public python2-cloudpickle
(let ((base (package-with-python2 (strip-python2-variant python-cloudpickle))))
- (package
- (inherit base)
+ (package/inherit base
(native-inputs
`(("python-mock" ,python2-mock)
,@(package-native-inputs base)))
(define-public python2-reparser
(let ((reparser (package-with-python2
(strip-python2-variant python-reparser))))
- (package (inherit reparser)
+ (package/inherit reparser
(propagated-inputs
`(("python2-enum34" ,python2-enum34)
,@(package-propagated-inputs reparser))))))