tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

gnu: Reference the inherited inputs values.

Browse Source 
This commit was made by running this command:

  sed -e's/modify-inputs (package-\([a-z-]*\)inputs [a-zA-Z0-9-]\+)/modify-inputs \1inputs/g' -i gnu/packages/*.scm

… and then reverting individual hunks where the change would trigger unbound
variable warnings or other issues (such as ‘native-inputs’ is bound in the
body of the ‘inputs’ field, but it refers to the ‘native-inputs’ thunk defined
just above).

Change-Id: I6d94819f2809313fa1fbefc61897502ee7d66fab
This commit is contained in:
Ludovic Courtès
2026-03-11 23:12:16 +01:00
parent 4ba653e637
commit 1ae20f03f4
131 changed files with 513 additions and 513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/packages/admin.scm
View File

@@ -2711,7 +2711,7 @@ command.")
(define-public wpa-supplicant
(package (inherit wpa-supplicant-minimal)
(name "wpa-supplicant")
(inputs (modify-inputs (package-inputs wpa-supplicant-minimal)
(inputs (modify-inputs inputs
(prepend dbus)))
(source (origin
(inherit (package-source wpa-supplicant-minimal))
@@ -2750,11 +2750,11 @@ command.")
(package
(inherit wpa-supplicant)
(name "wpa-supplicant-gui")
(inputs (modify-inputs (package-inputs wpa-supplicant)
(inputs (modify-inputs inputs
(prepend qtbase-5 qtsvg-5 qtwayland-5)))
(native-inputs
;; For icons.
(modify-inputs (package-native-inputs wpa-supplicant)
(modify-inputs native-inputs
(prepend imagemagick/stable
inkscape/pinned)))
(build-system qt-build-system)
@@ -4758,7 +4758,7 @@ system distribution, akin to many similar tools.")
#$(this-package-input "libdrm")
"/share/libdrm/amdgpu.ids"))))))
(inputs
(modify-inputs (package-inputs fastfetch-minimal)
(modify-inputs inputs
(append dbus
glib
hwdata

4
gnu/packages/aidc.scm
View File

@@ -176,7 +176,7 @@ integration of this capability into your own programs.")
qtbase)
((#:configure-flags flags ''())
#~(cons "-DZINT_QT6=ON" #$flags))))
(inputs (modify-inputs (package-inputs zint)
(inputs (modify-inputs inputs
;; The UI library of qttools is linked to; hence it must be used
;; as an input rather than a native input.
(append qtsvg qttools)))
@@ -397,7 +397,7 @@ Python as well as GUI widgets for GTK and Qt.")
((#:disallowed-references _ '())
(list qtbase gtk+))))
(propagated-inputs
(modify-inputs (package-propagated-inputs zbar)
(modify-inputs propagated-inputs
(delete "gtk+")))))
(define-public qrcodegen-cpp

2
gnu/packages/arcan.scm
View File

@@ -172,7 +172,7 @@ engine with a Lua scripting interface.")
(inherit arcan)
(name "arcan-sdl")
(inputs
(modify-inputs (package-inputs arcan)
(modify-inputs inputs
(delete "libdrm")
(prepend glu libglvnd mesa sdl2)))
(arguments

2
gnu/packages/astronomy.scm
View File

@@ -1360,7 +1360,7 @@ dynamic library for the C language implementation of HEALPix.")
(invoke "aclocal")
(invoke "automake" "--add-missing")
(invoke "autoconf"))))))
(inputs (modify-inputs (package-inputs healpix)
(inputs (modify-inputs inputs
(prepend libsharp zlib)))
(description
(string-replace-substring (package-description healpix)

2
gnu/packages/audio.scm
View File

@@ -7560,7 +7560,7 @@ minimum.")
(arguments
(list #:configure-flags '(list "-Denable_rsvg=true")))
(propagated-inputs
(modify-inputs (package-propagated-inputs ztoolkit)
(modify-inputs propagated-inputs
(prepend (librsvg-for-system))))
(synopsis "ZToolkit with SVG support")))

2
gnu/packages/base.scm
View File

@@ -792,7 +792,7 @@ included.")
(substitute* "gold/Makefile.in"
((" testsuite") " ")))))
#~())))))
(native-inputs (modify-inputs (package-native-inputs binutils)
(native-inputs (modify-inputs native-inputs
(append bc)))))
(define-public libbfd

2
gnu/packages/bioconductor.scm
View File

@@ -22959,7 +22959,7 @@ accessibility data.")
((".*find_overlapping_ccans works.*" m)
(string-append m "skip('guix')"))))))))
(propagated-inputs
(modify-inputs (package-propagated-inputs r-cicero)
(modify-inputs propagated-inputs
(delete "r-monocle")
(prepend r-monocle3))))))

4
gnu/packages/bioinformatics.scm
View File

@@ -2129,7 +2129,7 @@ Format (GFF) with Biopython integration.")
(sha256
(base32 "131hiir94jkm9jj2wfpybwndgzn8k0zc1ji1qjn5cz7w48x3ri13"))))
(propagated-inputs
(modify-inputs (package-propagated-inputs python-bcbio-gff)
(modify-inputs propagated-inputs
(replace "python-biopython" python-biopython-1.73))))))
(define bed-sample-files
@@ -6703,7 +6703,7 @@ meso, or continuum scale.")
"-D MLIAP_ENABLE_PYTHON=yes"
(string-append "-DN2P2_DIR=" #$(this-package-input "n2p2"))))))
(inputs
(modify-inputs (package-inputs lammps)
(modify-inputs inputs
(delete "pnetcdf")
(replace "hdf5-parallel-openmpi" hdf5)
(delete "openmpi")))))

2
gnu/packages/bittorrent.scm
View File

@@ -597,7 +597,7 @@ features.")
((#:configure-flags configure-flags)
#~(cons "-DGUI=OFF" #$configure-flags))))
(inputs
(modify-inputs (package-inputs base)
(modify-inputs inputs
(delete "qtsvg"))))))
(define-deprecated-package qbittorrent-nox

10
gnu/packages/boost.scm
View File

@@ -358,7 +358,7 @@ across a broad spectrum of applications.")
((#:make-flags make-flags)
#~(cons* "--without-python" #$make-flags))))
(inputs
(modify-inputs (package-inputs boost)
(modify-inputs inputs
(delete "python-minimal-wrapper")))
(properties '((hidden? . #t)))))
@@ -367,7 +367,7 @@ across a broad spectrum of applications.")
(inherit boost-1.83)
(name "boost-numpy")
(native-inputs
(modify-inputs (package-native-inputs boost)
(modify-inputs native-inputs
(append python-numpy-1)))))
(define-public boost-with-numpy
@@ -375,7 +375,7 @@ across a broad spectrum of applications.")
(inherit boost)
(name "boost-with-numpy")
(native-inputs
(modify-inputs (package-native-inputs boost)
(modify-inputs native-inputs
(append python-numpy)))
(synopsis "Boost C++ libraries with inclusion of Boost.NumPy")))
@@ -449,7 +449,7 @@ signals and slots system.")
(inherit boost)
(name "boost-mpi")
(inputs
(modify-inputs (package-inputs boost)
(modify-inputs inputs
(append openmpi)))
(arguments
(substitute-keyword-arguments arguments
@@ -469,7 +469,7 @@ signals and slots system.")
(inherit boost-mpi)
(name "boost-mpi-numpy")
(inputs
(modify-inputs (package-inputs boost-mpi)
(modify-inputs inputs
(append python-numpy)))
(synopsis "Boost C++ libraries with inclusion of Boost.MPI and Boost.NumPy")))

46
gnu/packages/bootloaders.scm
View File

@@ -312,10 +312,10 @@ menu to select one of the installed operating systems.")
(inherit grub-pc)
(name "grub-minimal")
(inputs
(modify-inputs (package-inputs grub-pc)
(modify-inputs inputs
(delete "lvm2" "mdadm" "fuse" "console-setup")))
(native-inputs
(modify-inputs (package-native-inputs grub)
(modify-inputs native-inputs
(delete "help2man" "texinfo" "parted" "qemu" "qemu-minimal" "xorriso")))
(arguments
(substitute-keyword-arguments arguments
@@ -401,7 +401,7 @@ menu to select one of the installed operating systems.")
(inherit base)
(synopsis "GRand Unified Boot loader (UEFI version)")
(inputs
(modify-inputs (package-inputs base)
(modify-inputs inputs
(prepend efibootmgr mtools)))
(native-inputs
(cond ((or (target-x86-64?)
@@ -409,7 +409,7 @@ menu to select one of the installed operating systems.")
(target-aarch64?)
(target-arm32?))
;; We add the firmware needed to run the tests.
(modify-inputs (package-native-inputs base)
(modify-inputs native-inputs
(prepend
(cond ((target-x86-64?) ovmf-x86-64)
((target-x86-32?) ovmf-i686)
@@ -419,7 +419,7 @@ menu to select one of the installed operating systems.")
(else
;; The tests are skipped in this package so we remove some
;; test dependencies.
(modify-inputs (package-native-inputs base)
(modify-inputs native-inputs
(delete "parted" "qemu-minimal" "xorriso")))))
(arguments
(substitute-keyword-arguments arguments
@@ -554,10 +554,10 @@ menu to select one of the installed operating systems.")
(native-inputs
(cond
((target-x86-64?)
(modify-inputs (package-native-inputs grub-efi)
(modify-inputs native-inputs
(replace "ovmf-x86-64" ovmf-i686)))
((target-aarch64?)
(modify-inputs (package-native-inputs grub-efi)
(modify-inputs native-inputs
(prepend
(cross-gcc "arm-linux-gnueabihf")
(cross-binutils "arm-linux-gnueabihf"))
@@ -604,7 +604,7 @@ menu to select one of the installed operating systems.")
(name "grub-hybrid")
(synopsis "GRand Unified Boot loader (hybrid version)")
(inputs
(modify-inputs (package-inputs grub-efi)
(modify-inputs inputs
(prepend grub)))
(arguments
(substitute-keyword-arguments arguments
@@ -930,7 +930,7 @@ also initializes the boards (RAM etc).")
(string-append "infodir=" info-dir)
make-flags))))))))
(native-inputs
(modify-inputs (package-native-inputs u-boot)
(modify-inputs native-inputs
(append fontconfig
python-sphinx
python-sphinx-prompt
@@ -948,12 +948,12 @@ Info manual.")))
(name "u-boot-tools")
(native-inputs
(if (string-match "^x86_64-linux" (%current-system))
(modify-inputs (package-native-inputs u-boot)
(modify-inputs native-inputs
(prepend python-filelock
python-pycryptodomex
python-pytest
python-pytest-xdist))
(modify-inputs (package-native-inputs u-boot)
(modify-inputs native-inputs
(prepend python-filelock
python-pycryptodomex))))
(inputs (list gnutls ncurses/tinfo))
@@ -1283,7 +1283,7 @@ CONFIG_TOOLS_KWBIMAGE=n"))))
(add-after 'unpack 'set-environment
(lambda* (#:key inputs #:allow-other-keys)
(setenv "BL31" (search-input-file inputs "/bl31.elf"))))))))
(inputs (modify-inputs (package-inputs base)
(inputs (modify-inputs inputs
(append (match soc
('rk3588 arm-trusted-firmware-rk3588)
('rk3399 arm-trusted-firmware-rk3399)
@@ -1326,10 +1326,10 @@ removed so that it fits within common partitioning schemes.")))
(or native-inputs inputs) "libexec/scp.bin"))
(setenv "BL31" (search-input-file inputs "bl31.bin"))))))))
(native-inputs
(modify-inputs (package-native-inputs base)
(modify-inputs native-inputs
(append (force scp-firmware))))
(inputs
(modify-inputs (package-inputs base)
(modify-inputs inputs
(append arm-trusted-firmware-sun50i-a64))))))
(define-public u-boot-orangepi-zero2w
@@ -1346,7 +1346,7 @@ removed so that it fits within common partitioning schemes.")))
(setenv "SCP" "/dev/null")
(setenv "BL31" (search-input-file inputs "bl31.bin"))))))))
(inputs
(modify-inputs (package-inputs base)
(modify-inputs inputs
;; The Zero 2W uses the slightly revised Allwinner H618.
(append arm-trusted-firmware-sun50i-h616))))))
@@ -1455,7 +1455,7 @@ Documentation} for more information (for example by running @samp{info
(symlink (search-input-file outputs "libexec/u-boot")
(string-append #$output "/bin/u-boot"))))))))
;; cert-to-efi-sig-list from efitools creates the EFI capsule ESL.
(inputs (modify-inputs (package-inputs base)
(inputs (modify-inputs inputs
(append efitools sdl2)))))
(define-public u-boot-sifive-unleashed
@@ -1471,7 +1471,7 @@ Documentation} for more information (for example by running @samp{info
(setenv "OPENSBI" (search-input-file inputs
"fw_dynamic.bin"))))))))
(inputs
(modify-inputs (package-inputs base)
(modify-inputs inputs
(append opensbi-generic))))))
(define-public u-boot-sifive-unmatched
@@ -1487,7 +1487,7 @@ Documentation} for more information (for example by running @samp{info
(setenv "OPENSBI" (search-input-file inputs
"fw_dynamic.bin"))))))))
(inputs
(modify-inputs (package-inputs base)
(modify-inputs inputs
(append opensbi-generic))))))
(define-public u-boot-starfive-visionfive2
@@ -1511,7 +1511,7 @@ Documentation} for more information (for example by running @samp{info
(string-append #$output
"/libexec/spl"))))))))
(inputs
(modify-inputs (package-inputs base)
(modify-inputs inputs
(append opensbi-for-visionfive2))))))
(define-public u-boot-rock64-rk3328
@@ -1762,7 +1762,7 @@ grub-efi-netboot-removable-bootloader.")
(symlink (string-append #$output "/bin/fw_printenv")
(string-append #$output "/bin/fw_setenv"))))))))
(native-inputs
(modify-inputs (package-native-inputs u-boot)
(modify-inputs native-inputs
(delete "dtc")))))) ;otherwise the build fails
;;; Note: the default cross-build of this package is currently broken on
@@ -2031,10 +2031,10 @@ the features of iPXE without the hassle of reflashing.")
(native-inputs
;; QEMU uses a 64-bit UEFI firmware.
(if (target-x86-64?)
(modify-inputs (package-native-inputs ipxe)
(modify-inputs native-inputs
(prepend edk2-tools))
(if (target-64bit?)
(modify-inputs (package-native-inputs ipxe)
(modify-inputs native-inputs
(prepend edk2-tools
(cross-gcc "x86_64-linux-gnu")
(cross-binutils "x86_64-linux-gnu")))
@@ -2047,7 +2047,7 @@ the features of iPXE without the hassle of reflashing.")
(substitute-keyword-arguments arguments
((#:configure-flags flags ''())
#~(cons* "--enable-64-bit-bfd" #$flags)))))))
(modify-inputs (package-native-inputs ipxe)
(modify-inputs native-inputs
(prepend edk2-tools
(make-ld-wrapper "ld-wrapper-64-bit-bfd"
#:binutils binutils)

2
gnu/packages/bqn.scm
View File

@@ -295,7 +295,7 @@ by APL.")
(install-file "libcbqn.so" lib)
(install-file "include/bqnffi.h" include))))))))
(native-inputs (list cbqn-bootstrap libffi))
(inputs (modify-inputs (package-inputs cbqn-bootstrap)
(inputs (modify-inputs inputs
(prepend bqn-sources)))
(license (append (package-license cbqn-bootstrap)
(list license:isc ;Singeli module

2
gnu/packages/chemistry.scm
View File

@@ -1015,7 +1015,7 @@ electromagnetic properties for molecules and crystals.")
;; Tests require python-pyscf.
((#:tests? _ #f) #f)))
(native-inputs
(modify-inputs (package-native-inputs base)
(modify-inputs native-inputs
(prepend (package-source base))))
(supported-systems '("x86_64-linux"))
(home-page "https://github.com/sunqm/qcint")

4
gnu/packages/chez.scm
View File

@@ -534,7 +534,7 @@ version of Chez Scheme.")
"zuo"))))))
(build-system gnu-build-system)
(inputs
(modify-inputs (package-inputs chez-scheme-for-racket)
(modify-inputs inputs
(replace "chez-scheme-for-racket-bootstrap-bootfiles"
chez-scheme-bootstrap-bootfiles)
;; for X11 clipboard support in expeditor:
@@ -832,7 +832,7 @@ User's Guix}, among other documents.")
(define-public stex
(package/inherit stex-bootstrap
(inputs (modify-inputs (package-inputs stex-bootstrap)
(inputs (modify-inputs inputs
(prepend chez-scheme)))
(outputs '("out" "doc"))
(properties '())))

4
gnu/packages/cmake.scm
View File

@@ -419,14 +419,14 @@ and workspaces that can be used in the compiler environment of your choice.")
(string-append #$output:doc html))
(delete-file-recursively (string-append #$output html)))))))))
(inputs
(modify-inputs (package-inputs cmake-minimal)
(modify-inputs inputs
(prepend ncurses) ;required for ccmake
;; Avoid circular dependency with (gnu packages debug).
(prepend (module-ref (resolve-interface '(gnu packages debug))
'cppdap))))
;; Extra inputs required to build the documentation.
(native-inputs
(modify-inputs (package-native-inputs cmake-minimal)
(modify-inputs native-inputs
(append python-sphinx
texinfo)))))

2
gnu/packages/commencement.scm
View File

@@ -3428,7 +3428,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(package
(inherit parent)
(inputs
(modify-inputs (package-inputs parent)
(modify-inputs inputs
(delete "libxcrypt")))
(arguments
(substitute-keyword-arguments arguments

4
gnu/packages/cpp.scm
View File

@@ -2312,7 +2312,7 @@ Google's C++ code base.")
"absl_symbolize_test|absl_log_format_test")))))
#~())))))
(native-inputs
(modify-inputs (package-native-inputs base)
(modify-inputs native-inputs
(replace "googletest" googletest))))))
(define-public abseil-cpp-20250127
@@ -3381,7 +3381,7 @@ syntax with variables, conditions, functions and more.")
(build-system pyproject-build-system)
(arguments
(list #:test-flags #~(list "--ignore=case_studies/")))
(native-inputs (modify-inputs (package-native-inputs jsonnet)
(native-inputs (modify-inputs native-inputs
(append python-pyyaml python-pytest python-setuptools)))
(synopsis "Python bindings for Jsonnet, the data templating language")
(description "This package provides a Python library named @code{_jsonnet}

6
gnu/packages/cross-base.scm
View File

@@ -457,7 +457,7 @@ target that libc."
"x86_64")))))))))))
(supported-systems %supported-systems)
(native-inputs
(modify-inputs (package-native-inputs gnumach-headers)
(modify-inputs native-inputs
(prepend xgcc xbinutils)))))
(define* (cross-mig target
@@ -490,10 +490,10 @@ the base compiler. Use XBINUTILS as the associated cross-Binutils."
'#$%gcc-cross-include-paths))))))))
(propagated-inputs
(list xgnumach-headers))
(inputs (modify-inputs (package-inputs mig)
(inputs (modify-inputs inputs
(delete "gnumach-headers")))
(native-inputs
(modify-inputs (package-native-inputs mig)
(modify-inputs native-inputs
(prepend xgcc xbinutils)))))
(define* (cross-kernel-headers* target

2
gnu/packages/curl.scm
View File

@@ -189,7 +189,7 @@ tunneling, and so on.")
((#:configure-flags flags)
#~(cons "--with-libssh2" #$flags))))
(inputs
(modify-inputs (package-inputs curl)
(modify-inputs inputs
(prepend libssh2)))
(properties `((hidden? . #t)))))

6
gnu/packages/databases.scm
View File

@@ -539,7 +539,7 @@ table-level bloom filters, and updates to the MANIFEST format.")
((#:tests? _ #t) #f) ; TODO: Find out why some tests fails to build
((#:import-path _) "github.com/cockroachdb/pebble/v2")))
(propagated-inputs
(modify-inputs (package-propagated-inputs go-github-com-cockroachdb-pebble)
(modify-inputs propagated-inputs
(append go-github-com-cockroachdb-crlib
go-github-com-cockroachdb-swiss
go-github-com-minio-minlz
@@ -1624,9 +1624,9 @@ pictures, sounds, or video.")
"0snbxmlygf7m4cxjpscmz3yjn4lnqsw313y9xgpv7vk9k9gm20s4"))
(patches (search-patches
"postgresql-disable-resolve_symlinks.patch"))))
(native-inputs (modify-inputs (package-native-inputs postgresql-16)
(native-inputs (modify-inputs native-inputs
(delete "pkg-config")))
(inputs (modify-inputs (package-inputs postgresql-16)
(inputs (modify-inputs inputs
(delete "icu4c")))))
(define-public postgresql-14

4
gnu/packages/debug.scm
View File

@@ -375,7 +375,7 @@ tool.")
(delete-file "tests/qemu-iotests/127")
(delete-file "tests/qemu-iotests/267"))))
'())))))
(inputs (modify-inputs (package-inputs base)
(inputs (modify-inputs inputs
(delete "dtc")))
(home-page "https://github.com/AFLplusplus/qemuafl")
(synopsis "QEMU for AFL++")))))
@@ -717,7 +717,7 @@ the position of the variable and allows you to modify its value.")
"11vvch8bi0yhjfz7gn92b3xmmm0cgi3qfiyhbnnj89frkhbwd87n"))
(patches (search-patches "remake-impure-dirs.patch"))))
(inputs
(modify-inputs (package-inputs gnu-make)
(modify-inputs inputs
(prepend readline)))
(home-page "https://bashdb.sourceforge.net/remake/")
(description "Remake is an enhanced version of GNU Make that adds improved

4
gnu/packages/display-managers.scm
View File

@@ -161,9 +161,9 @@ to create smooth, animated user interfaces.")
(package
(inherit sddm)
(name "sddm-qt5")
(native-inputs (modify-inputs (package-native-inputs sddm)
(native-inputs (modify-inputs native-inputs
(replace "qttools" qttools-5)))
(inputs (modify-inputs (package-inputs sddm)
(inputs (modify-inputs inputs
(replace "qtbase" qtbase-5)
(replace "qtsvg" qtsvg-5)
(replace "qtdeclarative" qtdeclarative-5)

2
gnu/packages/django.scm
View File

@@ -1681,7 +1681,7 @@ a single block.")
#~(modify-phases %standard-phases
(delete 'sanity-check))))
(propagated-inputs
(modify-inputs (package-propagated-inputs pkg)
(modify-inputs propagated-inputs
(delete "python-django-crispy-forms")))))
(list python-crispy-bootstrap3 python-crispy-bootstrap4))
(list python-pytest python-pytest-django python-setuptools)))

2
gnu/packages/dlang.scm
View File

@@ -582,7 +582,7 @@ compiler for the D programming language.")
(format #f "s,~a,~a,g" in-dmd-bootstrap out)
out-bin-dmd))))))))
(native-inputs
(modify-inputs (package-native-inputs dmd-bootstrap)
(modify-inputs native-inputs
(delete "gdmd")
(append dmd-bootstrap)))
(properties

4
gnu/packages/docbook.scm
View File

@@ -279,7 +279,7 @@ downloading from @var{source}, where @var{version} is a string and
"catalog.xml"))
(list "rewriteSystem" "rewriteURI")))))))))
(native-inputs
(modify-inputs (package-native-inputs template)
(modify-inputs native-inputs
(prepend libxml2))))))
(define-public docbook-mathml-1.0
@@ -800,7 +800,7 @@ DB2LaTeX.")
(define-public dblatex/stable
(hidden-package
(package/inherit dblatex
(inputs (modify-inputs (package-inputs dblatex)
(inputs (modify-inputs inputs
(replace "imagemagick" imagemagick/stable)
(replace "inkscape" inkscape/pinned))))))

4
gnu/packages/docker.scm
View File

@@ -248,11 +248,11 @@ management tool.")
;; Integration tests need a running Docker daemon.
(arguments (list #:tests? #f))
(native-inputs (list python-setuptools))
(inputs (modify-inputs (package-inputs python-docker)
(inputs (modify-inputs inputs
(prepend python-six)
(delete "python-urllib3")))
(propagated-inputs
(modify-inputs (package-propagated-inputs python-docker)
(modify-inputs propagated-inputs
(prepend python-docker-pycreds python-urllib3-1.26)))))
;; Needed for old v1 of docker-compose; remove once Docker is updated to a

10
gnu/packages/electronics.scm
View File

@@ -1767,7 +1767,7 @@ which allows one to install the M8 firmware on any Teensy.")
#~(cons* "-DUSE_LIBSERIAL=ON"
(delete "-DUSE_LIBUSB=ON" #$flags)))))
(inputs
(modify-inputs (package-inputs m8c)
(modify-inputs inputs
(replace "libusb" libserialport)))
(synopsis "Cross-platform M8 tracker headless client - serial backend")))
@@ -2078,7 +2078,7 @@ Automation}, portable and vendor neutral FPGA place and route tool.")
#~(modify-phases #$phases
(delete 'delete-scripts)))))
(native-inputs
(modify-inputs (package-native-inputs libngspice)
(modify-inputs native-inputs
(append perl)))
(inputs (list libngspice readline libxaw libx11))))
@@ -2788,7 +2788,7 @@ Chip toolkit.")
(arguments (list #:test-flags #~(list ".")))
(native-inputs (list cmake-minimal python-pytest python-minimal-wrapper
python-scikit-build-core))
(inputs (modify-inputs (package-inputs gdstk)
(inputs (modify-inputs inputs
(prepend python-numpy)))
(synopsis "Python module for creation and manipulation of GDSII files")
(description
@@ -4261,7 +4261,7 @@ unique design feature of Trilinos is its focus on packages.")
(delete
"-DCMAKE_CXX_FLAGS=-O3 -fPIC" #$flags))))))
(inputs
(modify-inputs (package-inputs trilinos-serial-xyce)
(modify-inputs inputs
(prepend openmpi)))))
(define-public verilator
@@ -4409,7 +4409,7 @@ parallel computing platforms. It also supports serial execution.")
(delete
"-DCMAKE_CXX_FLAGS=-O3 -fPIC" #$flags))))))
(inputs
(modify-inputs (package-inputs xyce-serial)
(modify-inputs inputs
(prepend openmpi)
(replace "trilinos-serial-xyce" trilinos-parallel-xyce)))))

2
gnu/packages/emacs-xyz.scm
View File

@@ -37427,7 +37427,7 @@ utilities.")
#:tests? #f ;no test suite
#:lisp-directory "src/extra"))
(propagated-inputs
(modify-inputs (package-propagated-inputs emacs-treemacs)
(modify-inputs propagated-inputs
(append emacs-all-the-icons
emacs-evil
emacs-magit

14
gnu/packages/emacs.scm
View File

@@ -560,7 +560,7 @@ editor (console only)")
(search-auxiliary-file "emacs/comp-integrity.el"))
"-f" "ert-run-tests-batch-and-exit")))))))))
(inputs
(modify-inputs (package-inputs emacs-minimal)
(modify-inputs inputs
(prepend gnutls
;; For native compilation
libgccjit
@@ -614,7 +614,7 @@ editor (console only)")
(pdmp (find-files libexec "\\.pdmp$"))
(pdmp-real (find-files libexec "\\.pdmp-real$")))
(for-each rename-file pdmp-real pdmp))))))))
(inputs (modify-inputs (package-inputs emacs-no-x)
(inputs (modify-inputs inputs
(prepend
cairo
dbus
@@ -654,7 +654,7 @@ editor (with xwidgets support)")
((#:configure-flags flags #~'())
#~(cons "--with-xwidgets" #$flags))))
(inputs
(modify-inputs (package-inputs emacs)
(modify-inputs inputs
(prepend webkitgtk-with-libsoup2 libxcomposite)))))
(define-public emacs-pgtk-xwidgets
@@ -667,7 +667,7 @@ editor (with xwidgets support)")
((#:configure-flags flags #~'())
#~(cons "--with-xwidgets" #$flags))))
(inputs
(modify-inputs (package-inputs emacs-pgtk)
(modify-inputs inputs
(prepend gsettings-desktop-schemas webkitgtk-with-libsoup2)))))
(define-public emacs-lucid
@@ -708,7 +708,7 @@ toolkit)")
(synopsis "The extensible, customizable, self-documenting text
editor (without X toolkit)" )
;; Using emacs' inputs as base, since it has all the graphical stuff
(inputs (modify-inputs (package-inputs emacs)
(inputs (modify-inputs inputs
(delete "gtk+")
(prepend inotify-tools)))
(arguments
@@ -796,10 +796,10 @@ editor (with wide ints)" )
(base32
"0ry0dn9xrndpz54hs92dnnsw4xa4qn4lz898ldlh2rs47ah1f4wl"))))
(native-inputs
(modify-inputs (package-native-inputs emacs)
(modify-inputs native-inputs
(prepend autoconf automake guile-for-guile-emacs)))
(inputs
(modify-inputs (package-inputs emacs)
(modify-inputs inputs
(prepend imagemagick)))
(home-page "https://guile-emacs.org")
(synopsis "Emacs text editor powered by Guile('s elisp implementation)")

8
gnu/packages/embedded.scm
View File

@@ -374,7 +374,7 @@ embedded-7-branch/")
(search-patches
"gcc-7-cross-environment-variables.patch")))))
(native-inputs
(modify-inputs (package-native-inputs xgcc)
(modify-inputs native-inputs
(delete "isl")
(prepend flex isl-0.18)))
(arguments
@@ -513,7 +513,7 @@ embedded-7-branch/")
(search-patches
"gcc-10-cross-environment-variables.patch")))))
(native-inputs
(modify-inputs (package-native-inputs xgcc)
(modify-inputs native-inputs
(delete "isl")
(prepend flex isl-0.18)))
(arguments
@@ -1110,7 +1110,7 @@ with a layered architecture of JTAG interface and TAP support.")
(origin-patches (package-source gcc-6))
(search-patches "gcc-cross-environment-variables.patch")))))
(native-inputs
(modify-inputs (package-native-inputs xgcc)
(modify-inputs native-inputs
(prepend flex)))
;; All headers and cross libraries of the propeller toolchain are
;; installed under the "propeller-elf" prefix.
@@ -1156,7 +1156,7 @@ with a layered architecture of JTAG interface and TAP support.")
(add-after 'unpack 'chdir
(lambda _ (chdir "gcc")))))))
(native-inputs
(modify-inputs (package-native-inputs xgcc)
(modify-inputs native-inputs
(prepend gcc-5)))
(home-page "https://github.com/parallaxinc/propgcc")
(supported-systems (delete "aarch64-linux" %supported-systems))))))

2
gnu/packages/emulators.scm
View File

@@ -1160,7 +1160,7 @@ The following systems are supported:
#~(cons "-DCMAKE_C_FLAGS=-Wno-error=incompatible-pointer-types"
#$flags))))
(inputs
(modify-inputs (package-inputs mgba)
(modify-inputs inputs
(replace "ffmpeg" ffmpeg-6)))))))
(define-public sameboy

2
gnu/packages/engineering.scm
View File

@@ -2836,7 +2836,7 @@ models in the STL and OFF file formats.")
(("\\$\\{CMAKE_SOURCE_DIR\\}/submodules/sanitizers-cmake/cmake")
(string-append (assoc-ref inputs "sanitizers-cmake")
"/share/sanitizers-cmake/cmake")))))))))
(inputs (modify-inputs (package-inputs openscad)
(inputs (modify-inputs inputs
(append curl libfive)))
(synopsis "Script-based 3D modeling app with Python support")
(description

2
gnu/packages/fcitx5.scm
View File

@@ -310,7 +310,7 @@ IM module for GTK+3 applications.
(lambda _
(chdir ".."))))))
(inputs
(modify-inputs (package-inputs fcitx5-gtk)
(modify-inputs inputs
(delete "gtk+")
(prepend fcitx5-gtk gtk)))
(native-search-paths

2
gnu/packages/file-systems.scm
View File

@@ -931,7 +931,7 @@ performance and other characteristics.")
(apply invoke "make" "install"
(string-append "PREFIX=" #$output)
#$(bcachefs-tools-make-install-flags))))))))
(inputs (modify-inputs (package-inputs bcachefs-tools-minimal)
(inputs (modify-inputs inputs
(prepend `(,eudev "static")
`(,keyutils "static")
`(,libscrypt "static")

2
gnu/packages/finance.scm
View File

@@ -240,7 +240,7 @@ line client and a client based on Qt.")
((#:qtbase original-flags #f)
qtbase-5)))
(native-inputs
(modify-inputs (package-native-inputs bitcoin-core)
(modify-inputs native-inputs
(delete qttools)
(append imagemagick
librsvg

8
gnu/packages/firmware.scm
View File

@@ -787,7 +787,7 @@ source."
(native-inputs
(if (member (%current-system) '("i686-linux" "x86_64-linux"))
(package-native-inputs seabios)
(modify-inputs (package-native-inputs seabios)
(modify-inputs native-inputs
(prepend (cross-gcc "i686-linux-gnu")
(cross-binutils "i686-linux-gnu")))))
(supported-systems %supported-systems)
@@ -1384,7 +1384,7 @@ interface standards, such as:
(let ((base (make-arm-trusted-firmware "rk3399")))
(package
(inherit base)
(native-inputs (modify-inputs (package-native-inputs base)
(native-inputs (modify-inputs native-inputs
(prepend (cross-gcc "arm-none-eabi")
(cross-binutils "arm-none-eabi")))))))
@@ -1964,7 +1964,7 @@ or passthrough board.")
(package
(inherit base)
(native-inputs
(modify-inputs (package-native-inputs base)
(modify-inputs native-inputs
(replace "xgcc" (make-gcc-arm-none-eabi-12.3.rel1)))))))
(define* (make-qmk-firmware-keychron keyboard keymap
@@ -2050,7 +2050,7 @@ or passthrough board.")
"0r501hkk0idwfm6qs09g1wb808ga452gz39dw32x13rmg3a901s6")))
"lib/printf")))))))
(native-inputs
(modify-inputs (package-native-inputs base)
(modify-inputs native-inputs
(prepend
(package
(inherit (make-qmk-newlib-nano-arm-none-eabi))

10
gnu/packages/fontutils.scm
View File

@@ -157,7 +157,7 @@ anti-aliased glyph bitmap generation with 256 gray levels.")
(inherit freetype)
(name "freetype-with-brotli")
(propagated-inputs
(modify-inputs (package-propagated-inputs freetype)
(modify-inputs propagated-inputs
(prepend brotli)))))
(define-public opentype-sanitizer
@@ -697,7 +697,7 @@ implementing the pen protocol for manipulating glyphs.")
((".*\\(\\(0, 0), \\(50, 20), \\(100, 40)).*") "")
((".*107\\.70329614269009.*") ""))))))))
(native-inputs
(modify-inputs (package-native-inputs python-fontpens-bootstrap)
(modify-inputs native-inputs
(append python-fontparts-bootstrap
python-fontpens-bootstrap
python-pytest
@@ -738,7 +738,7 @@ process. FontParts is the successor of RoboFab.")
(package/inherit python-fontparts-bootstrap
(name "python-fontparts")
(propagated-inputs
(modify-inputs (package-propagated-inputs python-fontparts-bootstrap)
(modify-inputs propagated-inputs
(replace "python-defcon-bootstrap" python-defcon)))
(properties
(alist-delete 'hidden?
@@ -1488,7 +1488,7 @@ high quality, anti-aliased and subpixel rendered text on a display.")
(delete-file-recursively source)))
'("man3" "man5"))))))))
(native-inputs
(modify-inputs (package-native-inputs fontconfig)
(modify-inputs native-inputs
(append docbook-utils)))
(properties (alist-delete 'hidden? (package-properties fontconfig)))))
@@ -1988,7 +1988,7 @@ UFO3 as described by the UFO font format.")
(package/inherit python-defcon-bootstrap
(name "python-defcon")
(propagated-inputs
(modify-inputs (package-propagated-inputs python-defcon-bootstrap)
(modify-inputs propagated-inputs
(replace "python-fontpens-bootstrap" python-fontpens)))
(properties
(alist-delete 'hidden?

8
gnu/packages/freedesktop.scm
View File

@@ -222,10 +222,10 @@ application-centers for distributions.")
(package/inherit appstream
(name "appstream-qt")
(native-inputs
(modify-inputs (package-native-inputs appstream)
(modify-inputs native-inputs
(prepend qttools-5)))
(inputs
(modify-inputs (package-inputs appstream)
(modify-inputs inputs
(prepend qtbase-5)))
(arguments
(substitute-keyword-arguments arguments
@@ -236,10 +236,10 @@ application-centers for distributions.")
(package/inherit appstream
(name "appstream-qt6")
(native-inputs
(modify-inputs (package-native-inputs appstream)
(modify-inputs native-inputs
(prepend qttools)))
(inputs
(modify-inputs (package-inputs appstream)
(modify-inputs inputs
(prepend qtbase)))
(arguments
(substitute-keyword-arguments arguments

26
gnu/packages/games.scm
View File

@@ -2126,7 +2126,7 @@ does not include game data.")
(arguments
;; No tests. See https://github.com/Keriew/augustus/issues/82.
`(#:tests? #f))
(inputs (modify-inputs (package-inputs julius)
(inputs (modify-inputs inputs
(prepend expat)))
(home-page "https://github.com/Keriew/augustus")
(synopsis "Re-implementation of Caesar III game engine with gameplay changes")
@@ -3433,7 +3433,7 @@ To run, you must put your official game data, @code{Levels} and @code{Help} in
(modules '((guix build utils)))
(patches (search-patches
"serious-sam-classic-engine-patch-paths.patch"))))
(inputs (modify-inputs (package-inputs serious-sam-classic)
(inputs (modify-inputs inputs
(prepend vulkan-loader vulkan-headers)))
(synopsis
"SeriousSam engine and Serious Sam: TFE and TSE with Vulkan renderer")
@@ -3498,7 +3498,7 @@ corruption… You hope luck will be on your side!
(rename-file (string-append #$output "/bin/shamogu")
(string-append #$output "/bin/shamogu-sdl"))))))))
(native-inputs
(modify-inputs (package-native-inputs shamogu)
(modify-inputs native-inputs
(prepend pkg-config)))))
(define-public solarus
@@ -3576,9 +3576,9 @@ in mind.")
(add-before 'configure 'chdir
(lambda _
(chdir "editor"))))))
(native-inputs (modify-inputs (package-inputs solarus)
(native-inputs (modify-inputs native-inputs
(prepend qttools qlementine)))
(inputs (modify-inputs (package-inputs solarus)
(inputs (modify-inputs inputs
(prepend solarus)
(append qtbase qtsvg qtwayland)))
(synopsis "Create and modify quests for the Solarus engine")
@@ -3608,7 +3608,7 @@ quests for the Solarus engine.")))
(native-inputs (modify-inputs (package-inputs solarus)
(prepend qlementine qlementine-icons qtappinstancemanager
qttools)))
(inputs (modify-inputs (package-inputs solarus)
(inputs (modify-inputs inputs
(prepend solarus)
(append qtbase qtsvg qtwayland)))
(synopsis "Game launcher and browser for Solarus")
@@ -5811,10 +5811,10 @@ Transport Tycoon Deluxe.")
(assoc-ref outputs "out")))
(search-path-as-list (list base) (map cdr inputs)))))))))
(inputs
(modify-inputs (package-inputs openttd-engine)
(modify-inputs inputs
(prepend fluidsynth freepats-gm)))
(native-inputs
(modify-inputs (package-native-inputs openttd-engine)
(modify-inputs native-inputs
(prepend openttd-opengfx openttd-openmsx openttd-opensfx)))))
(define-public openttd-jgrpp
@@ -5831,7 +5831,7 @@ Transport Tycoon Deluxe.")
(file-name (git-file-name name version))
(sha256
(base32 "1jzzvribf2cqvjl9cympyx9qpplljvmhqrrlw7aq4ckzl92d87z3"))))
(inputs (modify-inputs (package-inputs openttd)
(inputs (modify-inputs inputs
(append zstd harfbuzz)))
(arguments
(substitute-keyword-arguments arguments
@@ -8247,10 +8247,10 @@ monsters in a quest to find the mystifyingly fabulous Orb of Zot.")
"GAME=crawl-tiles"
#$flags))))
(inputs
(modify-inputs (package-inputs crawl)
(modify-inputs inputs
(prepend font-dejavu freetype glu libpng sdl2 sdl2-image sdl2-mixer)))
(native-inputs
(modify-inputs (package-native-inputs crawl)
(modify-inputs native-inputs
(prepend pngcrush which)))
(synopsis "Graphical roguelike dungeon crawler game")))
@@ -8940,7 +8940,7 @@ some graphical niceities, and numerous bug-fixes and other improvements.")
#t))))
,@(strip-keyword-arguments '(#:make-flags #:phases)
(package-arguments quakespasm))))
(inputs (modify-inputs (package-inputs quakespasm)
(inputs (modify-inputs inputs
(prepend
glslang
spirv-tools
@@ -11481,7 +11481,7 @@ player adaptability for character progression.")
(string-append #$output "/bin/harmonist")
(string-append #$output "/bin/harmonist-sdl"))))))))
(native-inputs
(modify-inputs (package-native-inputs harmonist)
(modify-inputs native-inputs
(prepend pkg-config)))))
(define-public li-ri

4
gnu/packages/gawk.scm
View File

@@ -110,7 +110,7 @@ including network access, sorting, and large libraries.")
(package/inherit gawk
(name "gawk-mpfr")
(inputs
(modify-inputs (package-inputs gawk)
(modify-inputs inputs
(prepend mpfr)))))
;; Suffixed with -next because, similarly to Emacs, development versions are
@@ -258,7 +258,7 @@ programs can be captured and transferred to systems that have Awk but not
(("awk=gawk") (string-append "awk=" (which "egawk")))
(("awk '") (string-append (which "egawk") " '")))))))))
(inputs
(modify-inputs (package-inputs cppawk)
(modify-inputs inputs
(delete "gawk-mpfr")
(prepend egawk-next)))
(synopsis "Wrapper script that adds C preprocessing to Enhanced GNU Awk")))

18
gnu/packages/gcc.scm
View File

@@ -516,7 +516,7 @@ Go. It also includes runtime support libraries for these languages.")
(supported-systems (fold delete %supported-systems
'("riscv64-linux" "x86_64-gnu")))
(inputs
(modify-inputs (package-inputs gcc-base)
(modify-inputs inputs
(prepend isl-0.11 cloog)))))
(define-public gcc-4.9
@@ -580,7 +580,7 @@ Go. It also includes runtime support libraries for these languages.")
(native-inputs (list perl ;for manpages
texinfo))
(inputs
(modify-inputs (package-inputs gcc-base)
(modify-inputs inputs
(prepend isl-0.11 cloog)))
(supported-systems (fold delete %supported-systems
'("riscv64-linux" "x86_64-gnu")))))
@@ -655,7 +655,7 @@ Go. It also includes runtime support libraries for these languages.")
(native-inputs (list perl ;for manpages
texinfo))
(inputs
(modify-inputs (package-inputs gcc-base)
(modify-inputs inputs
(prepend ;; GCC5 needs <isl/band.h> which is removed in later versions.
isl-0.18)))
(supported-systems (fold delete %supported-systems
@@ -1411,7 +1411,7 @@ as the 'native-search-paths' field."
(package
(inherit gdc)
(arguments
(substitute-keyword-arguments (package-arguments gdc)
(substitute-keyword-arguments arguments
((#:modules modules)
`(,@modules
(ice-9 ftw)))
@@ -1484,14 +1484,14 @@ as the 'native-search-paths' field."
"^/lib/debug/.*/lib/libgdruntime"
"^/lib/debug/.*/lib/libgphobos"))))))))
(inputs
(modify-inputs (package-inputs gdc)
(modify-inputs inputs
;; This makes flags like -static-libstdc++ work. Required for using this
;; compiler as a bootstrap compiler for GDC 12+.
;; Additionally, this allows us to support linking with GCC libraries,
;; without building or storing them ourselves.
(append (list gcc "lib"))))
(native-inputs
(let ((orig (package-native-inputs gdc)))
(let ((orig native-inputs))
(if bootstrap-gdc
(modify-inputs orig
;; Since GCC 12, GDC is self-hosted, requiring a version of itself
@@ -1601,7 +1601,7 @@ also includes the druntime and phobos libraries."
(package
(inherit base)
(native-inputs
(modify-inputs (package-native-inputs base)
(modify-inputs native-inputs
(prepend flex)))))))
(define-public (make-libgccjit gcc)
@@ -1637,9 +1637,9 @@ also includes the druntime and phobos libraries."
(find-files
(string-append (assoc-ref outputs "out") "/bin")
".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)"))))))))
(inputs (modify-inputs (package-inputs gcc)
(inputs (modify-inputs inputs
(delete "libstdc++")))
(native-inputs (modify-inputs (package-native-inputs gcc)
(native-inputs (modify-inputs native-inputs
(prepend gcc)))
(synopsis "GCC library generating machine code on-the-fly at runtime")
(description

4
gnu/packages/gdb.scm
View File

@@ -374,10 +374,10 @@ AMD's commercially available GPU architectures.")
(base32
"1msxz5xnm6fl2p9hzjnkaayd8x3dc0dp34ff60asr8mgxwxlcd9c"))))
(inputs
(modify-inputs (package-inputs gdb)
(modify-inputs inputs
(prepend rocdbgapi)))
(native-inputs
(modify-inputs (package-native-inputs gdb)
(modify-inputs native-inputs
(prepend bison flex perl)))
(arguments
(substitute-keyword-arguments arguments

6
gnu/packages/geo.scm
View File

@@ -409,7 +409,7 @@ hierarchical hexagonal geospatial indexing system")
(sha256
(base32 "16gxa1sivghxw179rik87r918mjasars2qkzidlwq83qfa4axn20"))))
(inputs
(modify-inputs (package-inputs python-h3)
(modify-inputs inputs
(replace "h3" h3-3)))))
(define-public geos
@@ -927,11 +927,11 @@ hydrology and waste deposition.")
(package
(inherit ogs-serial)
(name "ogs-petsc")
(inputs (modify-inputs (package-inputs ogs-serial)
(inputs (modify-inputs inputs
(prepend openmpi petsc-openmpi)
(replace "hdf5" hdf5-parallel-openmpi)
(replace "netcdf-cxx4" netcdf-cxx4-parallel-openmpi)))
(native-inputs (modify-inputs (package-native-inputs ogs-serial)
(native-inputs (modify-inputs native-inputs
(prepend pkg-config)))
(arguments
(substitute-keyword-arguments arguments

2
gnu/packages/gettext.scm
View File

@@ -349,7 +349,7 @@ areas where they were not expected like documentation.")
(native-inputs
;; Remove test dependencies, primarily to reduce the size of the
;; dependency graph of the ‘guix’ package.
(modify-inputs (package-native-inputs po4a)
(modify-inputs native-inputs
(delete "docbook-xml" "perl-test-pod" "texlive-local-tree")))
(arguments
(substitute-keyword-arguments arguments

4
gnu/packages/ghostscript.scm
View File

@@ -311,13 +311,13 @@ output file formats and printers.")
(define-public ghostscript/x
(package/inherit ghostscript
(name (string-append (package-name ghostscript) "-with-x"))
(inputs (modify-inputs (package-inputs ghostscript)
(inputs (modify-inputs inputs
(prepend libxext libxt)))))
(define-public ghostscript/cups
(package/inherit ghostscript
(name "ghostscript-with-cups")
(inputs (modify-inputs (package-inputs ghostscript)
(inputs (modify-inputs inputs
(prepend cups-minimal)))))
(define-public ijs

4
gnu/packages/gimp.scm
View File

@@ -410,7 +410,7 @@ that is extensible via a plugin system.")
(find-files (string-append #$output "/bin")
(lambda (_ stat)
(eq? 'regular (stat:type stat))))))))))
(inputs (modify-inputs (package-inputs gimp-2)
(inputs (modify-inputs inputs
(replace "gtk+" gtk+)
(prepend bash-minimal
libjxl
@@ -421,7 +421,7 @@ that is extensible via a plugin system.")
gjs
libxslt
xdg-utils)))
(native-inputs (modify-inputs (package-native-inputs gimp-2)
(native-inputs (modify-inputs native-inputs
(prepend appstream-glib
gi-docgen
libarchive

2
gnu/packages/gl.scm
View File

@@ -1088,7 +1088,7 @@ and surfaces, receiving input and events.")
(sha256
(base32
"1sd396kkn53myp61kxrd18h7b1q4ix173hhxhvl0iz8j4x5h1v5m"))))
(native-inputs (modify-inputs (package-native-inputs glfw)
(native-inputs (modify-inputs native-inputs
(prepend pkg-config)))
;; When building out of source, the install phase fails with:
;; file INSTALL cannot find "/tmp/guix-build-glfw-3.4.drv-0/build/docs/html":

10
gnu/packages/glib.scm
View File

@@ -447,7 +447,7 @@ functions for strings and common data structures.")
(let ((base glib-minimal))
(package/inherit base
(native-inputs
(modify-inputs (package-native-inputs base)
(modify-inputs native-inputs
(prepend gobject-introspection-minimal)))
(arguments
(substitute-keyword-arguments arguments
@@ -466,7 +466,7 @@ functions for strings and common data structures.")
(properties (alist-delete 'hidden? (package-properties base)))
(outputs (cons "doc" (package-outputs base)))
(native-inputs
(modify-inputs (package-native-inputs base)
(modify-inputs native-inputs
(append gi-docgen python-docutils)))
(arguments
(substitute-keyword-arguments arguments
@@ -646,10 +646,10 @@ provide bindings to call into the C library.")
(let ((base gobject-introspection-minimal))
(package/inherit base
(native-inputs
(modify-inputs (package-native-inputs base)
(modify-inputs native-inputs
(replace "glib" glib)))
(propagated-inputs
(modify-inputs (package-propagated-inputs base)
(modify-inputs propagated-inputs
(replace "glib" glib)
;; Note: The label stays the same despite the name change.
(replace "python-setuptools-bootstrap" python-setuptools))))))
@@ -988,7 +988,7 @@ useful for C++.")
(sha256
(base32 "0bqm9vqwhas69q6n89wd2xgxvrlkpxra13dzsx8m67hqk0jp8n2k"))))
(propagated-inputs
(modify-inputs (package-propagated-inputs glibmm)
(modify-inputs propagated-inputs
(replace "libsigc++" libsigc++-2)))))
(define-public python-pygobject

18
gnu/packages/gnome.scm
View File

@@ -1282,7 +1282,7 @@ a debugging tool, @command{gssdp-device-sniffer}.")
(arguments
(list #:configure-flags
#~(list "-Dgtk_doc=true")))
(propagated-inputs (modify-inputs (package-propagated-inputs gssdp)
(propagated-inputs (modify-inputs propagated-inputs
(replace "libsoup" libsoup-minimal-2)))))
(define-public gupnp
@@ -4496,7 +4496,7 @@ editors, IDEs, etc.")
(arguments (substitute-keyword-arguments arguments
((#:configure-flags flags #~'())
#~(cons "-Dgtk4=false" (delete "-Dgtk3=false" #$flags)))))
(propagated-inputs (modify-inputs (package-propagated-inputs vte)
(propagated-inputs (modify-inputs propagated-inputs
(replace "gtk" gtk+)))
(properties
`((upstream-name . "vte")))))
@@ -4517,7 +4517,7 @@ editors, IDEs, etc.")
(arguments (substitute-keyword-arguments arguments
((#:configure-flags flags)
#~(append (list "-Dsixel=true") #$flags))))
(inputs (modify-inputs (package-inputs vte)
(inputs (modify-inputs inputs
(append libsixel)
(append lz4)))))
@@ -4698,9 +4698,9 @@ GLib and GObject, and integrates JSON with GLib data types.")
(native-inputs
(if (%current-target-system)
;; No docs, but rst2man is used for man pages.
(modify-inputs (package-native-inputs json-glib-minimal)
(modify-inputs native-inputs
(prepend python-docutils))
(modify-inputs (package-native-inputs json-glib-minimal)
(modify-inputs native-inputs
(prepend gi-docgen gobject-introspection
python-docutils))))))
@@ -4990,7 +4990,7 @@ and the GLib main loop, to integrate well with GNOME applications.")
(substitute* "tests/meson.build"
(("[ \t]*\\['ssl', true, \\[\\]\\],") ""))))))))
(native-inputs
(modify-inputs (package-native-inputs libsoup-minimal)
(modify-inputs native-inputs
(replace "vala" vala-0.52)))))
(define-public libsoup
@@ -5026,7 +5026,7 @@ and the GLib main loop, to integrate well with GNOME applications.")
(mkdir-p (string-append #$output:doc "/share"))
(rename-file (string-append #$output "/share/doc")
(string-append #$output:doc "/share/doc"))))))))
(native-inputs (modify-inputs (package-native-inputs libsoup-minimal)
(native-inputs (modify-inputs native-inputs
(prepend gettext-minimal gi-docgen)))))
(define-public libsecret
@@ -5545,7 +5545,7 @@ output devices.")
(string-append "'" #$output
"/etc/bash_completion.d'")))))))))
(native-inputs
(modify-inputs (package-native-inputs colord-minimal)
(modify-inputs native-inputs
(append bash-completion
docbook-xsl
gtk-doc/stable
@@ -6022,7 +6022,7 @@ throughout GNOME for API documentation).")
(define-public devhelp-with-libsoup2
(hidden-package
(package/inherit devhelp
(inputs (modify-inputs (package-inputs devhelp)
(inputs (modify-inputs inputs
(replace "webkitgtk-for-gtk3" webkitgtk-with-libsoup2))))))
(define-public cogl

20
gnu/packages/gnupg.scm
View File

@@ -485,10 +485,10 @@ and every application benefits from this.")
(chdir "lang/qt"))))))
(propagated-inputs (list gpgme)) ;required by QGpgmeConfig.cmake
(native-inputs
(modify-inputs (package-native-inputs gpgme)
(modify-inputs native-inputs
(prepend pkg-config)))
(inputs
(modify-inputs (package-inputs gpgme)
(modify-inputs inputs
(prepend qtbase-5)))
(synopsis "Qt API bindings for gpgme")
(description "QGpgme provides a very high level Qt API around GpgMEpp.
@@ -514,10 +514,10 @@ gpgpme starting with version 1.7.")
(chdir "lang/qt"))))))
(propagated-inputs (list gpgme)) ;required by QGpgmeConfig.cmake
(native-inputs
(modify-inputs (package-native-inputs gpgme)
(modify-inputs native-inputs
(prepend pkg-config)))
(inputs
(modify-inputs (package-inputs gpgme)
(modify-inputs inputs
(prepend qtbase)))
(synopsis "Qt API bindings for gpgme")
(description "QGpgme provides a very high level Qt API around GpgMEpp.")
@@ -573,10 +573,10 @@ interface (FFI) of Guile.")
(inherit guile-gcrypt)
(name "guile2.2-gcrypt")
(native-inputs
(modify-inputs (package-native-inputs guile-gcrypt)
(modify-inputs native-inputs
(replace "guile" guile-2.2)))
(inputs
(modify-inputs (package-inputs guile-gcrypt)
(modify-inputs inputs
(replace "guile" guile-2.2)))))
(define-public python-gpg
@@ -908,7 +908,7 @@ enter a passphrase when required by @code{gpg} or other software.")))
(arguments
`(#:configure-flags '("--enable-fallback-curses")))
(inputs
(modify-inputs (package-inputs pinentry-tty)
(modify-inputs inputs
(prepend gtk+-2 glib)))
(description
"Pinentry provides a console and a GTK+ GUI that allows users to enter a
@@ -919,7 +919,7 @@ passphrase when @code{gpg} is run and needs it.")))
(inherit pinentry-tty)
(name "pinentry-gnome3")
(inputs
(modify-inputs (package-inputs pinentry-tty)
(modify-inputs inputs
(prepend gtk+-2 gcr-3 glib)))
(arguments
`(#:configure-flags '("--enable-pinentry-gnome3"
@@ -936,7 +936,7 @@ software.")))
(arguments
`(#:configure-flags '("--enable-fallback-curses")))
(inputs
(modify-inputs (package-inputs pinentry-tty)
(modify-inputs inputs
(prepend qtbase qtwayland)))
(description
"Pinentry provides a console and a Qt GUI that allows users to enter a
@@ -960,7 +960,7 @@ passphrase when @code{gpg} is run and needs it.")))
("gettext" ,gettext-minimal)
,@(package-native-inputs pinentry-tty)))
(inputs
(modify-inputs (package-inputs pinentry-tty)
(modify-inputs inputs
(prepend efl)))
(description
"Pinentry provides a console and a graphical interface for @acronym{EFL,

10
gnu/packages/golang-web.scm
View File

@@ -4465,7 +4465,7 @@ client in Golang.")
(package-arguments go-github-com-datadog-datadog-go)
((#:import-path _) "github.com/DataDog/datadog-go/v5")))
(native-inputs
(modify-inputs (package-native-inputs go-github-com-datadog-datadog-go)
(modify-inputs native-inputs
(append go-github-com-golang-mock)))))
(define-public go-github-com-davecgh-go-xdr
@@ -12595,7 +12595,7 @@ part of @url{https://github.com/pion, Pion} WebRTC implementation.")
#:tests? #f ;Tests require network access.
#:import-path "github.com/pion/ice/v4"))
(propagated-inputs
(modify-inputs (package-propagated-inputs go-github-com-pion-ice-v3)
(modify-inputs propagated-inputs
(replace "go-github-com-pion-dtls-v2" go-github-com-pion-dtls-v3)
(replace "go-github-com-pion-stun-v2" go-github-com-pion-stun-v3)
(replace "go-github-com-pion-turn-v3" go-github-com-pion-turn-v4)))))
@@ -12851,7 +12851,7 @@ Protocol,SCTP} as specified in
(list
#:import-path "github.com/pion/srtp/v3"))
(propagated-inputs
(modify-inputs (package-propagated-inputs go-github-com-pion-srtp-v2)
(modify-inputs propagated-inputs
(replace "go-github-com-pion-transport-v2"
go-github-com-pion-transport-v4)))))
@@ -13000,7 +13000,7 @@ throughout the @url{https://github.com/pion, Pion} modules.")
(native-inputs
(list go-github-com-stretchr-testify))
(propagated-inputs
(modify-inputs (package-propagated-inputs go-github-com-pion-transport)
(modify-inputs propagated-inputs
(prepend go-github-com-wlynxg-anet)))))
(define-public go-github-com-pion-transport-v3
@@ -13044,7 +13044,7 @@ throughout the @url{https://github.com/pion, Pion} modules.")
(list
#:import-path "github.com/pion/transport/v4"))
(propagated-inputs
(modify-inputs (package-propagated-inputs go-github-com-pion-transport-v3)
(modify-inputs propagated-inputs
(prepend go-golang-org-x-time)))))
(define-public go-github-com-pion-turn-v2

2
gnu/packages/golang-xyz.scm
View File

@@ -32112,7 +32112,7 @@ various modes for analyzing and transforming YAML data.")))
(string-append bash "/completions"))))))))))
(native-inputs
(append
(modify-inputs (package-native-inputs go-github-com-opencontainers-runtime-tools)
(modify-inputs native-inputs
(append go-md2man))
(package-propagated-inputs go-github-com-opencontainers-runtime-tools)))
(propagated-inputs '())

2
gnu/packages/gpodder.scm
View File

@@ -157,7 +157,7 @@ and track podcasts.")
(package/inherit libmygpo-qt
(name "libmygpo-qt5")
(inputs
(modify-inputs (package-inputs libmygpo-qt)
(modify-inputs inputs
(replace "qtbase" qtbase-5)))
(arguments
(substitute-keyword-arguments arguments

2
gnu/packages/graphviz.scm
View File

@@ -145,7 +145,7 @@ interfaces for other technical domains.")
(define-public graphviz-minimal
(package/inherit graphviz
(name "graphviz-minimal")
(inputs (modify-inputs (package-inputs graphviz)
(inputs (modify-inputs inputs
(delete "libxrender" "libx11" "pango" "libxaw")))
(synopsis "Graph visualization software (without X11 support)")))

2
gnu/packages/gstreamer.scm
View File

@@ -735,7 +735,7 @@ model to base your own plug-in on, here it is.")
(inherit gst-plugins-good)
(name "gst-plugins-good-qt")
(inputs
(modify-inputs (package-inputs gst-plugins-good)
(modify-inputs inputs
(prepend qtbase
qtdeclarative
qtshadertools

14
gnu/packages/gtk.scm
View File

@@ -248,7 +248,7 @@ output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.")
(properties (alist-delete 'hidden? (package-properties cairo)))
(outputs (cons "doc" (package-outputs cairo)))
(native-inputs
(modify-inputs (package-native-inputs cairo)
(modify-inputs native-inputs
(prepend gtk-doc/stable)))
(arguments
(substitute-keyword-arguments arguments
@@ -616,10 +616,10 @@ highlighting and other features typical of a source code editor.")
(base32
"0zd84229bddvp8zpnn86q34i16mhf9x3pzry795gilc3na7x3jby"))))
(native-inputs
(modify-inputs (package-native-inputs gtksourceview)
(modify-inputs native-inputs
(replace "gobject-introspection" gobject-introspection)))
(propagated-inputs
(modify-inputs (package-propagated-inputs gtksourceview)
(modify-inputs propagated-inputs
(replace "gtk" gtk+)
(replace "glib" glib)))))
@@ -871,7 +871,7 @@ is part of the GNOME accessibility project.")
(string-append "docs_dir = '" #$output:doc
"/share/doc'\n")))))))))
(native-inputs
(modify-inputs (package-native-inputs at-spi2-core)
(modify-inputs native-inputs
(append gi-docgen python python-sphinx)
(replace "python-dbusmock" python-dbusmock)))
(properties (alist-delete 'hidden?
@@ -1738,7 +1738,7 @@ library.")
(sha256
(base32 "1qwdj9xw1w651kqwh82nipbryimm1ir5n3c6q34nphsx576bj9h1"))))
(propagated-inputs
(modify-inputs (package-propagated-inputs cairomm)
(modify-inputs propagated-inputs
(prepend libsigc++-2)))))
(define-public pangomm
@@ -1868,7 +1868,7 @@ text rendering library.")
(sha256
(base32 "1cysiz908phkagwnls44xxa60xls7r3fw540zcg00g7q520jl50a"))))
(propagated-inputs
(modify-inputs (package-propagated-inputs atkmm)
(modify-inputs propagated-inputs
(replace "glibmm" glibmm-2.66)))))
(define-public gtkmm
@@ -2336,7 +2336,7 @@ with some extra work.")
(define-public gtk-doc/stable
(hidden-package
(package/inherit gtk-doc
(inputs (modify-inputs (package-inputs gtk-doc)
(inputs (modify-inputs inputs
(replace "dblatex" dblatex/stable))))))
(define-public gtk-engines

56
gnu/packages/guile-xyz.scm
View File

@@ -997,14 +997,14 @@ variables from them.")
(dep-path "GUILE_LOAD_PATH" site)
(dep-path "GUILE_LOAD_COMPILED_PATH" site-ccache)))))))))
(inputs
(modify-inputs (package-inputs guile-dotenv)
(modify-inputs inputs
(append bash-minimal)))
(native-inputs
(modify-inputs (package-native-inputs guile-dotenv)
(modify-inputs native-inputs
;; As opposed to guile-config, here we need to propagate it.
(delete "guile-config")))
(propagated-inputs
(modify-inputs (package-propagated-inputs guile-dotenv)
(modify-inputs propagated-inputs
(prepend guile-config
guile-dotenv)))
(description
@@ -1076,14 +1076,14 @@ tables.")
(package
(inherit guile-dsv)
(name "guile2.2-dsv")
(native-inputs (modify-inputs (package-native-inputs guile-dsv)
(native-inputs (modify-inputs native-inputs
(replace "guile-smc" guile2.2-smc)
(replace "guile" guile-2.2)
(replace "guile-lib" guile2.2-lib)))
(inputs (modify-inputs (package-inputs guile-dsv)
(inputs (modify-inputs inputs
(replace "guile" guile-2.2)
(replace "guile-lib" guile2.2-lib)))
(propagated-inputs (modify-inputs (package-propagated-inputs guile-dsv)
(propagated-inputs (modify-inputs propagated-inputs
(replace "guile-lib" guile2.2-lib)
(replace "guile-smc" guile2.2-smc)))))
@@ -1252,10 +1252,10 @@ is not available for Guile 2.0.")
(inherit guile-fibers)
(name "guile2.2-fibers")
(inputs
(modify-inputs (package-inputs guile-fibers)
(modify-inputs inputs
(replace "guile" guile-2.2)))
(native-inputs
(modify-inputs (package-native-inputs guile-fibers)
(modify-inputs native-inputs
(replace "guile" guile-2.2)))))
(define-public guile-fibers-next
@@ -1277,10 +1277,10 @@ is not available for Guile 2.0.")
(base32
"0qh0czz5qvk5mmrc8x2gmvl5psdfd22q2rhzj4jrpan6k3d55bl8"))))
(inputs
(modify-inputs (package-inputs guile-fibers)
(modify-inputs inputs
(replace "guile" guile-next)))
(native-inputs
(modify-inputs (package-native-inputs guile-fibers)
(modify-inputs native-inputs
(replace "guile" guile-next))))))
(define-public guile-kracht
@@ -1680,7 +1680,7 @@ using Guile's foreign function interface.")
(package
(inherit guile-squee)
(name "guile2.2-squee")
(native-inputs (modify-inputs (package-native-inputs guile-squee)
(native-inputs (modify-inputs native-inputs
(replace "guile" guile-2.2)))))
(define-public guile-colorized
@@ -2077,7 +2077,7 @@ messaging library.")
(package
(inherit guile-simple-zmq)
(name "guile2.2-simple-zmq")
(native-inputs (modify-inputs (package-native-inputs guile-simple-zmq)
(native-inputs (modify-inputs native-inputs
(replace "guile" guile-2.2)))))
(define-public jupyter-guile-kernel
@@ -2247,7 +2247,7 @@ format.")
(package
(inherit guile-email)
(name "guile2.2-email")
(inputs (modify-inputs (package-inputs guile-email)
(inputs (modify-inputs inputs
(replace "guile" guile-2.2)))
(arguments
(substitute-keyword-arguments arguments
@@ -2381,7 +2381,7 @@ Scheme by using Guile’s foreign function interface.")
(package
(inherit guile-newt)
(name "guile2.2-newt")
(inputs (modify-inputs (package-inputs guile-newt)
(inputs (modify-inputs inputs
(replace "guile" guile-2.2)))))
(define-public guile-mastodon
@@ -2447,7 +2447,7 @@ written in pure Scheme by using Guile's foreign function interface.")
(package
(inherit guile-parted)
(name "guile2.2-parted")
(inputs (modify-inputs (package-inputs guile-parted)
(inputs (modify-inputs inputs
(replace "guile" guile-2.2)))
(propagated-inputs
`(("guile-bytestructures" ,guile2.2-bytestructures)))))
@@ -2603,7 +2603,7 @@ It currently supports MySQL, Postgres and SQLite3.")
(inputs
(list sqlite zlib))
(native-inputs
(modify-inputs (package-native-inputs guile-dbi)
(modify-inputs native-inputs
(prepend guile-dbi ; only required for headers
pkg-config)))
(synopsis "Guile DBI driver for SQLite")
@@ -2632,7 +2632,7 @@ SQL databases. This package implements the interface for SQLite.")))
(inputs
(list postgresql zlib))
(native-inputs
(modify-inputs (package-native-inputs guile-dbi)
(modify-inputs native-inputs
(prepend guile-dbi ; only required for headers
)))
(synopsis "Guile DBI driver for PostgreSQL")
@@ -2665,7 +2665,7 @@ PostgreSQL.")))
(list `(,mariadb "dev")
`(,mariadb "lib") zlib))
(native-inputs
(modify-inputs (package-native-inputs guile-dbi)
(modify-inputs native-inputs
(prepend guile-dbi ; only required for headers
)))
(synopsis "Guile DBI driver for MySQL")
@@ -2754,7 +2754,7 @@ above command-line parameters.")
(package
(inherit guile-config)
(name "guile2.2-config")
(inputs (modify-inputs (package-inputs guile-config)
(inputs (modify-inputs inputs
(replace "guile" guile-2.2)))))
(define-public guile-hall
@@ -2869,7 +2869,7 @@ The library is shipped with documentation in Info format and usage examples.")
(inherit guile-ics)
(name "guile2.2-ics")
(native-inputs
(modify-inputs (package-native-inputs guile-ics)
(modify-inputs native-inputs
(replace "guile" guile-2.2)
(replace "guile-lib" guile2.2-lib)
(replace "guile-smc" guile2.2-smc)))
@@ -3133,7 +3133,7 @@ object-oriented programming system, GOOPS.")
(inherit guile-g-golf)
(name "guile2.2-g-golf")
(inputs
(modify-inputs (package-inputs guile-g-golf)
(modify-inputs inputs
(replace "guile" guile-2.2)
(replace "guile-lib" guile2.2-lib)))))
@@ -4294,7 +4294,7 @@ store.")
(package
(inherit guile-redis)
(name "guile2.2-redis")
(native-inputs (modify-inputs (package-native-inputs guile-redis)
(native-inputs (modify-inputs native-inputs
(replace "guile" guile-2.2)))))
(define-public guile-commonmark
@@ -4830,7 +4830,7 @@ pre-alpha code.")
(inherit guile-gi)
(name "guile2.2-gi")
(inputs
(modify-inputs (package-inputs guile-gi)
(modify-inputs inputs
(replace "guile" guile-2.2)))))
(define-public guile-srfi-89
@@ -6453,7 +6453,7 @@ over, or update a value in arbitrary data structures.")
(inherit guile-lens)
(name "guile2.2-lens")
(native-inputs
(modify-inputs (package-native-inputs guile-lens)
(modify-inputs native-inputs
(replace "guile" guile-2.2)))))
(define-public guile-xapian
@@ -6493,10 +6493,10 @@ models and also supports a rich set of boolean query operators.")
(inherit guile-xapian)
(name "guile2.2-xapian")
(inputs
(modify-inputs (package-inputs guile-xapian)
(modify-inputs inputs
(replace "guile" guile-2.2)))
(propagated-inputs
(modify-inputs (package-propagated-inputs guile-xapian)
(modify-inputs propagated-inputs
(replace "guile-lib" guile2.2-lib)))))
(define-public guile-torrent
@@ -7582,10 +7582,10 @@ with a FSM is being built (for example, from a Makefile.)")
(package
(inherit guile-smc)
(name "guile2.2-smc")
(native-inputs (modify-inputs (package-native-inputs guile-smc)
(native-inputs (modify-inputs native-inputs
(replace "guile" guile-2.2)
(replace "guile-lib" guile2.2-lib)))
(inputs (modify-inputs (package-inputs guile-smc)
(inputs (modify-inputs inputs
(replace "guile" guile-2.2)
(replace "guile-lib" guile2.2-lib)))))

2
gnu/packages/haskell-xyz.scm
View File

@@ -7575,7 +7575,7 @@ manipulating monad transformer stacks.")
(inherit ghc-mockery)
(name "ghc-mockery-bootstrap")
(arguments `(#:tests? #f))
(inputs (modify-inputs (package-inputs ghc-mockery)
(inputs (modify-inputs inputs
(replace "ghc-logging-facade" ghc-logging-facade-bootstrap)))
(native-inputs '())
(properties '((hidden? #t)))))

2
gnu/packages/ibus.scm
View File

@@ -264,7 +264,7 @@ may also simplify input method development.")
,(string-append #$output "/lib/girepository-1.0")))))
(list (search-input-file outputs "bin/ibus-setup")
(search-input-file outputs "bin/ibus-daemon")))))))))
(inputs (modify-inputs (package-inputs ibus-minimal)
(inputs (modify-inputs inputs
(prepend gtk
pango
python

8
gnu/packages/image-processing.scm
View File

@@ -984,7 +984,7 @@ including 2D color images.")
(native-inputs
(list pkg-config qttools-5))
(inputs
(modify-inputs (package-inputs gmic)
(modify-inputs inputs
(prepend gmic qtbase-5)))
(synopsis "Qt frontend for the G'MIC image processing framework")
(license license:gpl3+)))
@@ -995,7 +995,7 @@ including 2D color images.")
(name "gmic-qt-gimp")
(inputs
;; GIMP and its dependencies.
(modify-inputs (package-inputs gmic-qt)
(modify-inputs inputs
(prepend gexiv2 gdk-pixbuf gegl gimp pango)))
(arguments
(substitute-keyword-arguments arguments
@@ -1620,9 +1620,9 @@ combine the information contained in both.")
((#:phases phases #~%standard-phases)
#~(modify-phases #$phases
(delete 'python-sanity-check)))))
(inputs (modify-inputs (package-inputs insight-toolkit)
(inputs (modify-inputs inputs
(delete "python")))
(native-inputs (modify-inputs (package-native-inputs insight-toolkit)
(native-inputs (modify-inputs native-inputs
(delete "castxml")
(delete "python-numpy")
(delete "swig"))))))

2
gnu/packages/image.scm
View File

@@ -377,7 +377,7 @@ APNG patch provides APNG support to libpng.")
(base32
"01r34c31gq136jwshdfira44wbl6nb8qfgj4a4vam9r0hr8rdwsd"))))
(inputs
(modify-inputs (package-inputs libpng-apng)
(modify-inputs inputs
(replace "apng"
(origin
(method url-fetch)

2
gnu/packages/irc.scm
View File

@@ -951,7 +951,7 @@ building block for other projects.")
(find-files
#$(this-package-native-input "python-irc-parser-tests") "\\.yaml$"))))))))
(propagated-inputs
(modify-inputs (package-propagated-inputs go-gopkg-in-irc-v3)
(modify-inputs propagated-inputs
(append go-golang-org-x-time)))))
(define-public chathistorysync

2
gnu/packages/java-bootstrap.scm
View File

@@ -733,7 +733,7 @@ supports sufficient parts of Java 7 to build Icedtea 2.x.")
(package
(inherit jamvm)
(inputs
(modify-inputs (package-inputs jamvm)
(modify-inputs inputs
(replace "ecj-javac-wrapper" ecj4-javac-wrapper)))
(properties
(alist-delete 'hidden? (package-properties jamvm)))))

22
gnu/packages/java.scm
View File

@@ -1609,7 +1609,7 @@ new Date();"))))
(release-tag-suffix . "-ga")
(release-tag-version-delimiter . ".")))
(native-inputs
(modify-inputs (package-native-inputs bootstrap)
(modify-inputs native-inputs
(replace "openjdk" bootstrap)))
(home-page (string-append
"https://openjdk.java.net/projects/jdk/"
@@ -1715,7 +1715,7 @@ blacklisted.certs.pem"
(search-patches "openjdk-15-jtask-reproducibility.patch"
"openjdk-15-xcursor-no-dynamic.patch"))))
(inputs
(modify-inputs (package-inputs base)
(modify-inputs inputs
(append libxcursor))) ;for our patch to work
(arguments
(substitute-keyword-arguments (package-arguments base)
@@ -1728,7 +1728,7 @@ blacklisted.certs.pem"
#~(cons "--without-gtest" ;this replaces...
(delete "--disable-hotspot-gtest" #$flags))))) ;... this
(native-inputs
(append (modify-inputs (package-native-inputs base)
(append (modify-inputs native-inputs
(delete "make" ;remove old gnu-make-4.2
"openjdk") ;to remove non-jdk output
(append `(,openjdk14 "jdk")))
@@ -5078,7 +5078,7 @@ every feature for every plugin.")))
(list java-modello-core java-modello-plugins-java
java-modello-plugins-xml))
(native-inputs
(modify-inputs (package-native-inputs java-modello-core)
(modify-inputs native-inputs
(prepend java-xmlunit java-modello-test)))
(synopsis "Modello XPP3 Plugin")
(description "The modello XPP3 plugin generates XML readers and writers based
@@ -5734,7 +5734,7 @@ The jMock library
(not (string-suffix? "-sources.jar" name)))))))
#t)))))))
(inputs
(modify-inputs (package-inputs java-hamcrest-core)
(modify-inputs inputs
(prepend java-junit
java-jmock-1
;; This is necessary because of what seems to be a race condition.
@@ -6802,7 +6802,7 @@ This package provides the blocking I/O model library.")
(add-after 'unpack 'chdir
(lambda _ (chdir "httpcore-nio") #t)))))
(inputs
(modify-inputs (package-inputs java-httpcomponents-httpcore)
(modify-inputs inputs
(prepend java-httpcomponents-httpcore java-hamcrest-core)))
(description "HttpCore is a set of low level HTTP transport components
that can be used to build custom client and server side HTTP services with a
@@ -6823,7 +6823,7 @@ NIO.")))
(add-after 'unpack 'chdir
(lambda _ (chdir "httpcore-ab") #t)))))
(inputs
(modify-inputs (package-inputs java-httpcomponents-httpcore)
(modify-inputs inputs
(prepend java-httpcomponents-httpcore java-commons-cli
java-hamcrest-core)))
(synopsis "Apache HttpCore benchmarking tool")
@@ -6840,7 +6840,7 @@ an Apache AB clone based on HttpCore.")))
(add-after 'unpack 'chdir
(lambda _ (chdir "httpcore-osgi"))))))
(inputs
(modify-inputs (package-inputs java-httpcomponents-httpcore)
(modify-inputs inputs
(prepend java-httpcomponents-httpcore
java-httpcomponents-httpcore-nio
java-hamcrest-core)))
@@ -6914,7 +6914,7 @@ standards and recommendations.")
(add-after 'unpack 'chdir
(lambda _ (chdir "httpclient-cache"))))))
(inputs
(modify-inputs (package-inputs java-httpcomponents-httpclient)
(modify-inputs inputs
(prepend java-httpcomponents-httpclient
java-httpcomponents-httpmime
java-hamcrest-core)))
@@ -6932,7 +6932,7 @@ resources.")))
(add-after 'unpack 'chdir
(lambda _ (chdir "httpclient-osgi") #t)))))
(inputs
(modify-inputs (package-inputs java-httpcomponents-httpclient)
(modify-inputs inputs
(prepend java-httpcomponents-httpclient
java-httpcomponents-httpclient-cache
java-osgi-framework
@@ -13964,7 +13964,7 @@ This module lays the groundwork for the other two modules.")
(invoke "ant" "jar")
#t)))))
(inputs
(modify-inputs (package-inputs java-logback-core)
(modify-inputs inputs
(prepend java-logback-core java-slf4j-api)))
(native-inputs
(list groovy))

2
gnu/packages/jupyter.scm
View File

@@ -259,7 +259,7 @@ simulation, statistical modeling, machine learning and much more.")
(delete 'sanity-check))))
(native-inputs (list python-hatchling))
(propagated-inputs
(modify-inputs (package-propagated-inputs parent)
(modify-inputs propagated-inputs
(replace "python-jupyter-client" python-jupyter-client-bootstrap)))))))
(define-public python-jupytext

4
gnu/packages/kde-frameworks.scm
View File

@@ -330,7 +330,7 @@ accessibility clients such as screen readers.")
(package
(inherit libqaccessibilityclient)
(name "libqaccessibilityclient-qt5")
(inputs (modify-inputs (package-inputs libqaccessibilityclient)
(inputs (modify-inputs inputs
(replace "qtbase" qtbase-5)))))
(define-public qca
@@ -1024,7 +1024,7 @@ as well as an API to create KDED modules.")
(source (origin
(inherit (package-source kdbusaddons-5))
(patches '())))
(inputs (modify-inputs (package-inputs kdbusaddons-5) (delete "kinit")))
(inputs (modify-inputs inputs (delete "kinit")))
(arguments
(substitute-keyword-arguments arguments
((#:phases phases)

2
gnu/packages/kde-graphics.scm
View File

@@ -733,7 +733,7 @@ decode RAW picture files.")
(package
(inherit libkdcraw)
(name "libkdcraw-qt5")
(inputs (modify-inputs (package-inputs libkdcraw)
(inputs (modify-inputs inputs
(replace "qtbase" qtbase-5)))))
(define-public libksane

2
gnu/packages/kodi.scm
View File

@@ -514,7 +514,7 @@ plug-in system.")
`(cons "-DCORE_PLATFORM_NAME=wayland"
(delete "-DCORE_PLATFORM_NAME=x11" ,flags)))))
(inputs
(modify-inputs (package-inputs kodi)
(modify-inputs inputs
(prepend libinput
libxkbcommon
waylandpp

2
gnu/packages/libevent.scm
View File

@@ -80,7 +80,7 @@ loop.")
(define-public libevent-with-openssl
(package/inherit libevent
(name "libevent-with-openssl")
(inputs (modify-inputs (package-inputs libevent)
(inputs (modify-inputs inputs
(prepend openssl)))
(arguments
;; This skips some of the tests which fail on armhf and aarch64.

8
gnu/packages/linux.scm
View File

@@ -3681,7 +3681,7 @@ block devices, UUIDs, TTYs, and many other tools.")
util-linux
(name "util-linux-with-udev")
(inputs
(modify-inputs (package-inputs util-linux)
(modify-inputs inputs
(prepend eudev)))))
(define-public chimerautils
@@ -10569,7 +10569,7 @@ libraries, which are often integrated directly into libfabric.")
(sha256
(base32 "1znmw83rmippv0fwz0x7lgylfk17dr9ckll8lrm4z7kclspnqpj8"))))
(inputs
(modify-inputs (package-inputs libfabric)
(modify-inputs inputs
(append cxi-driver-for-libfabric-1)))))
(define-public psm
@@ -11106,7 +11106,7 @@ file systems.")
`(cons "--enable-gettext=no"
,configure-flags))))
(native-inputs
(modify-inputs (package-native-inputs xfsprogs)
(modify-inputs native-inputs
(delete "gettext-minimal")))))
(define-public xfsprogs/static
@@ -11622,7 +11622,7 @@ tools for managing PipeWire.")
((#:configure-flags flags ''())
#~(cons "-Delogind=disabled" #$flags))))
(inputs
(modify-inputs (package-inputs base)
(modify-inputs inputs
(delete "elogind"))))))
(define-public ell

6
gnu/packages/lisp-xyz.scm
View File

@@ -4714,7 +4714,7 @@ to cl-async.")
(search-input-file inputs
"/lib/async-process/libasyncprocess.so"))))))))
(inputs
(modify-inputs (package-inputs libasyncprocess)
(modify-inputs inputs
(prepend libasyncprocess sbcl-cffi)))
(home-page "https://github.com/lem-project/async-process")
(synopsis "Asynchronous process execution for Common Lisp")
@@ -10348,7 +10348,7 @@ Development into CL+SSL was done by David Lichteblau.")
(package
(inherit pkg)
(native-inputs
(modify-inputs (package-native-inputs pkg)
(modify-inputs native-inputs
(delete "sbcl-trivial-sockets")))
(arguments
(substitute-keyword-arguments arguments
@@ -19872,7 +19872,7 @@ and @code{kqueue(2)}), a pathname library and file-system utilities.")
(inherit parent)
(propagated-inputs
;; Need header to compile.
(modify-inputs (package-propagated-inputs parent)
(modify-inputs propagated-inputs
(prepend libfixposix))))))
(define-public ecl-iolib

34
gnu/packages/llvm.scm
View File

@@ -891,7 +891,7 @@ Library.")
(install-file "LICENSE.TXT"
(string-append #$output "/share/doc"))))))))
(native-inputs
(modify-inputs (package-native-inputs libomp-15)
(modify-inputs native-inputs
(replace "clang" clang-14)
(replace "llvm" llvm-14)))))
@@ -965,7 +965,7 @@ Library.")
#~(modify-phases #$phases
(delete 'chdir-to-source-and-install-license)))))
(native-inputs
(modify-inputs (package-native-inputs libomp-14)
(modify-inputs native-inputs
(replace "clang" clang-13)
(replace "llvm" llvm-13)))))
@@ -1046,7 +1046,7 @@ Library.")
((#:configure-flags flags)
#~`(,@(delete "-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF" #$flags)))))
(native-inputs
(modify-inputs (package-native-inputs libomp-13)
(modify-inputs native-inputs
(replace "clang" clang-12)
(replace "llvm" llvm-12)))))
@@ -1077,7 +1077,7 @@ Library.")
(version (package-version llvm-16))
(source (llvm-monorepo version))
(native-inputs
(modify-inputs (package-native-inputs libomp-15)
(modify-inputs native-inputs
(replace "clang" clang-16)
(replace "llvm" llvm-16)))))
@@ -1109,7 +1109,7 @@ Library.")
(version (package-version llvm-17))
(source (llvm-monorepo version))
(native-inputs
(modify-inputs (package-native-inputs libomp-15)
(modify-inputs native-inputs
(replace "clang" clang-17)
(replace "llvm" llvm-17)))))
@@ -1180,7 +1180,7 @@ Library.")
(version (package-version llvm-18))
(source (llvm-monorepo version))
(native-inputs
(modify-inputs (package-native-inputs libomp-15)
(modify-inputs native-inputs
(replace "clang" clang-18)
(replace "llvm" llvm-18)))))
@@ -1211,7 +1211,7 @@ Library.")
(version (package-version llvm-19))
(source (llvm-monorepo version))
(native-inputs
(modify-inputs (package-native-inputs libomp-15)
(modify-inputs native-inputs
(replace "clang" clang-19)
(replace "llvm" llvm-19)))))
@@ -1242,7 +1242,7 @@ Library.")
(version (package-version llvm-20))
(source (llvm-monorepo version))
(native-inputs
(modify-inputs (package-native-inputs libomp-15)
(modify-inputs native-inputs
(replace "clang" clang-20)
(replace "llvm" llvm-20)))))
@@ -1273,7 +1273,7 @@ Library.")
(version (package-version llvm-21))
(source (llvm-monorepo version))
(native-inputs
(modify-inputs (package-native-inputs libomp-15)
(modify-inputs native-inputs
(replace "clang" clang-21)
(replace "llvm" llvm-21)))))
@@ -1432,7 +1432,7 @@ This AMD fork includes AMD-specific additions."))))
(name "clang-runtime-rocm")
(version (package-version llvm-rocm))
(source (package-source llvm-rocm))
(inputs (modify-inputs (package-inputs clang-runtime-base)
(inputs (modify-inputs inputs
(replace "llvm" llvm-rocm)))))
(define-public clang-runtime-rocm (make-clang-runtime-rocm clang-runtime-20))
@@ -1444,10 +1444,10 @@ This AMD fork includes AMD-specific additions."))))
(name "clang-rocm")
(version (package-version llvm-rocm))
(source (package-source llvm-rocm))
(inputs (modify-inputs (package-inputs clang-base)
(inputs (modify-inputs inputs
(delete "clang-tools-extra")))
(propagated-inputs
(modify-inputs (package-propagated-inputs clang-base)
(modify-inputs propagated-inputs
(replace "llvm" llvm-rocm)
(replace "clang-runtime" clang-runtime-rocm)
(append python-lit)))
@@ -1744,7 +1744,7 @@ components which highly leverage existing libraries in the larger LLVM Project."
(sha256
(base32
"0qg3fgc7wj34hdkqn21y03zcmsdd01szhhm1hfki63iifrm3y2v9"))))
(inputs (modify-inputs (package-inputs lld)
(inputs (modify-inputs inputs
(replace "llvm" llvm-12)))))
(define-public lld-16
@@ -2146,7 +2146,7 @@ generator targetting AMD hardware.")
"config.environment['CPLUS_INCLUDE_PATH']"
" = os.environ['CPLUS_INCLUDE_PATH']\n")))))))))
(native-inputs
(modify-inputs (package-native-inputs libomp-20)
(modify-inputs native-inputs
(replace "clang" clang-rocm)
(replace "llvm" llvm-rocm)))))
@@ -2204,7 +2204,7 @@ the host.")
(inherit clang-rocm-toolchain)
(name "rocm-toolchain")
(inputs
(modify-inputs (package-inputs clang-rocm-toolchain)
(modify-inputs inputs
(append lld-wrapper-rocm
offload-rocm
rocr-runtime
@@ -2518,7 +2518,7 @@ LLVM bitcode files.")
;; This reduces the size from 22 MiB to 4 MiB.
(lambda _
(for-each delete-file (find-files #$output "\\.a$"))))))))
(inputs (modify-inputs (package-inputs base)
(inputs (modify-inputs inputs
(replace "llvm" llvm-cling))))))
(define clang-cling
@@ -2528,7 +2528,7 @@ LLVM bitcode files.")
(version (package-version llvm-cling))
(source (package-source llvm-cling))
(propagated-inputs
(modify-inputs (package-propagated-inputs base)
(modify-inputs propagated-inputs
(replace "llvm" llvm-cling)
(replace "clang-runtime" clang-cling-runtime))))))

2
gnu/packages/luanti.scm
View File

@@ -172,7 +172,7 @@ sources.")
(string-append (getcwd) "/../source/games"))
(invoke "../source/bin/luantiserver" "--run-unittests"))))))))
(inputs
(modify-inputs (package-inputs luanti)
(modify-inputs inputs
(delete "libjpeg-turbo"
"libpng"
"libogg"

4
gnu/packages/machine-learning.scm
View File

@@ -5392,7 +5392,7 @@ in the audio domain.")
(package/inherit python-pytorch
(name "python-pytorch-avx")
(inputs
(modify-inputs (package-inputs python-pytorch)
(modify-inputs inputs
(append fbgemm nnpack)))
(arguments
(substitute-keyword-arguments arguments
@@ -5432,7 +5432,7 @@ in the audio domain.")
(source %python-pytorch-for-r-torch-src)
(build-system python-build-system)
(inputs
(modify-inputs (package-inputs python-pytorch)
(modify-inputs inputs
(replace "gloo" gloo-for-r-torch)))
(arguments
(substitute-keyword-arguments arguments

2
gnu/packages/mail.scm
View File

@@ -588,7 +588,7 @@ Python}.")
(inherit mailutils)
(name "guile2.2-mailutils")
(inputs
(modify-inputs (package-inputs mailutils)
(modify-inputs inputs
(replace "guile" guile-2.2)))))
(define-public nullmailer

4
gnu/packages/make-bootstrap.scm
View File

@@ -617,11 +617,11 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(outputs (delete "debug" (package-outputs guile)))
(inputs
(modify-inputs (package-inputs guile)
(modify-inputs inputs
(prepend `(,libunistring "static"))))
(propagated-inputs
(modify-inputs (package-propagated-inputs guile)
(modify-inputs propagated-inputs
(replace "libgc" libgc/static-libs)))
(arguments

32
gnu/packages/maths.scm
View File

@@ -1223,7 +1223,7 @@ large scale eigenvalue problems.")
(package (inherit arpack-ng)
(name "arpack-ng-openmpi")
(inputs
(modify-inputs (package-inputs arpack-ng)
(modify-inputs inputs
(prepend openmpi)))
(arguments
(substitute-keyword-arguments arguments
@@ -2150,7 +2150,7 @@ Interface to wrap the HDF5 library, which is implemented in C.")
(define-public hdf5-parallel-openmpi
(package/inherit hdf5
(name "hdf5-parallel-openmpi")
(inputs (modify-inputs (package-inputs hdf5)
(inputs (modify-inputs inputs
(prepend openmpi)))
(arguments
(substitute-keyword-arguments arguments
@@ -2454,7 +2454,7 @@ sharing of scientific data.")
(define-public netcdf-parallel-openmpi
(package/inherit netcdf
(name "netcdf-parallel-openmpi")
(inputs (modify-inputs (package-inputs netcdf)
(inputs (modify-inputs inputs
(append openmpi pnetcdf)
(replace "hdf5" hdf5-parallel-openmpi)))
;; TODO: Replace pkg-config references in nc-config with absolute references
@@ -2563,10 +2563,10 @@ scientific data storage.")
(inherit netcdf-cxx4)
(name "netcdf-cxx4-parallel-openmpi")
(synopsis "NetCDF C++ interface (with MPI support)")
(inputs (modify-inputs (package-inputs netcdf-cxx4)
(inputs (modify-inputs inputs
(prepend openmpi)
(replace "hdf5" hdf5-parallel-openmpi)))
(propagated-inputs (modify-inputs (package-propagated-inputs netcdf-cxx4)
(propagated-inputs (modify-inputs propagated-inputs
(replace "netcdf" netcdf-parallel-openmpi)))))
(define-public n2p2
@@ -3383,7 +3383,7 @@ can solve two kinds of problems:
((compile-file "../..") "autodiff_benchmarks"))))))
(delete 'check)
(delete 'install))))
(inputs (modify-inputs (package-inputs ceres)
(inputs (modify-inputs inputs
(prepend googlebenchmark ceres)))
(synopsis "Benchmarks of the Ceres optimization problem solver")))
@@ -4107,7 +4107,7 @@ scientific applications modeled by partial differential equations.")
(inherit petsc)
(name "petsc-openmpi")
(inputs
(modify-inputs (package-inputs petsc)
(modify-inputs inputs
(prepend hdf5-parallel-openmpi
hypre-openmpi
metis
@@ -4154,7 +4154,7 @@ scientific applications modeled by partial differential equations.")
(inherit petsc-complex)
(name "petsc-complex-openmpi")
(inputs
(modify-inputs (package-inputs petsc-complex)
(modify-inputs inputs
(prepend openmpi)))
(arguments
(substitute-keyword-arguments arguments
@@ -5200,7 +5200,7 @@ sparse system of linear equations A x = b using Gaussian elimination.")
(package
(inherit mumps)
(name "mumps-metis")
(inputs (modify-inputs (package-inputs mumps)
(inputs (modify-inputs inputs
(delete "scotch")))))
(define-public mumps-openmpi
@@ -5208,7 +5208,7 @@ sparse system of linear equations A x = b using Gaussian elimination.")
(inherit mumps)
(name "mumps-openmpi")
(inputs
(modify-inputs (package-inputs mumps)
(modify-inputs inputs
(delete "scotch")
(prepend openmpi scalapack pt-scotch)))
(arguments
@@ -5227,7 +5227,7 @@ sparse system of linear equations A x = b using Gaussian elimination.")
(package
(inherit mumps-openmpi)
(name "mumps-metis-openmpi")
(inputs (modify-inputs (package-inputs mumps-openmpi)
(inputs (modify-inputs inputs
(delete "pt-scotch")))))
(define-public ruby-asciimath
@@ -5779,7 +5779,7 @@ point numbers.")
(name "maxima-ecl")
(properties '((hidden? . #t)))
(inputs
(modify-inputs (package-inputs maxima)
(modify-inputs inputs
(delete "sbcl")
(prepend ecl)))
(arguments
@@ -7873,7 +7873,7 @@ problems.")
(package
(inherit hypre)
(name "hypre-openmpi")
(inputs (modify-inputs (package-inputs hypre)
(inputs (modify-inputs inputs
(prepend openmpi)))
(arguments
(substitute-keyword-arguments arguments
@@ -8526,7 +8526,7 @@ symmetric matrices.")
(package/inherit elpa
(name "elpa-openmpi")
(inputs
(modify-inputs (package-inputs elpa)
(modify-inputs inputs
(prepend openmpi scalapack zlib)))
(arguments
(substitute-keyword-arguments arguments
@@ -8820,7 +8820,7 @@ easily be incorporated into existing simulation codes.")
(base32
"0nx4sqhmi126m14myzm7syv2053harav9snl0a247wnkcgs5rxrv"))))
(inputs
(modify-inputs (package-inputs sundials)
(modify-inputs inputs
(prepend gfortran openblas)))
(arguments
'(#:configure-flags `("-DCMAKE_C_FLAGS=-O2 -g -fcommon"
@@ -9415,7 +9415,7 @@ built on top of DUNE, the Distributed and Unified Numerics Environment.")
(if (dune-package? p)
(package (inherit p)
(name (string-append (package-name p) "-openmpi"))
(inputs (modify-inputs (package-inputs p)
(inputs (modify-inputs inputs
(append openmpi)))
(arguments
(substitute-keyword-arguments arguments

54
gnu/packages/maven.scm
View File

@@ -2294,7 +2294,7 @@ reporting or the build process.")))
(base32
"0hbbbxj14qyq8pccyab96pjqq90jnjmid1pml9kx55c5smfpjn37"))))
(propagated-inputs
(modify-inputs (package-propagated-inputs maven-resolver-parent-pom)
(modify-inputs propagated-inputs
(replace "maven-parent-pom" maven-parent-pom-34)))))
(define-public maven-resolver-1.6-api
@@ -2303,7 +2303,7 @@ reporting or the build process.")))
(version (package-version maven-resolver-1.6-parent-pom))
(source (package-source maven-resolver-1.6-parent-pom))
(propagated-inputs
(modify-inputs (package-propagated-inputs maven-resolver-api)
(modify-inputs propagated-inputs
(replace "maven-resolver-parent-pom" maven-resolver-1.6-parent-pom)))))
(define-public maven-resolver-1.6-spi
@@ -2312,7 +2312,7 @@ reporting or the build process.")))
(version (package-version maven-resolver-1.6-parent-pom))
(source (package-source maven-resolver-1.6-parent-pom))
(propagated-inputs
(modify-inputs (package-propagated-inputs maven-resolver-spi)
(modify-inputs propagated-inputs
(replace "maven-resolver-api" maven-resolver-1.6-api)))))
(define-public maven-resolver-1.6-test-util
@@ -2321,7 +2321,7 @@ reporting or the build process.")))
(version (package-version maven-resolver-1.6-parent-pom))
(source (package-source maven-resolver-1.6-parent-pom))
(inputs
(modify-inputs (package-inputs maven-resolver-test-util)
(modify-inputs inputs
(replace "maven-resolver-api" maven-resolver-1.6-api)
(replace "maven-resolver-spi" maven-resolver-1.6-spi)))))
@@ -2331,10 +2331,10 @@ reporting or the build process.")))
(version (package-version maven-resolver-1.6-parent-pom))
(source (package-source maven-resolver-1.6-parent-pom))
(propagated-inputs
(modify-inputs (package-propagated-inputs maven-resolver-util)
(modify-inputs propagated-inputs
(replace "maven-resolver-api" maven-resolver-1.6-api)))
(native-inputs
(modify-inputs (package-native-inputs maven-resolver-util)
(modify-inputs native-inputs
(replace "maven-resolver-test-util" maven-resolver-1.6-test-util)))))
(define-public maven-resolver-1.6-connector-basic
@@ -2343,12 +2343,12 @@ reporting or the build process.")))
(version (package-version maven-resolver-1.6-parent-pom))
(source (package-source maven-resolver-1.6-parent-pom))
(propagated-inputs
(modify-inputs (package-propagated-inputs maven-resolver-connector-basic)
(modify-inputs propagated-inputs
(replace "maven-resolver-api" maven-resolver-1.6-api)
(replace "maven-resolver-spi" maven-resolver-1.6-spi)
(replace "maven-resolver-util" maven-resolver-1.6-util)))
(native-inputs
(modify-inputs (package-native-inputs maven-resolver-connector-basic)
(modify-inputs native-inputs
(replace "maven-resolver-test-util" maven-resolver-1.6-test-util)))))
(define-public maven-resolver-1.6-impl
@@ -2397,14 +2397,14 @@ reporting or the build process.")))
(replace 'install
(install-from-pom "maven-resolver-impl/pom.xml")))))
(propagated-inputs
(modify-inputs (package-propagated-inputs maven-resolver-impl)
(modify-inputs propagated-inputs
(delete "maven-resolver-named-locks")
(replace "maven-resolver-api" maven-resolver-1.6-api)
(replace "maven-resolver-spi" maven-resolver-1.6-spi)
(replace "maven-resolver-util" maven-resolver-1.6-util)
(replace "maven-resolver-parent-pom" maven-resolver-1.6-parent-pom)))
(native-inputs
(modify-inputs (package-native-inputs maven-resolver-impl)
(modify-inputs native-inputs
(delete "java-hamcrest-all")
(delete "java-mockito-1")
(replace "maven-resolver-test-util" maven-resolver-1.6-test-util)))))
@@ -2415,13 +2415,13 @@ reporting or the build process.")))
(version (package-version maven-resolver-1.6-parent-pom))
(source (package-source maven-resolver-1.6-parent-pom))
(inputs
(modify-inputs (package-inputs maven-resolver-transport-file)
(modify-inputs inputs
(delete "maven-wagon-provider-api")
(replace "maven-resolver-api" maven-resolver-1.6-api)
(replace "maven-resolver-spi" maven-resolver-1.6-spi)
(replace "maven-resolver-util" maven-resolver-1.6-util)))
(native-inputs
(modify-inputs (package-native-inputs maven-resolver-transport-file)
(modify-inputs native-inputs
(replace "maven-resolver-test-util" maven-resolver-1.6-test-util)))))
(define-public maven-resolver-1.6-transport-http
@@ -2445,13 +2445,13 @@ reporting or the build process.")))
(lambda _
(display "org.eclipse.aether.transport.http.HttpTransporterFactory\n"))))))))
(inputs
(modify-inputs (package-inputs maven-resolver-transport-http)
(modify-inputs inputs
(delete "maven-wagon-provider-api")
(replace "maven-resolver-api" maven-resolver-1.6-api)
(replace "maven-resolver-spi" maven-resolver-1.6-spi)
(replace "maven-resolver-util" maven-resolver-1.6-util)))
(native-inputs
(modify-inputs (package-native-inputs maven-resolver-transport-http)
(modify-inputs native-inputs
(replace "maven-resolver-test-util" maven-resolver-1.6-test-util)))))
(define maven-3.8-pom
@@ -2465,7 +2465,7 @@ reporting or the build process.")))
"apache-maven-" version "-src.tar.gz"))
(sha256 (base32 "01q2g8sklxsys46i4dxqr89klcxfzz40f2kz4lxbdl1phyibqk92"))))
(propagated-inputs
(modify-inputs (package-propagated-inputs maven-pom)
(modify-inputs propagated-inputs
(replace "maven-parent-pom" maven-parent-pom-35)))))
(define-public maven-3.8-artifact
@@ -2474,7 +2474,7 @@ reporting or the build process.")))
(version (package-version maven-3.8-pom))
(source (package-source maven-3.8-pom))
(propagated-inputs
(modify-inputs (package-propagated-inputs maven-artifact)
(modify-inputs propagated-inputs
(replace "maven-pom" maven-3.8-pom)))))
(define-public maven-3.8-model
@@ -2483,7 +2483,7 @@ reporting or the build process.")))
(version (package-version maven-3.8-pom))
(source (package-source maven-3.8-pom))
(propagated-inputs
(modify-inputs (package-propagated-inputs maven-model)
(modify-inputs propagated-inputs
(replace "maven-pom" maven-3.8-pom)))))
(define-public maven-3.8-builder-support
@@ -2492,7 +2492,7 @@ reporting or the build process.")))
(version (package-version maven-3.8-pom))
(source (package-source maven-3.8-pom))
(propagated-inputs
(modify-inputs (package-propagated-inputs maven-builder-support)
(modify-inputs propagated-inputs
(replace "maven-pom" maven-3.8-pom)))))
(define-public maven-3.8-settings
@@ -2501,7 +2501,7 @@ reporting or the build process.")))
(version (package-version maven-3.8-pom))
(source (package-source maven-3.8-pom))
(propagated-inputs
(modify-inputs (package-propagated-inputs maven-settings)
(modify-inputs propagated-inputs
(replace "maven-pom" maven-3.8-pom)))))
(define-public maven-3.8-settings-builder
@@ -2510,7 +2510,7 @@ reporting or the build process.")))
(version (package-version maven-3.8-pom))
(source (package-source maven-3.8-pom))
(propagated-inputs
(modify-inputs (package-propagated-inputs maven-settings-builder)
(modify-inputs propagated-inputs
(replace "maven-builder-support" maven-3.8-builder-support)
(replace "maven-settings" maven-3.8-settings)
(replace "maven-pom" maven-3.8-pom)))))
@@ -2521,7 +2521,7 @@ reporting or the build process.")))
(version (package-version maven-3.8-pom))
(source (package-source maven-3.8-pom))
(propagated-inputs
(modify-inputs (package-propagated-inputs maven-model-builder)
(modify-inputs propagated-inputs
(replace "maven-artifact" maven-3.8-artifact)
(replace "maven-builder-support" maven-3.8-builder-support)
(replace "maven-model" maven-3.8-model)
@@ -2533,7 +2533,7 @@ reporting or the build process.")))
(version (package-version maven-3.8-pom))
(source (package-source maven-3.8-pom))
(propagated-inputs
(modify-inputs (package-propagated-inputs maven-repository-metadata)
(modify-inputs propagated-inputs
(replace "maven-pom" maven-3.8-pom)))))
(define-public maven-3.8-resolver-provider
@@ -2542,7 +2542,7 @@ reporting or the build process.")))
(version (package-version maven-3.8-pom))
(source (package-source maven-3.8-pom))
(propagated-inputs
(modify-inputs (package-propagated-inputs maven-resolver-provider)
(modify-inputs propagated-inputs
(replace "maven-model" maven-3.8-model)
(replace "maven-model-builder" maven-3.8-model-builder)
(replace "maven-builder-support" maven-3.8-builder-support)
@@ -2558,7 +2558,7 @@ reporting or the build process.")))
(version (package-version maven-3.8-pom))
(source (package-source maven-3.8-pom))
(propagated-inputs
(modify-inputs (package-propagated-inputs maven-plugin-api)
(modify-inputs propagated-inputs
(replace "maven-artifact" maven-3.8-artifact)
(replace "maven-model" maven-3.8-model)))))
@@ -2568,7 +2568,7 @@ reporting or the build process.")))
(version (package-version maven-3.8-pom))
(source (package-source maven-3.8-pom))
(propagated-inputs
(modify-inputs (package-propagated-inputs maven-core)
(modify-inputs propagated-inputs
(replace "maven-artifact" maven-3.8-artifact)
(replace "maven-resolver-provider" maven-3.8-resolver-provider)
(replace "maven-model" maven-3.8-model)
@@ -2774,7 +2774,7 @@ reporting or the build process.")))
(_ input)))
(package-propagated-inputs maven-model-builder)))
(native-inputs
(modify-inputs (package-native-inputs maven-plugin-api)
(modify-inputs native-inputs
(prepend java-plexus-container-default)))))
(define-public maven-3.0-repository-metadata
@@ -2974,7 +2974,7 @@ reporting or the build process.")))
(base32
"0qm8y85kip2hyhnhlkqgj0rhmf83z07s7l7gzsfl5dzl3kvp8nal"))))
(propagated-inputs
(modify-inputs (package-propagated-inputs maven-shared-utils)
(modify-inputs propagated-inputs
(prepend maven-3.0-core maven-components-parent-pom-21)))))
(define-public maven-shared-utils-3.1

6
gnu/packages/medical.scm
View File

@@ -390,9 +390,9 @@ Medicine} server instead of SQLite.")
"-e" "CREATE DATABASE orthanctest;")
(invoke "./UnitTests" socket username password
database)))))))))
(native-inputs (modify-inputs (package-native-inputs orthanc-mysql)
(native-inputs (modify-inputs native-inputs
(prepend mariadb))) ;for tests
(inputs (modify-inputs (package-inputs orthanc-mysql)
(inputs (modify-inputs inputs
(delete "mysql")
(prepend `(,mariadb "dev")
`(,mariadb "lib"))))
@@ -443,6 +443,6 @@ GUI application (@code{xmedcon}).")
(substitute-keyword-arguments arguments
((#:configure-flags flags #~'())
#~(append (list "--disable-glib" "--disable-gui") #$flags))))
(inputs (modify-inputs (package-inputs xmedcon)
(inputs (modify-inputs inputs
(delete "glib" "gtk+")))
(synopsis "Medical image conversion utility (variant with CLI only)")))

4
gnu/packages/messaging.scm
View File

@@ -692,7 +692,7 @@ identi.ca and status.net).")
(package/inherit bitlbee
(name "bitlbee-purple")
(synopsis "IRC to instant messaging gateway (using Pidgin's libpurple)")
(inputs (modify-inputs (package-inputs bitlbee)
(inputs (modify-inputs inputs
(prepend pidgin)))
(native-search-paths
(list (search-path-specification
@@ -2698,7 +2698,7 @@ validating international phone numbers.")
(base32
"1y4ivhy3kwgggrr3g521zaf97334aan0yqpzzryss80k326q5rhf"))))
(inputs
(modify-inputs (package-inputs libphonenumber)
(modify-inputs inputs
(delete "abseil-cpp" "icedtea")))))
(define-public chatty

2
gnu/packages/monitoring.scm
View File

@@ -666,7 +666,7 @@ solution (client-side agent)")
(assoc-ref %build-inputs "zlib")))
(delete "--enable-agent" #$flags)))))
(inputs
(modify-inputs (package-inputs zabbix-agentd)
(modify-inputs inputs
(prepend curl
libevent
net-snmp

10
gnu/packages/mpi.scm
View File

@@ -179,13 +179,13 @@ bind processes, and much more.")
;; XXX: Remove after updating package from 2.13.0.
(patches (search-patches "hwloc-add-with-opencl.patch"))))
(native-inputs (modify-inputs (package-native-inputs hwloc-1)
(native-inputs (modify-inputs native-inputs
(append autoconf)
(append automake)
(append libtool)
(append opencl-headers)
(append bash))) ;for completion tests
(inputs (modify-inputs (package-inputs hwloc-1)
(inputs (modify-inputs inputs
(append level-zero)
;; XXX: rocm-smi requires libdrm/drm.h but doesn't propagate a
;; package providing these. For now, libdrm is used to provide
@@ -404,7 +404,7 @@ software vendors, application developers and computer science researchers.")
(sha256
(base32 "02yqfwv2fn9n0glprkk7dzrkrcnpfwfz5874ydx88w0iadi2gdyz"))))
(inputs (modify-inputs (package-inputs openmpi)
(inputs (modify-inputs inputs
;; As of Open MPI 5.0.X, PMIx is used to communicate
;; with SLURM, so SLURM'S PMI is no longer needed.
(delete "slurm")
@@ -412,7 +412,7 @@ software vendors, application developers and computer science researchers.")
(replace "libfabric" libfabric)
(append openpmix) ;for PMI support (launching via "srun")
(append prrte))) ;for PMI support (launching via "srun")
(native-inputs (modify-inputs (package-native-inputs openmpi)
(native-inputs (modify-inputs native-inputs
(append python)))
(outputs '("out" "debug"))
@@ -741,7 +741,7 @@ modular framework for other derived implementations.")
(define-public mpich-ofi
(package/inherit mpich
(name "mpich-ofi")
(inputs (modify-inputs (package-inputs mpich)
(inputs (modify-inputs inputs
(delete ucx)
(append libfabric)
(append rdma-core)

2
gnu/packages/ocaml.scm
View File

@@ -5144,7 +5144,7 @@ writing to these structures, and they are accessed via the Bigarray module.")
;; TODO doesn't find test deps for some reason?
;; I have no clue why.
#:tests? #f))
(propagated-inputs (modify-inputs (package-propagated-inputs ocaml-cstruct)
(propagated-inputs (modify-inputs propagated-inputs
(append ocaml-cstruct ocaml-ppxlib ocaml-sexplib)))
(native-inputs (modify-inputs (package-propagated-inputs ocaml-cstruct)
(append ocaml-cstruct-sexp ocaml-findlib

4
gnu/packages/openstack.scm
View File

@@ -100,7 +100,7 @@ formatters, and other extensions.")
(native-inputs
(list python-setuptools python-wheel))
(propagated-inputs
(modify-inputs (package-propagated-inputs python-cliff)
(modify-inputs propagated-inputs
(replace "python-stevedore" python-stevedore-bootstrap))))))
(define-public python-debtcollector
@@ -746,7 +746,7 @@ handlers and support for context specific logging (like resource id’s etc).")
#~(modify-phases #$phases
(delete 'sanity-check)))))
(propagated-inputs
(modify-inputs (package-propagated-inputs python-oslo-log)
(modify-inputs propagated-inputs
(delete "python-oslo-config"))))))
(define-public python-oslo-serialization

10
gnu/packages/package-management.scm
View File

@@ -589,10 +589,10 @@ the Nix package manager.")
;; Use a minimum set of dependencies.
(native-inputs
(modify-inputs (package-native-inputs guix)
(modify-inputs native-inputs
(delete "po4a" "graphviz" "font-ghostscript" "help2man")))
(inputs
(modify-inputs (package-inputs guix)
(modify-inputs inputs
(delete (basename (bootstrap-guile-url-path (%current-system)))
(basename (bootstrap-guile-url-path "i686-linux"))
"util-linux")
@@ -633,10 +633,10 @@ the Nix package manager.")
(inherit guix)
(name "guix-minimal")
(native-inputs
(modify-inputs (package-native-inputs guix)
(modify-inputs native-inputs
(delete "guile-ssh")))
(propagated-inputs
(modify-inputs (package-propagated-inputs guix)
(modify-inputs propagated-inputs
(delete "guile-ssh"))))))
(define-public (guix-for-channels channels)
@@ -1921,7 +1921,7 @@ resolution compared to the classic solver.")
;; directory, which would cause non-reproducible builds.
(setenv "CONDA_PKGS_DIRS" "/tmp/conda-pkgs")))))))
(propagated-inputs
(modify-inputs (package-propagated-inputs conda-bootstrap)
(modify-inputs propagated-inputs
(prepend python-conda-libmamba-solver)))))
(define-public conan

4
gnu/packages/parallel.scm
View File

@@ -344,7 +344,7 @@ minimal slurm package BASE-SLURM."
#$flags))))
;; FIXME: More optional inputs could be added.
(inputs
(modify-inputs (package-inputs base-slurm)
(modify-inputs inputs
;; Add dependencies required by the slurm REST API.
(prepend dbus freeipmi http-parser
libjwt librdkafka libyaml (list mariadb "dev"))))))
@@ -371,7 +371,7 @@ minimal slurm package BASE-SLURM."
(sha256
(base32
"130pjygqk794dchknjqdsinciv2b7c7r5agqsgca7m804xp09wnl"))))
(inputs (modify-inputs (package-inputs slurm-minimal)
(inputs (modify-inputs inputs
(replace "openpmix" openpmix))))) ;use version 6.0.0
(define-public slurm-25.05 (make-slurm slurm-minimal-25.05))

2
gnu/packages/password-utils.scm
View File

@@ -1307,7 +1307,7 @@ using password-store through rofi interface:
'("pass" "pwgen" "rofi" "wl-copy" "wtype")))))
(list "addpass" "rofi-pass")))))))))
(inputs
(modify-inputs (package-inputs rofi-pass)
(modify-inputs inputs
(replace "xclip" wl-clipboard)
(replace "xdotool" wtype)
(delete "xset")))

2
gnu/packages/pdf.scm
View File

@@ -511,7 +511,7 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.")
(define-public poppler-qt6
(package/inherit poppler
(name "poppler-qt6")
(inputs (modify-inputs (package-inputs poppler)
(inputs (modify-inputs inputs
(append qtbase)))
(synopsis "Qt6 frontend for the Poppler PDF rendering library")))

2
gnu/packages/polkit.scm
View File

@@ -231,7 +231,7 @@ easily with PolicyKit.")
(package
(inherit polkit-qt)
(name "polkit-qt6")
(inputs (modify-inputs (package-inputs polkit-qt)
(inputs (modify-inputs inputs
(replace "qtbase" qtbase)))))
(define-public polkit-gnome

10
gnu/packages/potassco.scm
View File

@@ -462,7 +462,7 @@ Lua code.")))
(format port "Version: ~a~%" #$version)))))))))))
(inputs (list clingo python-wrapper))
(propagated-inputs (list python-cffi))
(native-inputs (modify-inputs (package-native-inputs clingo)
(native-inputs (modify-inputs native-inputs
(prepend python-scikit-build)))
(synopsis "Python bindings for clingo")
(description "This package provides Python bindings to the clingo package,
@@ -499,10 +499,10 @@ Python code.")))
(format port "Metadata-Version: 1.1~%")
(format port "Name: clingodl~%")
(format port "Version: ~a~%" #$version))))))))))
(inputs (modify-inputs (package-inputs clingo-dl)
(inputs (modify-inputs inputs
(prepend python-wrapper)))
(propagated-inputs (list python-clingo python-cffi))
(native-inputs (modify-inputs (package-native-inputs clingo-dl)
(native-inputs (modify-inputs native-inputs
(prepend python-scikit-build)))
(synopsis "Python bindings for clingo-dl")
(description "This package allows users to add the clingo-dl propagator
@@ -539,10 +539,10 @@ directly from the python command line.")))
(format port "Metadata-Version: 1.1~%")
(format port "Name: clingcon~%")
(format port "Version: ~a~%" #$version))))))))))))
(inputs (modify-inputs (package-inputs clingcon)
(inputs (modify-inputs inputs
(prepend python-wrapper)))
(propagated-inputs (list python-clingo python-cffi))
(native-inputs (modify-inputs (package-native-inputs clingcon)
(native-inputs (modify-inputs native-inputs
(prepend python-scikit-build)))
(synopsis "Python bindings for clingcon")
(description "This package allows users to add the clingcon propagator

2
gnu/packages/power.scm
View File

@@ -273,5 +273,5 @@ or higher power saving modes to adapt to the current usage.")
(inherit tuned-minimal)
(name "tuned")
(inputs
(modify-inputs (package-inputs tuned-minimal)
(modify-inputs inputs
(prepend dmidecode perf wireless-tools)))))

2
gnu/packages/profiling.scm
View File

@@ -428,7 +428,7 @@ sampling profiler for games and other applications.")
#~(append #$flags
;; The LEGACY flag indicate we want to build tracy with glfw.
(list "LEGACY=1")))))
(inputs (modify-inputs (package-inputs tracy-wayland)
(inputs (modify-inputs inputs
(delete "libxkbcommon" "wayland")
(prepend glfw)))
(synopsis "Frame profiler (X11 version)")))

4
gnu/packages/pypy.scm
View File

@@ -402,10 +402,10 @@ Python code natively, including C extensions.")
((shebang-match-python) shebang-pypy3))))
(copy-recursively dist-dir #$output))))))))
(native-inputs
(modify-inputs (package-native-inputs pypy2)
(modify-inputs native-inputs
(replace "python2" pypy2)))
(inputs
(modify-inputs (package-inputs pypy2)
(modify-inputs inputs
(append xz)))))
(define-deprecated-package pypy3

4
gnu/packages/python-build.scm
View File

@@ -1187,7 +1187,7 @@ specified by PEP 517, @code{flit_core.buildapi}.")
(package/inherit python-flit-core-bootstrap
(name "python-flit-core")
(propagated-inputs
(modify-inputs (package-propagated-inputs python-flit-core-bootstrap)
(modify-inputs propagated-inputs
(delete "python-toml")
(prepend python-tomli)))))
@@ -1402,7 +1402,7 @@ has features such as:
(package/inherit python-hatchling
(name "python-hatchling-bootstrap")
(propagated-inputs
(modify-inputs (package-propagated-inputs python-hatchling)
(modify-inputs propagated-inputs
(replace "python-packaging" python-packaging-bootstrap)))))
(define-public python-hatchling-for-hatch

6
gnu/packages/python-web.scm
View File

@@ -6644,7 +6644,7 @@ WebSocket usage in Python programs.")
(sha256
(base32 "0p0cz2mdissq7iw1n7jrmsfir0jfmgs1dvnpnrx477ffx9hbsxnk"))))
(native-inputs
(modify-inputs (package-native-inputs python-websocket-client)
(modify-inputs native-inputs
(append python-six)))))
(define-public python-purl
@@ -10145,7 +10145,7 @@ Plus all the standard features of requests:
(list python-hatchling
python-hatch-fancy-pypi-readme))
(propagated-inputs
(modify-inputs (package-propagated-inputs python-httpx)
(modify-inputs propagated-inputs
(replace "python-httpcore" python-httpcore-bootstrap))))))
(define-public python-httpx-sse
@@ -13573,7 +13573,7 @@ return paginated responses to your clients.")
`(modify-phases ,phases
(delete 'sanity-check)))))
(propagated-inputs
(modify-inputs (package-propagated-inputs python-tortoise-orm)
(modify-inputs propagated-inputs
(replace "python-aiosqlite" python-aiosqlite)))))))
(native-inputs
(list python-aiosqlite

10
gnu/packages/python-xyz.scm
View File

@@ -14531,14 +14531,14 @@ following CLI scripts:
(arguments
(list #:test-flags #~(list "--pyargs" "ipyparallel")))
(native-inputs
(modify-inputs (package-native-inputs python-ipyparallel-bootstrap)
(modify-inputs native-inputs
(append python-ipython
python-pytest
python-pytest-asyncio
python-pytest-tornado
python-testpath)))
(propagated-inputs
(modify-inputs (package-propagated-inputs python-ipyparallel-bootstrap)
(modify-inputs propagated-inputs
(replace "python-jupyter-client-bootstrap" python-jupyter-client)
(append python-ipykernel)))
(properties (alist-delete 'hidden? (package-properties
@@ -16787,7 +16787,7 @@ from an XML-based format.")
"MtiTest")
" and not "))))))))))
(native-inputs
(modify-inputs (package-native-inputs base)
(modify-inputs native-inputs
(append python-pytest)))
(propagated-inputs
(list python-brotli
@@ -23681,7 +23681,7 @@ protocols written in pure Python.")
(base32 "0n3p8jyxl4zwc63la10v8llc58fc5pcnfqdq9f1vn0hgy5jdi7z1"))))
(build-system pyproject-build-system)
(native-inputs
(modify-inputs (package-native-inputs python-dulwich)
(modify-inputs native-inputs
(prepend python-setuptools-rust)))
(arguments
(list
@@ -33080,7 +33080,7 @@ key-value pairs from a @code{.env} file and set them as environment variables.")
(delete-file "tests/test_ipython.py")
(invoke "python" "-m" "pytest")))))))
(native-inputs
(modify-inputs (package-native-inputs python-dotenv)
(modify-inputs native-inputs
(append python-mock)
(replace "python-sh" python-sh-1)))))

2
gnu/packages/python.scm
View File

@@ -661,7 +661,7 @@ def contents() -> str:
(modify-inputs (package-inputs python-2.7)
(replace "openssl" openssl)))
(native-inputs
(let ((inputs (modify-inputs (package-native-inputs python-2)
(let ((inputs (modify-inputs native-inputs
(prepend tzdata-for-tests
unzip
(@ (gnu packages compression) zip)))))

20
gnu/packages/qt.scm
View File

@@ -214,7 +214,7 @@ of C++20 coroutines in connection with certain asynchronous Qt actions.")
(inherit qcoro-qt5)
(name "qcoro-qt6")
(synopsis "C++ Coroutine Library for Qt6")
(inputs (modify-inputs (package-inputs qcoro-qt5)
(inputs (modify-inputs inputs
(replace "qtbase" qtbase)
(replace "qtdeclarative" qtdeclarative)
(replace "qtwebsockets" qtwebsockets)
@@ -1279,17 +1279,17 @@ tst_qt_cmake_create.cpp"
(substitute* "cmake_install.cmake"
(("include.*tests/cmake_install") "#"))))))))
(native-inputs
(modify-inputs (package-native-inputs qtbase-5)
(modify-inputs native-inputs
(prepend ninja ;CMake Generator, also used for tests
tzdata-for-tests
wayland-protocols
xvfb-run-for-tests)))
(propagated-inputs
(modify-inputs (package-propagated-inputs qtbase-5)
(modify-inputs propagated-inputs
;; Required by Qt6GuiDependencies.cmake.
(prepend libxkbcommon vulkan-headers)))
(inputs
(modify-inputs (package-inputs qtbase-5)
(modify-inputs inputs
(delete "libxkbcommon")
(prepend at-spi2-core
bash-minimal
@@ -4617,7 +4617,7 @@ Python.")
(string-append #$output "/lib/qt"
#$(version-major (package-version qtbase-5))
"/qml")))))))))
(inputs (modify-inputs (package-inputs pyotherside)
(inputs (modify-inputs inputs
(replace "qtdeclarative" qtdeclarative-5)
(replace "qtquickcontrols2" qtquickcontrols-5)
(replace "qtsvg" qtsvg-5)))))
@@ -5314,10 +5314,10 @@ securely. It will not store any data unencrypted unless explicitly requested.")
(inherit qtkeychain)
(name "qtkeychain-qt6")
(native-inputs
(modify-inputs (package-native-inputs qtkeychain)
(modify-inputs native-inputs
(replace "qttools" qttools)))
(inputs
(modify-inputs (package-inputs qtkeychain)
(modify-inputs inputs
(replace "qtbase" qtbase)))
(arguments
(substitute-keyword-arguments arguments
@@ -5864,7 +5864,7 @@ color-related widgets.")
(package/inherit qcustomplot
(name "qcustomplot-qt5")
(inputs
(modify-inputs (package-inputs qcustomplot)
(modify-inputs inputs
(replace "qtbase" qtbase-5)))))
;; TODO: Split shiboken2 binding generator into a dedicated output.
@@ -5956,7 +5956,7 @@ color-related widgets.")
"0b92b4zi5rqg5acgbb6yan349idvzmc0x8wjwkdwkga2ad38gh4y"))))
(build-system cmake-build-system)
(inputs
(modify-inputs (package-inputs python-shiboken-2)
(modify-inputs inputs
(replace "qtbase" qtbase)
(delete "qtxmlpatterns")))
(arguments
@@ -6574,7 +6574,7 @@ a secure way.")
(arguments (substitute-keyword-arguments arguments
((#:configure-flags flags #~'())
#~(cons "-DBUILD_WITH_QT6=ON" #$flags))))
(inputs (modify-inputs (package-inputs packagekit-qt5)
(inputs (modify-inputs inputs
(replace "qtbase" qtbase)))
(synopsis "Qt6 bindings for PackageKit")
(description "Provides Qt6 bindings to PackageKit which is a DBUS

4
gnu/packages/racket.scm
View File

@@ -403,7 +403,7 @@ code to use the 3M garbage collector.")
(native-inputs
(if (%current-target-system)
(package-native-inputs racket-vm-cgc)
(modify-inputs (package-native-inputs racket-vm-cgc)
(modify-inputs native-inputs
(prepend racket-vm-cgc))))
(arguments
(substitute-keyword-arguments arguments
@@ -441,7 +441,7 @@ collector, 3M (``Moving Memory Manager'').")
(inherit racket-vm-bc)
(name "racket-vm-cs")
(inputs
(let ((inputs (modify-inputs (package-inputs racket-vm-cgc)
(let ((inputs (modify-inputs inputs
(prepend zlib lz4))))
(if (nix-system->native-chez-machine-type)
(modify-inputs inputs

2
gnu/packages/radio.scm
View File

@@ -1762,7 +1762,7 @@ users.")
(sha256
(base32 "0m9i5k1n6j0nvmsqcy12x2ngqzjvxxlc3jg29igh93hb7lprlkjv"))))
(native-inputs
(modify-inputs (package-native-inputs hamlib)
(modify-inputs native-inputs
(prepend autoconf automake libtool texinfo)))
(arguments
`(#:configure-flags '("--disable-shared"

Some files were not shown because too many files have changed in this diff Show More