(license license:gpl2+)))
(define-public fftwf
- (package (inherit fftw)
+ (package/inherit fftw
(name "fftwf")
(arguments
(substitute-keyword-arguments (package-arguments fftw)
" Single-precision version."))))
(define-public fftw-openmpi
- (package (inherit fftw)
+ (package/inherit fftw
(name "fftw-openmpi")
(inputs
`(("openmpi" ,openmpi)
(license license:lgpl2.1)))
(define-public ztoolkit-rsvg
- (package
- (inherit ztoolkit)
+ (package/inherit ztoolkit
(name "ztoolkit-rsvg")
(arguments
`(#:configure-flags `("-Denable_rsvg=true")))
(define-public python2-dendropy
(let ((base (package-with-python2 python-dendropy)))
- (package
- (inherit base)
+ (package/inherit base
(arguments
`(#:phases
(modify-phases %standard-phases
"Some components have other similar licences."))))
(define-public boost-with-python2
- (package
- (inherit boost)
+ (package/inherit boost
(name "boost-python2")
(native-inputs
`(("python" ,python-2)
(define-public python2-mock
(let ((base (package-with-python2
(strip-python2-variant python-mock))))
- (package (inherit base)
+ (package/inherit base
(propagated-inputs
`(("python2-functools32" ,python2-functools32)
("python2-funcsigs" ,python2-funcsigs)
(define-public python2-pytest-mock
(let ((base (package-with-python2
(strip-python2-variant python-pytest-mock))))
- (package (inherit base)
+ (package/inherit base
(propagated-inputs
`(("python2-mock" ,python2-mock)
,@(package-propagated-inputs base))))))
("pkg-config" ,pkg-config)))))
(define-public hplip-minimal
- (package
- (inherit hplip)
+ (package/inherit hplip
(name "hplip-minimal")
(arguments
(substitute-keyword-arguments (package-arguments hplip)
(license license:x11)))
(define-public libinput-minimal
- (package (inherit libinput)
+ (package/inherit libinput
(name "libinput-minimal")
(inputs
(fold alist-delete (package-inputs libinput)
;; module when there's a #:renamer, and that module may be empty at that point
;; in case or circular dependencies.
(define-public gnu-gettext
- (package
- (inherit gettext-minimal)
+ (package/inherit gettext-minimal
(name "gettext")
(arguments
(substitute-keyword-arguments (package-arguments gettext-minimal)
(properties `((python2-variant . ,(delay python2-pygobject))))))
(define-public python2-pygobject
- (package (inherit (strip-python2-variant python-pygobject))
- (name "python2-pygobject")
+ (let ((base (strip-python2-variant python-pygobject)))
+ (package/inherit base
+ (name "python2-pygobject")
- ;; Note: We use python-build-system here, because Meson only supports
- ;; Python 3, and needs PYTHONPATH etc set up correctly, which makes it
- ;; difficult to use for Python 2 projects.
- (build-system python-build-system)
- (arguments
- `(#:python ,python-2
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'delete-broken-tests
- (lambda _
- ;; FIXME: this test freezes and times out.
- (delete-file "tests/test_mainloop.py")
- ;; FIXME: this test fails with this kind of error:
- ;; AssertionError: <Handlers.SIG_IGN: 1> != <built-in function default_int_handler
- (delete-file "tests/test_ossig.py")
- #t)))))
- (inputs
- `(("python-pycairo" ,python2-pycairo)
- ("gobject-introspection" ,gobject-introspection)))
- (native-inputs
- `(("glib-bin" ,glib "bin")
- ("pkg-config" ,pkg-config)
- ("python-pytest" ,python2-pytest)))))
+ ;; Note: We use python-build-system here, because Meson only supports
+ ;; Python 3, and needs PYTHONPATH etc set up correctly, which makes it
+ ;; difficult to use for Python 2 projects.
+ (build-system python-build-system)
+ (arguments
+ `(#:python ,python-2
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'delete-broken-tests
+ (lambda _
+ ;; FIXME: this test freezes and times out.
+ (delete-file "tests/test_mainloop.py")
+ ;; FIXME: this test fails with this kind of error:
+ ;; AssertionError: <Handlers.SIG_IGN: 1> != <built-in function default_int_handler
+ (delete-file "tests/test_ossig.py")
+ #t)))))
+ (inputs
+ `(("python-pycairo" ,python2-pycairo)
+ ("gobject-introspection" ,gobject-introspection)))
+ (native-inputs
+ `(("glib-bin" ,glib "bin")
+ ("pkg-config" ,pkg-config)
+ ("python-pytest" ,python2-pytest))))))
(define-public perl-glib
(package
;;; A minimal variant used to break a cycle with Inkscape.
(define-public gdl-minimal
- (package
- (inherit gdl)
+ (package/inherit gdl
(name "gdl-minimal")
(arguments
'(#:phases
;;; A minimal version of libsoup used to prevent a cycle with Inkscape.
(define-public libsoup-minimal
- (package
- (inherit libsoup)
+ (package/inherit libsoup
(name "libsoup-minimal")
(outputs (delete "doc" (package-outputs libsoup)))
(arguments
(properties '((upstream-name . "pyatspi")))))
(define-public python2-pyatspi
- (package
- (inherit python-pyatspi)
+ (package/inherit python-pyatspi
(name "python2-pyatspi")
(inputs
`(("python" ,python-2)))
(define-public groff-minimal
;; Minimialist groff for use by man-db. Its closure size is less than half
;; that of the full-blown groff.
- (package
- (inherit groff)
+ (package/inherit groff
(name "groff-minimal")
(synopsis "Minimalist variant of Groff for use by man-db")
(outputs '("out"))
'())))
(define-public ffmpeg-jami
- (package
- (inherit ffmpeg)
+ (package/inherit ffmpeg
(name "ffmpeg-jami")
(native-inputs
`(("sfl-patches" ,%sfl-patches)
(license lgpl2.1+)))
(define-public libcanberra/gtk+-2
- (package (inherit libcanberra)
+ (package/inherit libcanberra
(name "libcanberra-gtk2")
(inputs `(,@(alist-delete "gtk+" (package-inputs libcanberra))
("gtk+" ,gtk+-2)))))
(define-public python2-lirc
(let ((base (package-with-python2 (strip-python2-variant python-lirc))))
- (package
- (inherit base)
+ (package/inherit base
(arguments
`(#:tests? #f ; the only tests that exist are human-interactive
#:phases
'("clang-runtime-asan-build-fixes.patch"
"clang-runtime-3.5-libsanitizer-mode-field.patch"
"clang-3.5-libsanitizer-ustat-fix.patch"))))
- (package
- (inherit runtime)
+ (package/inherit runtime
(arguments
(substitute-keyword-arguments (package-arguments runtime)
((#:phases phases '%standard-phases)
;; TODO: javadoc files contain timestamps.
(define-public java-openmpi
- (package (inherit openmpi)
+ (package/inherit openmpi
(name "java-openmpi")
(inputs
`(("openmpi" ,openmpi)
(synopsis "Java bindings for MPI")))
(define-public openmpi-thread-multiple
- (package
- (inherit openmpi)
+ (package/inherit openmpi
(name "openmpi-thread-multiple")
(arguments
(substitute-keyword-arguments (package-arguments openmpi)
(timeout . 21600))))) ;6h
(define-public libnode
- (package
- (inherit node)
+ (package/inherit node
(name "libnode")
(arguments
(substitute-keyword-arguments (package-arguments node)
(license bsd-3)))
(define-public libtirpc/hurd
- (package
- (inherit libtirpc)
+ (package/inherit libtirpc
(name "libtirpc-hurd")
(source (origin (inherit (package-source libtirpc))
- (patches (search-patches "libtirpc-hurd.patch"
- "libtirpc-hurd-client.patch"))))
+ (patches (append (origin-patches libtirpc)
+ (search-patches "libtirpc-hurd.patch"
+ "libtirpc-hurd-client.patch")))))
(arguments
(substitute-keyword-arguments (package-arguments libtirpc)
((#:configure-flags flags ''())
(license license:expat)))
(define-public bitshuffle-for-snappy
- (package
- (inherit bitshuffle)
+ (package/inherit bitshuffle
(name "bitshuffle-for-snappy")
(build-system gnu-build-system)
(arguments
(define-public python2-pycrypto
(let ((pycrypto (package-with-python2 python-pycrypto)))
- (package (inherit pycrypto)
+ (package/inherit pycrypto
(inputs
`(("python" ,python-2)
,@(alist-delete
(define-public python2-cryptography
(let ((crypto (package-with-python2
(strip-python2-variant python-cryptography))))
- (package (inherit crypto)
+ (package/inherit crypto
(propagated-inputs
`(("python2-ipaddress" ,python2-ipaddress)
("python2-backport-ssl-match-hostname"
(define-public python2-m2crypto
(let ((m2crypto (package-with-python2
(strip-python2-variant python-m2crypto))))
- (package (inherit m2crypto)
+ (package/inherit m2crypto
(propagated-inputs
`(("python2-typing" ,python2-typing))))))
(define-public python2-html2text
(let ((base (package-with-python2 python-html2text)))
- (package
- (inherit base)
+ (package/inherit base
;; This is the last version with support for Python 2.
(version "2019.8.11")
(source (origin
(define-public python2-tornado
(let ((tornado (package-with-python2 (strip-python2-variant python-tornado))))
- (package (inherit tornado)
+ (package/inherit tornado
(propagated-inputs
`(("python2-backport-ssl-match-hostname"
,python2-backport-ssl-match-hostname)
(define-public python2-terminado
(let ((terminado (package-with-python2 (strip-python2-variant python-terminado))))
- (package (inherit terminado)
+ (package/inherit terminado
(propagated-inputs
`(("python2-backport-ssl-match-hostname"
,python2-backport-ssl-match-hostname)
;; python2-openssl requires special care, so package-with-python2 is
;; insufficient.
(define-public python2-ndg-httpsclient
- (package (inherit python-ndg-httpsclient)
+ (package/inherit python-ndg-httpsclient
(name "python2-ndg-httpsclient")
(arguments
(substitute-keyword-arguments (package-arguments python-ndg-httpsclient)
(define-public python2-websocket-client
(let ((base (package-with-python2
(strip-python2-variant python-websocket-client))))
- (package
- (inherit base)
+ (package/inherit base
(native-inputs
`(("python2-backport-ssl-match-hostname"
,python2-backport-ssl-match-hostname)
(define-public python2-rauth
(let ((base (package-with-python2 (strip-python2-variant python-rauth))))
- (package
- (inherit base)
+ (package/inherit base
(native-inputs `(("python2-unittest2" ,python2-unittest2)
,@(package-native-inputs base))))))
(define-public python2-url
(let ((base (package-with-python2 (strip-python2-variant python-url))))
- (package (inherit base)
+ (package/inherit base
(propagated-inputs
`(("python2-publicsuffix" ,python2-publicsuffix))))))
(define-public python2-s3transfer
(let ((base (package-with-python2 (strip-python2-variant python-s3transfer))))
- (package
- (inherit base)
+ (package/inherit base
(native-inputs
`(("python2-futures" ,python2-futures)
,@(package-native-inputs base))))))
(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))))))
;; Both 2.x and 3.x used to be called "python". In commit
;; a7714d42de2c3082f3609d1e63c83d703fb39cf9 (March 2018), we renamed the
;; Python 2.x package to "python2".
- (package
- (inherit python-2)
+ (package/inherit python-2
(name "python")
(properties `((superseded . ,python-2)))))
(license license:gpl3)))
(define-public python2-sip
- (package (inherit python-sip)
+ (package/inherit python-sip
(name "python2-sip")
(native-inputs
`(("python" ,python-2)))))
;; Ultimately, it would be nicer to have a more modular set of python-pyqt-*
;; packages that could be used together.
(define-public python-pyqt-without-qtwebkit
- (package (inherit python-pyqt)
+ (package/inherit python-pyqt
(name "python-pyqt-without-qtwebkit")
(inputs
(alist-delete "qtwebkit" (package-inputs python-pyqt)))))
(define-public python2-pyqt
- (package (inherit python-pyqt)
+ (package/inherit python-pyqt
(name "python2-pyqt")
(propagated-inputs
`(("python-enum34" ,python2-enum34)
(license license:gpl3+)))
(define-public python-qscintilla
- (package (inherit qscintilla)
+ (package/inherit qscintilla
(name "python-qscintilla")
(arguments
`(#:configure-flags
;; variables such as PYTHONPATH, so we need to build a union package to make
;; it work.
(define-public python-pyqt+qscintilla
- (package (inherit python-pyqt)
+ (package/inherit python-pyqt
(name "python-pyqt+qscintilla")
(source #f)
(build-system trivial-build-system)
;; support for HP scanners whose backends are not maintained by the SANE
;; project, and builds all of those backends.
(define-public sane-backends
- (package
- (inherit sane-backends-minimal)
+ (package/inherit sane-backends-minimal
(name "sane-backends")
(inputs
`(("hplip" ,(@ (gnu packages cups) hplip-minimal))
(license lgpl3+)))
(define-public guile3.0-sdl2
- (package
- (inherit guile-sdl2)
+ (package/inherit guile-sdl2
(name "guile3.0-sdl2")
(native-inputs
`(("guile" ,guile-3.0)
(license license:lgpl2.1+)))
(define-public checkpolicy
- (package (inherit libsepol)
+ (package/inherit libsepol
(name "checkpolicy")
(arguments
`(#:tests? #f ; there is no check target
(license license:gpl2)))
(define-public libselinux
- (package (inherit libsepol)
+ (package/inherit libsepol
(name "libselinux")
(outputs '("out" "python"))
(arguments
(license license:public-domain)))
(define-public libsemanage
- (package (inherit libsepol)
+ (package/inherit libsepol
(name "libsemanage")
(arguments
(substitute-keyword-arguments (package-arguments libsepol)
(license license:lgpl2.1+)))
(define-public secilc
- (package (inherit libsepol)
+ (package/inherit libsepol
(name "secilc")
(arguments
(substitute-keyword-arguments (package-arguments libsepol)
(license license:bsd-2)))
(define-public python-sepolgen
- (package (inherit libsepol)
+ (package/inherit libsepol
(name "python-sepolgen")
(arguments
`(#:modules ((srfi srfi-1)
license:gpl2+))))
(define-public policycoreutils
- (package (inherit libsepol)
+ (package/inherit libsepol
(name "policycoreutils")
(arguments
`(#:test-target "test"
(synopsis "Lua bindings for the libmpack binary serialization library")))
(define-public lua5.1-libmpack
- (package (inherit lua-libmpack)
+ (package/inherit lua-libmpack
(name "lua5.1-libmpack")
(arguments
(substitute-keyword-arguments (package-arguments lua-libmpack)
`(("lua" ,lua-5.1)))))
(define-public lua5.2-libmpack
- (package (inherit lua-libmpack)
+ (package/inherit lua-libmpack
(name "lua5.2-libmpack")
(arguments
(substitute-keyword-arguments (package-arguments lua-libmpack)
license:lgpl3+))))
(define-public fenics
- (package (inherit fenics-dolfin)
+ (package/inherit fenics-dolfin
(name "fenics")
(build-system python-build-system)
(inputs
(define-public python2-statsmodels
(let ((stats (package-with-python2 python-statsmodels)))
- (package (inherit stats)
+ (package/inherit stats
(propagated-inputs
`(("python2-pytz" ,python2-pytz)
("python2-numpy" ,python2-numpy)
(define-public info-reader
;; The idea of this package is to have the standalone Info reader without
;; the dependency on Perl that 'makeinfo' drags.
- (package
- (inherit texinfo)
+ (package/inherit texinfo
(name "info-reader")
(arguments
`(,@(substitute-keyword-arguments (package-arguments texinfo)
#t)))))))
(define-public wxwidgets-gtk2
- (package (inherit wxwidgets)
+ (package/inherit wxwidgets
(inputs `(("gtk+" ,gtk+-2)
,@(alist-delete
"gtk+"
`(cons "--enable-mediactrl" ,flags))))))
(define-public wxwidgets-gtk2-3.1
- (package (inherit wxwidgets-3.1)
+ (package/inherit wxwidgets-3.1
(inputs `(("gtk+" ,gtk+-2)
,@(alist-delete
"gtk+"
"See 'COPYING' in the distribution."))))
(define-public xmlsec-nss
- (package
- (inherit xmlsec)
+ (package/inherit xmlsec
(name "xmlsec-nss")
(native-inputs
;; For tests.
license:bsd-3))))
(define-public uim-gtk
- (package
- (inherit uim)
+ (package/inherit uim
(name "uim-gtk")
(inputs
`(("gtk" ,gtk+)
(synopsis "Multilingual input method framework (GTK+ support)")))
(define-public uim-qt
- (package
- (inherit uim)
+ (package/inherit uim
(name "uim-qt")
(inputs
`(("qt" ,qtbase)
;; Otherwise build the new package object graph.
((eq? (package-build-system p) python-build-system)
- (package
- (inherit p)
+ (package/inherit p
(location (package-location p))
(name (let ((name (package-name p)))
(string-append new-prefix
(define (strip-python2-variant p)
"Remove the 'python2-variant' property from P."
- (package
- (inherit p)
+ (package/inherit p
(properties (alist-delete 'python2-variant (package-properties p)))))
(define* (lower name