summaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2021-03-17 03:42:12 -0400
committerMark H Weaver <mhw@netris.org>2021-03-17 03:58:10 -0400
commit1a265842e634656411bc7304c4648273f174f65e (patch)
tree2937651fb2e03417c833cee58675b87da0117c28 /gnu/packages
parentd9f501b61997e1dd4bfa01db3d6e6a502e43adba (diff)
gnu: Use PACKAGE/INHERIT in more places.
* gnu/packages/algebra.scm (fftwf, fftw-openmpi), gnu/packages/audio.scm (ztoolkit-rsvg), gnu/packages/bioinformatics.scm (python2-dendropy), gnu/packages/boost.scm (boost-with-python2), gnu/packages/check.scm (python2-mock, python2-pytest-mock), gnu/packages/cups.scm (hplip-minimal), gnu/packages/freedesktop.scm (libinput-minimal), gnu/packages/gettext.scm (gnu-gettext), gnu/packages/glib.scm (python2-pygobject), gnu/packages/gnome.scm (gdl-minimal, libsoup-minimal, python2-pyatspi), gnu/packages/groff.scm (groff-minimal), gnu/packages/jami.scm (ffmpeg-jami), gnu/packages/libcanberra.scm (libcanberra/gtk+-2), gnu/packages/lirc.scm (python2-lirc), gnu/packages/llvm.scm (clang-runtime-3.5), gnu/packages/mpi.scm (java-openmpi, openmpi-thread-multiple), gnu/packages/node.scm (libnode), gnu/packages/onc-rpc.scm (libtirpc/hurd), gnu/packages/python-compression.scm (bitshuffle-for-snappy), gnu/packages/python-crypto.scm (python2-pycrypto, python2-cryptography) (python2-cryptography, python2-m2crypto), gnu/packages/python-web.scm (python2-html2text, python2-tornado) (python2-terminado, python2-ndg-httpsclient, python2-websocket-client) (python2-rauth, python2-url, python2-s3transfer), gnu/packages/python-xyz.scm (python2-psutil, python2-serpent) (python2-humanfriendly, python2-empy, python2-parse-type, python2-polib) (python2-jsonschema, python2-pystache, python2-cython, python2-numpydoc) (python2-ipyparallel, python2-traitlets, python2-dbus) (python2-beautifulsoup4, python2-pep517, python2-flake8, python2-llfuse) (python2-tlsh, python-file, python2-notebook, python-jupyter-console-minimal) (python2-contextlib2, python2-promise, python2-anyjson, python2-amqp) (python2-kombu, python2-billiard, python2-celery, python2-whoosh) (python2-jellyfish, python-rope, ptpython-2, python2-binaryornot) (python2-setproctitle, python2-argcomplete, python2-xopen, python2-isort) (python2-radon, python2-rfc6555, python2-activepapers, python2-send2trash) (python2-cloudpickle, python2-reparser), gnu/packages/python.scm (python2-called-python), gnu/packages/qt.scm (python2-sip, python-pyqt-without-qtwebkit, python2-pyqt) (python-qscintilla, python-pyqt+qscintilla), gnu/packages/scanner.scm (sane-backends), gnu/packages/sdl.scm (guile3.0-sdl2), gnu/packages/selinux.scm (checkpolicy, libselinux, libsemanage, secilc) (python-sepolgen, policycoreutils), gnu/packages/serialization.scm (lua5.1-libmpack, lua5.2-libmpack), gnu/packages/simulation.scm (fenics), gnu/packages/statistics.scm (python2-statsmodels), gnu/packages/texinfo.scm (info-reader), gnu/packages/wxwidgets.scm (wxwidgets-gtk2, wxwidgets-gtk2-3.1), gnu/packages/xml.scm (xmlsec-nss), gnu/packages/xorg.scm (uim-gtk, uim-qt), guix/build-system/python.scm (package-with-explicit-python) (strip-python2-variant): Use PACKAGE/INHERIT.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/algebra.scm4
-rw-r--r--gnu/packages/audio.scm3
-rw-r--r--gnu/packages/bioinformatics.scm3
-rw-r--r--gnu/packages/boost.scm3
-rw-r--r--gnu/packages/check.scm4
-rw-r--r--gnu/packages/cups.scm3
-rw-r--r--gnu/packages/freedesktop.scm2
-rw-r--r--gnu/packages/gettext.scm3
-rw-r--r--gnu/packages/glib.scm51
-rw-r--r--gnu/packages/gnome.scm9
-rw-r--r--gnu/packages/groff.scm3
-rw-r--r--gnu/packages/jami.scm3
-rw-r--r--gnu/packages/libcanberra.scm2
-rw-r--r--gnu/packages/lirc.scm3
-rw-r--r--gnu/packages/llvm.scm3
-rw-r--r--gnu/packages/mpi.scm5
-rw-r--r--gnu/packages/node.scm3
-rw-r--r--gnu/packages/onc-rpc.scm8
-rw-r--r--gnu/packages/python-compression.scm3
-rw-r--r--gnu/packages/python-crypto.scm6
-rw-r--r--gnu/packages/python-web.scm20
-rw-r--r--gnu/packages/python-xyz.scm162
-rw-r--r--gnu/packages/python.scm3
-rw-r--r--gnu/packages/qt.scm10
-rw-r--r--gnu/packages/scanner.scm3
-rw-r--r--gnu/packages/sdl.scm3
-rw-r--r--gnu/packages/selinux.scm12
-rw-r--r--gnu/packages/serialization.scm4
-rw-r--r--gnu/packages/simulation.scm2
-rw-r--r--gnu/packages/statistics.scm2
-rw-r--r--gnu/packages/texinfo.scm3
-rw-r--r--gnu/packages/wxwidgets.scm4
-rw-r--r--gnu/packages/xml.scm3
-rw-r--r--gnu/packages/xorg.scm6
34 files changed, 156 insertions, 205 deletions
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index d2caa13d0e..129d922751 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -794,7 +794,7 @@ cosine/ sine transforms or DCT/DST).")
(license license:gpl2+)))
(define-public fftwf
- (package (inherit fftw)
+ (package/inherit fftw
(name "fftwf")
(arguments
(substitute-keyword-arguments (package-arguments fftw)
@@ -812,7 +812,7 @@ cosine/ sine transforms or DCT/DST).")
" Single-precision version."))))
(define-public fftw-openmpi
- (package (inherit fftw)
+ (package/inherit fftw
(name "fftw-openmpi")
(inputs
`(("openmpi" ,openmpi)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 67a3e57dd9..8b23f04fe5 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -4918,8 +4918,7 @@ edited, converted, compressed and saved.")
(license license:lgpl2.1)))
(define-public ztoolkit-rsvg
- (package
- (inherit ztoolkit)
+ (package/inherit ztoolkit
(name "ztoolkit-rsvg")
(arguments
`(#:configure-flags `("-Denable_rsvg=true")))
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 90e81354a5..eb466868d1 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2744,8 +2744,7 @@ trees (phylogenies) and characters.")
(define-public python2-dendropy
(let ((base (package-with-python2 python-dendropy)))
- (package
- (inherit base)
+ (package/inherit base
(arguments
`(#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index b1ab8a4ec9..1323e28278 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -200,8 +200,7 @@ across a broad spectrum of applications.")
"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)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index cfda247d67..21514d1bc4 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -836,7 +836,7 @@ have been used.")
(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)
@@ -1240,7 +1240,7 @@ same arguments.")
(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))))))
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 2edd5d245c..b18273109e 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -676,8 +676,7 @@ should only be used as part of the Guix cups-pk-helper service.")
("pkg-config" ,pkg-config)))))
(define-public hplip-minimal
- (package
- (inherit hplip)
+ (package/inherit hplip
(name "hplip-minimal")
(arguments
(substitute-keyword-arguments (package-arguments hplip)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index e5f9ea71b6..4105dd7ca0 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -508,7 +508,7 @@ other applications that need to directly deal with input devices.")
(license license:x11)))
(define-public libinput-minimal
- (package (inherit libinput)
+ (package/inherit libinput
(name "libinput-minimal")
(inputs
(fold alist-delete (package-inputs libinput)
diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index bee33f2685..21228694d7 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -139,8 +139,7 @@ translated messages from the catalogs. Nearly all GNU packages use Gettext.")
;; 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)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 1b9cd71785..5f710a4a38 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -833,32 +833,33 @@ useful for C++.")
(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
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c5223e7b3f..e738b8fc1f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2433,8 +2433,7 @@ GNOME Desktop.")
;;; 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
@@ -4899,8 +4898,7 @@ and the GLib main loop, to integrate well with GNOME applications.")
;;; 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
@@ -10099,8 +10097,7 @@ accessibility infrastructure.")
(properties '((upstream-name . "pyatspi")))))
(define-public python2-pyatspi
- (package
- (inherit python-pyatspi)
+ (package/inherit python-pyatspi
(name "python2-pyatspi")
(inputs
`(("python" ,python-2)))
diff --git a/gnu/packages/groff.scm b/gnu/packages/groff.scm
index 0803a2a7f5..fdb8440a39 100644
--- a/gnu/packages/groff.scm
+++ b/gnu/packages/groff.scm
@@ -128,8 +128,7 @@ is usually the formatter of \"man\" documentation pages.")
(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"))
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index c47293b5c1..3773c1ab0a 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -365,8 +365,7 @@ of Jami."
'())))
(define-public ffmpeg-jami
- (package
- (inherit ffmpeg)
+ (package/inherit ffmpeg
(name "ffmpeg-jami")
(native-inputs
`(("sfl-patches" ,%sfl-patches)
diff --git a/gnu/packages/libcanberra.scm b/gnu/packages/libcanberra.scm
index 2d08fb46e3..e263ba2efc 100644
--- a/gnu/packages/libcanberra.scm
+++ b/gnu/packages/libcanberra.scm
@@ -105,7 +105,7 @@ null) and is designed to be portable.")
(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)))))
diff --git a/gnu/packages/lirc.scm b/gnu/packages/lirc.scm
index 2b0cea16ab..f840f49a23 100644
--- a/gnu/packages/lirc.scm
+++ b/gnu/packages/lirc.scm
@@ -140,8 +140,7 @@ on just one button press.")
(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
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index fb45668735..0a1b6c84ce 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -821,8 +821,7 @@ of programming tools as well as libraries with equivalent functionality.")
'("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)
diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index 53ee6ef1cd..9a4dc6dc64 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -300,7 +300,7 @@ software vendors, application developers and computer science researchers.")
;; TODO: javadoc files contain timestamps.
(define-public java-openmpi
- (package (inherit openmpi)
+ (package/inherit openmpi
(name "java-openmpi")
(inputs
`(("openmpi" ,openmpi)
@@ -344,8 +344,7 @@ software vendors, application developers and computer science researchers.")
(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)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index dec6cc2b7c..a0df3d2cad 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -212,8 +212,7 @@ devices.")
(timeout . 21600))))) ;6h
(define-public libnode
- (package
- (inherit node)
+ (package/inherit node
(name "libnode")
(arguments
(substitute-keyword-arguments (package-arguments node)
diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm
index 14ff13c038..c58bdb1dfc 100644
--- a/gnu/packages/onc-rpc.scm
+++ b/gnu/packages/onc-rpc.scm
@@ -75,12 +75,12 @@ IPv4 and IPv6. ONC RPC is notably used by the network file system (NFS).")
(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 ''())
diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm
index 6b2da5f925..2065e6e38f 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -202,8 +202,7 @@ algorithm within the Numpy framework.")
(license license:expat)))
(define-public bitshuffle-for-snappy
- (package
- (inherit bitshuffle)
+ (package/inherit bitshuffle
(name "bitshuffle-for-snappy")
(build-system gnu-build-system)
(arguments
diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 2712482e6f..97fcd96c88 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -334,7 +334,7 @@ etc.). The package is structured to make adding new modules easy.")
(define-public python2-pycrypto
(let ((pycrypto (package-with-python2 python-pycrypto)))
- (package (inherit pycrypto)
+ (package/inherit pycrypto
(inputs
`(("python" ,python-2)
,@(alist-delete
@@ -553,7 +553,7 @@ message digests and key derivation functions.")
(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"
@@ -1122,7 +1122,7 @@ through the Engine interface.")
(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))))))
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index ea75fa9390..c79b4eb937 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -708,8 +708,7 @@ Swartz.")
(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
@@ -1725,7 +1724,7 @@ connection to each user.")
(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)
@@ -1784,7 +1783,7 @@ term.js Javascript terminal emulator library.")
(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)
@@ -2371,7 +2370,7 @@ verification of the SSL peer.")
;; 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)
@@ -2403,8 +2402,7 @@ WebSocket usage in Python programs.")
(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)
@@ -2710,8 +2708,7 @@ authenticated session objects providing things like keep-alive.")
(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))))))
@@ -3211,7 +3208,7 @@ provide an easy-to-use Python interface for building OAuth1 and OAuth2 clients."
(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))))))
@@ -3373,8 +3370,7 @@ transfers.")
(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))))))
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b98b0666cf..2cd6f55f4d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -580,8 +580,7 @@ iotop, uptime, pidof, tty, taskset, pmap.")
(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))))))
@@ -1183,8 +1182,7 @@ other machines, such as over the network.")
(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))))))
@@ -1357,7 +1355,7 @@ helpers.")
(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))))))
@@ -2184,8 +2182,7 @@ commands.")
(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)))))
@@ -2314,7 +2311,7 @@ backported for previous versions of Python from 2.4 to 3.3.")
(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))))))
@@ -2363,8 +2360,7 @@ existing ones.")
(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)))))
@@ -2962,7 +2958,7 @@ compare, diff, and patch JSON and JSON-like structures in Python.")
(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))))))
@@ -3459,15 +3455,16 @@ logic-free templating system Mustache.")
(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
@@ -4524,8 +4521,7 @@ writing C extensions for Python as easy as Python itself.")
(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
@@ -5075,8 +5071,7 @@ that client code uses to construct the grammar directly in Python code.")
(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))))))
@@ -7120,8 +7115,7 @@ CLI scripts:
(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))))))
@@ -7209,8 +7203,7 @@ without using the configuration machinery.")
(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))))))
@@ -7762,7 +7755,7 @@ implementation of D-Bus.")
(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"
@@ -7836,10 +7829,10 @@ converts incoming documents to Unicode and outgoing documents to UTF-8.")
(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
@@ -8561,8 +8554,7 @@ PEP 8.")
(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
@@ -8654,7 +8646,7 @@ complexity of Python source code.")
(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)
@@ -9180,9 +9172,10 @@ third-party code.")
(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
@@ -9930,8 +9923,7 @@ a hash value.")
(license license:asl2.0)))
(define-public python2-tlsh
- (package
- (inherit python-tlsh)
+ (package/inherit python-tlsh
(name "python2-tlsh")
(inputs `(("python" ,python-2)))))
@@ -10020,8 +10012,7 @@ Python's @code{ctypes} foreign function interface (FFI).")
(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
@@ -10379,7 +10370,7 @@ interactive computing.")
(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)))
@@ -10513,8 +10504,7 @@ Jupyter kernels such as IJulia and IRKernel.")
;; 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
@@ -10854,8 +10844,7 @@ the standard library.")
(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)
@@ -11325,7 +11314,7 @@ concurrent.futures package from Python 3.2")
(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
@@ -12029,8 +12018,7 @@ and provides a uniform API regardless of which JSON implementation is used.")
(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)))
@@ -12067,8 +12055,7 @@ alternative when librabbitmq is not available.")
(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?
@@ -12140,8 +12127,7 @@ RabbitMQ messaging server is the most popular implementation.")
(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
@@ -12178,8 +12164,7 @@ Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.")
(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))))))
@@ -12229,8 +12214,7 @@ synchronously (wait until ready).")
(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))))))
@@ -12384,7 +12368,7 @@ checking library.")
(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)
@@ -12498,7 +12482,7 @@ encoding algorithms to do fuzzy string matching.")
(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))))))
@@ -12913,8 +12897,7 @@ to occurrences in strings and comments.")
(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
@@ -14217,8 +14200,7 @@ etc.")
(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
@@ -14361,7 +14343,7 @@ binary or text.")
(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))))))
@@ -14878,8 +14860,7 @@ is used by PostgreSQL and the OpenSSH Server for example.")
(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))))))
@@ -15070,8 +15051,7 @@ network.")
(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)
@@ -15195,8 +15175,7 @@ possible on all supported Python versions.")
(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))))))
@@ -16061,7 +16040,7 @@ editors.")
(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))))))
@@ -16632,8 +16611,7 @@ Supported metrics are:
(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)
@@ -16932,8 +16910,7 @@ and integration into other projects.")
(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))))))
@@ -18058,8 +18035,7 @@ such as figshare or Zenodo.")
(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)
@@ -18293,17 +18269,18 @@ user's @file{~/Trash} directory.")
(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
@@ -20164,8 +20141,7 @@ data.")
(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)))
@@ -20405,7 +20381,7 @@ on regular expressions.")
(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))))))
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 8f1bc65548..5d8fa1185b 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -366,8 +366,7 @@ data types.")
;; 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)))))
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index d921aa87fe..d58609e547 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2030,7 +2030,7 @@ module provides support functions to the automatically generated code.")
(license license:gpl3)))
(define-public python2-sip
- (package (inherit python-sip)
+ (package/inherit python-sip
(name "python2-sip")
(native-inputs
`(("python" ,python-2)))))
@@ -2215,13 +2215,13 @@ itself.")
;; 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)
@@ -2367,7 +2367,7 @@ indicators, code completion and call tips.")
(license license:gpl3+)))
(define-public python-qscintilla
- (package (inherit qscintilla)
+ (package/inherit qscintilla
(name "python-qscintilla")
(arguments
`(#:configure-flags
@@ -2415,7 +2415,7 @@ This package provides the Python bindings.")))
;; 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)
diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm
index e3ff4243bc..9b405a59af 100644
--- a/gnu/packages/scanner.scm
+++ b/gnu/packages/scanner.scm
@@ -147,8 +147,7 @@ package contains the library, but no drivers.")
;; 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))
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index e4e452fec5..8db731bbc4 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -648,8 +648,7 @@ interface.")
(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)
diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm
index 558a64a13b..4c2228871f 100644
--- a/gnu/packages/selinux.scm
+++ b/gnu/packages/selinux.scm
@@ -101,7 +101,7 @@ boolean settings).")
(license license:lgpl2.1+)))
(define-public checkpolicy
- (package (inherit libsepol)
+ (package/inherit libsepol
(name "checkpolicy")
(arguments
`(#:tests? #f ; there is no check target
@@ -139,7 +139,7 @@ module into a binary representation.")
(license license:gpl2)))
(define-public libselinux
- (package (inherit libsepol)
+ (package/inherit libsepol
(name "libselinux")
(outputs '("out" "python"))
(arguments
@@ -193,7 +193,7 @@ the core SELinux management utilities.")
(license license:public-domain)))
(define-public libsemanage
- (package (inherit libsepol)
+ (package/inherit libsepol
(name "libsemanage")
(arguments
(substitute-keyword-arguments (package-arguments libsepol)
@@ -241,7 +241,7 @@ binary policies.")
(license license:lgpl2.1+)))
(define-public secilc
- (package (inherit libsepol)
+ (package/inherit libsepol
(name "secilc")
(arguments
(substitute-keyword-arguments (package-arguments libsepol)
@@ -268,7 +268,7 @@ binary policies.")
(license license:bsd-2)))
(define-public python-sepolgen
- (package (inherit libsepol)
+ (package/inherit libsepol
(name "python-sepolgen")
(arguments
`(#:modules ((srfi srfi-1)
@@ -373,7 +373,7 @@ tools, and libraries designed to facilitate SELinux policy analysis.")
license:gpl2+))))
(define-public policycoreutils
- (package (inherit libsepol)
+ (package/inherit libsepol
(name "policycoreutils")
(arguments
`(#:test-target "test"
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index fc0102caf0..1a5b445fd6 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -220,7 +220,7 @@ that implements both the msgpack and msgpack-rpc specifications.")
(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)
@@ -240,7 +240,7 @@ that implements both the msgpack and msgpack-rpc specifications.")
`(("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)
diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm
index 45efd5c472..e1de78402d 100644
--- a/gnu/packages/simulation.scm
+++ b/gnu/packages/simulation.scm
@@ -602,7 +602,7 @@ user interface to the FEniCS core components and external libraries.")
license:lgpl3+))))
(define-public fenics
- (package (inherit fenics-dolfin)
+ (package/inherit fenics-dolfin
(name "fenics")
(build-system python-build-system)
(inputs
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index a0f3f59342..27f3bfa8ef 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -1981,7 +1981,7 @@ inference for statistical models.")
(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)
diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm
index dea26a6395..a2fe989f1a 100644
--- a/gnu/packages/texinfo.scm
+++ b/gnu/packages/texinfo.scm
@@ -156,8 +156,7 @@ is on expressing the content semantically, avoiding physical markup commands.")
(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)
diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
index f3a7fdd7a4..423da37a3c 100644
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@ -152,7 +152,7 @@ and many other languages.")
#t)))))))
(define-public wxwidgets-gtk2
- (package (inherit wxwidgets)
+ (package/inherit wxwidgets
(inputs `(("gtk+" ,gtk+-2)
,@(alist-delete
"gtk+"
@@ -183,7 +183,7 @@ and many other languages.")
`(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+"
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index f10a982294..2a72fc6ad2 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -1193,8 +1193,7 @@ Libxml2).")
"See 'COPYING' in the distribution."))))
(define-public xmlsec-nss
- (package
- (inherit xmlsec)
+ (package/inherit xmlsec
(name "xmlsec-nss")
(native-inputs
;; For tests.
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 0aa4411ddc..97ff8ab92b 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -6479,8 +6479,7 @@ and embedded platforms.")
license:bsd-3))))
(define-public uim-gtk
- (package
- (inherit uim)
+ (package/inherit uim
(name "uim-gtk")
(inputs
`(("gtk" ,gtk+)
@@ -6489,8 +6488,7 @@ and embedded platforms.")
(synopsis "Multilingual input method framework (GTK+ support)")))
(define-public uim-qt
- (package
- (inherit uim)
+ (package/inherit uim
(name "uim-qt")
(inputs
`(("qt" ,qtbase)