diff options
151 files changed, 580 insertions, 579 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 4f68bd47424..79576270d6d 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2718,7 +2718,7 @@ command.") (patches (search-patches "wpa-supplicant-dbus-group-policy.patch")))) (arguments - (substitute-keyword-arguments (package-arguments wpa-supplicant-minimal) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (add-after 'configure 'set-config-options @@ -4746,7 +4746,7 @@ system distribution, akin to many similar tools.") (inherit fastfetch-minimal) (name "fastfetch") (arguments - (substitute-keyword-arguments (package-arguments fastfetch-minimal) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(append #$flags (list "-DBINARY_LINK_TYPE=dynamic" @@ -6166,7 +6166,7 @@ then it can be a greeter.") (inherit pam-mount) (name "greetd-pam-mount") (arguments - (substitute-keyword-arguments (package-arguments pam-mount) + (substitute-keyword-arguments arguments ((#:configure-flags flags ''()) #~(cons* "--with-rundir=/run/greetd" #$flags)) ((#:phases phases) diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index bff153cf974..46f6a24f008 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -169,7 +169,7 @@ integration of this capability into your own programs.") (package/inherit zint (name "zint-with-qt") (build-system qt-build-system) - (arguments (substitute-keyword-arguments (package-arguments zint) + (arguments (substitute-keyword-arguments arguments ((#:disallowed-references references) (delete qtbase references)) ((#:qtbase _ #f) @@ -391,7 +391,7 @@ Python as well as GUI widgets for GTK and Qt.") (name "zbar-minimal") (build-system gnu-build-system) (arguments - (substitute-keyword-arguments (package-arguments zbar) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons* "--with-gtk=no" (delete "--with-gtk=auto" #$flags))) ((#:disallowed-references _ '()) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index e9911d65619..17c9898fd36 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -954,7 +954,7 @@ gnu build version.")))) (package/inherit fftw (name "fftwf") (arguments - (substitute-keyword-arguments (package-arguments fftw) + (substitute-keyword-arguments arguments ((#:configure-flags fftw-configure-flags) `(cons* "--enable-single" ,@(if (string-prefix? "arm" (or (%current-target-system) @@ -975,7 +975,7 @@ gnu build version.")))) `(("openmpi" ,openmpi) ,@(package-inputs fftw))) (arguments - (substitute-keyword-arguments (package-arguments fftw) + (substitute-keyword-arguments arguments ((#:configure-flags cf) `(cons "--enable-mpi" ,cf)) ((#:phases phases '%standard-phases) @@ -1434,7 +1434,7 @@ features, and more.") ;; XXX: Some tests fail, but onnxruntime will move on to the next ;; release soon enough. (arguments - (substitute-keyword-arguments (package-arguments eigen) + (substitute-keyword-arguments arguments ((#:tests? tests? #t) #f))))))) @@ -1462,7 +1462,7 @@ features, and more.") ;; XXX: Tests stable_norm_5 and stable_norm_6 are failing due to ;; EIGEN_STATIC_ASSERT_VECTOR_SPECIFIC_SIZE. (arguments - (substitute-keyword-arguments (package-arguments eigen) + (substitute-keyword-arguments arguments ((#:tests? flag #f) #false))))))) (define-public xtensor @@ -2192,7 +2192,7 @@ and not by the available RAM.") (inherit form) (name "parform") (arguments - (substitute-keyword-arguments (package-arguments form) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons* "--enable-parform=yes" #$flags)) ((#:phases phases) diff --git a/gnu/packages/apparmor.scm b/gnu/packages/apparmor.scm index 9840da72fac..082bbea28b0 100644 --- a/gnu/packages/apparmor.scm +++ b/gnu/packages/apparmor.scm @@ -128,7 +128,7 @@ supported by Canonical since 2009.") "USE_SYSTEM=1" ;; No need to run the linter "PYFLAKES=true")) - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (delete 'configure) @@ -189,7 +189,7 @@ supported by Canonical since 2009.") (arguments (append (list #:tests? #f) ;no tests - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (delete 'chdir-parser) diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index 3a8048e867f..d08343aa235 100644 --- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -464,7 +464,7 @@ European languages.") (patches (search-patches "ispell-for-linphone-cmake.patch")))) (build-system cmake-build-system) (arguments - (substitute-keyword-arguments (package-arguments ispell) + (substitute-keyword-arguments arguments ((#:modules _ ''()) '((guix build cmake-build-system) (guix build utils) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 70676e527fb..cb7dea8711c 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -3228,7 +3228,7 @@ celestial-to-terrestrial coordinate transformations.") (package/inherit python-astropy (name "python-astropy-minimal") (arguments - (substitute-keyword-arguments (package-arguments python-astropy) + (substitute-keyword-arguments arguments ((#:tests? _ #t) #f))) (native-inputs (list nss-certs-for-test @@ -10446,7 +10446,7 @@ functionality needed for solar data analysis.") (package/inherit python-sunpy (name "python-sunpy-minimal") (arguments - (substitute-keyword-arguments (package-arguments python-sunpy) + (substitute-keyword-arguments arguments ((#:tests? _ #t) #f))) (native-inputs (list python-setuptools diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index a23301c2ac8..67efdedee14 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3083,7 +3083,7 @@ auto-wah.") (package (inherit guitarix) (name "guitarix-lv2") (arguments - (substitute-keyword-arguments (package-arguments guitarix) + (substitute-keyword-arguments arguments ((#:configure-flags flags) `(cons "--no-standalone" ,flags)))))) @@ -5257,7 +5257,7 @@ stretching and pitch scaling of audio. This package contains the library.") (base32 "11srnzgpavcj6n70zjdm7488jzrprk71mg9dgr1sa6vwp575hf2m")))) (arguments - (substitute-keyword-arguments (package-arguments libsbsms) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (delete 'fix-ar-lib-path) diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm index 6a69e549d0d..c445f3a83af 100644 --- a/gnu/packages/avr.scm +++ b/gnu/packages/avr.scm @@ -60,7 +60,7 @@ (inherit xgcc) (name "avr-gcc") (arguments - (substitute-keyword-arguments (package-arguments xgcc) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'set-paths 'augment-CPLUS_INCLUDE_PATH diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 25e3b1c6114..11dbb8382e1 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -375,7 +375,7 @@ random access nor for in-place modification. This package provides the (base32 "0wxdr7qws1z1b1gp5jsm7n2ccnjlmrnds52d5wc5xkzagyslgf67")))) (arguments - (substitute-keyword-arguments (package-arguments libarchive) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (delete 'patch-pwd) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 363453b8a9a..8337f602772 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -602,7 +602,7 @@ standard.") (base32 "0mxhw43d4wpqmvg0l4znk1vm10fy92biyh90lzdnqjcic2lb6cg8")))) (arguments - (substitute-keyword-arguments (package-arguments coreutils-minimal) + (substitute-keyword-arguments arguments ((#:phases phases '%standard-phases) `(modify-phases ,phases (add-before 'check 'disable-broken-test @@ -756,7 +756,7 @@ included.") "1cmd0riv37bqy9mwbg6n3523qgr8b3bbm5kwj19sjrasl4yq9d0c")) (patches '()))) (arguments - (substitute-keyword-arguments (package-arguments binutils) + (substitute-keyword-arguments arguments ((#:make-flags _ #~'()) #~'()))) (native-inputs '()) (properties '()))) @@ -774,7 +774,7 @@ included.") (sha256 (base32 "1j64m2czn9ygd5g1cjjcw7q43b18xh6qkrdl1pkm03ncjnj3wwrl")))) (arguments - (substitute-keyword-arguments (package-arguments binutils) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons* "--enable-gold=default" (delete "LDFLAGS=-static-libgcc" #$flags))) @@ -802,7 +802,7 @@ included.") (modify-inputs (package-native-inputs binutils) (append texinfo))) ; because makeinfo is needed when building bfd alone (arguments - (substitute-keyword-arguments (package-arguments binutils) + (substitute-keyword-arguments arguments ;; Only build as a shared library ((#:configure-flags flags) #~(append #$flags '("--enable-shared" "--disable-static"))) @@ -1295,7 +1295,7 @@ with the Linux kernel.") "glibc-hurd-mach-print.patch" "glibc-hurd-gettyent.patch")))) (arguments - (substitute-keyword-arguments (package-arguments glibc) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(cons* "CFLAGS=-g -O2 -Wno-error=builtin-declaration-mismatch" "--enable-crypt" @@ -1335,7 +1335,7 @@ with the Linux kernel.") "glibc-hurd-clock_gettime_monotonic.patch"))) (origin-patches (package-source glibc-2.35))))))) (arguments - (substitute-keyword-arguments (package-arguments glibc) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(cons* #$(string-append "CFLAGS=-g -O2" @@ -1747,7 +1747,7 @@ and daylight-saving rules.") (hidden-package (package/inherit tzdata (arguments - (substitute-keyword-arguments (package-arguments tzdata) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'post-install 'install-leap-seconds diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 9735cb72f04..069b21f6a9e 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -287,7 +287,7 @@ without modification.") (outputs (delete "include" (package-outputs bash))) (arguments - (substitute-keyword-arguments (package-arguments bash) + (substitute-keyword-arguments arguments ((#:modules _ '()) '((guix build gnu-build-system) (guix build utils) @@ -351,7 +351,7 @@ without modification.") (package/inherit bash (name "bash-with-syslog") (arguments - (substitute-keyword-arguments (package-arguments bash) + (substitute-keyword-arguments arguments ((#:phases phases '%standard-phases) `(modify-phases ,phases (add-after 'unpack 'enable-syslogging diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index f7c37681450..4f0845f300d 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -117,7 +117,7 @@ C or C++ programs, though that is not its primary goal.") (package/inherit libgc (arguments - (substitute-keyword-arguments (package-arguments libgc) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(cons "--enable-static" #$flags)))) @@ -141,7 +141,7 @@ C or C++ programs, though that is not its primary goal.") libgc (name "libgc-back-pointers") (arguments - (substitute-keyword-arguments (package-arguments libgc) + (substitute-keyword-arguments arguments ((#:make-flags _ #~'()) #~(list "CPPFLAGS=-DKEEP_BACK_PTRS=1")))) (synopsis "The BDW garbage collector, with back-pointer tracking"))) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ce6be1e4d88..a0b2f6db624 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -5793,7 +5793,7 @@ and more accurate. BWA-MEM also has better performance than BWA-backtrack for "076c4q0cdqz8jgylb067y9zmvxglppnzi3qiscn0xiypgc6lgb5r")))) (build-system gnu-build-system) (arguments - (substitute-keyword-arguments (package-arguments bwa) + (substitute-keyword-arguments arguments ((#:phases phases #~%standard-phases) #~(modify-phases #$phases (add-after 'unpack 'patch-C-error @@ -6674,7 +6674,7 @@ meso, or continuum scale.") (inherit lammps) (name "lammps-serial") (arguments - (substitute-keyword-arguments (package-arguments lammps) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(list ;; activate all possible lammps packages. @@ -11050,7 +11050,7 @@ viewer.") `(#:tests? #f ;no "check" target #:make-flags (list "LIBCURSES=-lncurses") - ,@(substitute-keyword-arguments (package-arguments samtools) + ,@(substitute-keyword-arguments arguments ((#:modules _ #f) '((ice-9 ftw) (ice-9 regex) @@ -12336,7 +12336,7 @@ sequences.") (package (inherit star) (name "starlong") (arguments - (substitute-keyword-arguments (package-arguments star) + (substitute-keyword-arguments arguments ((#:make-flags flags) `(list "STARlong")) ((#:phases phases) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index ef21fb28246..83f29b0bb58 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -593,7 +593,7 @@ features.") (inherit base) (name "qbittorrent-no-x") (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:configure-flags configure-flags) #~(cons "-DGUI=OFF" #$configure-flags)))) (inputs diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index c8fcec1b211..b98b72a23b1 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -272,7 +272,7 @@ across a broad spectrum of applications.") (base32 "13iviiwk1srpw9dmiwabkxv56v0pl0zggjp8zxy1419k5zzfsy34")))) (arguments - (substitute-keyword-arguments (package-arguments boost) + (substitute-keyword-arguments arguments ((#:make-flags _ #f) #~(list "threading=multi" "link=shared" ;; Set the RUNPATH to $libdir so that the libs find each other. @@ -306,7 +306,7 @@ across a broad spectrum of applications.") (inherit boost) (name "boost-static") (arguments - (substitute-keyword-arguments (package-arguments boost) + (substitute-keyword-arguments arguments ((#:make-flags flags) #~(cons "link=static" (delete "link=shared" #$flags))))))) @@ -324,7 +324,7 @@ across a broad spectrum of applications.") (base32 "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj")))) (arguments - (substitute-keyword-arguments (package-arguments boost) + (substitute-keyword-arguments arguments ((#:configure-flags _ #~'()) #~(let ((icu (dirname (dirname (search-input-file %build-inputs "bin/uconv"))))) @@ -452,7 +452,7 @@ signals and slots system.") (modify-inputs (package-inputs boost) (append openmpi))) (arguments - (substitute-keyword-arguments (package-arguments boost) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'configure 'update-jam diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 2560e8c2492..ff50626548f 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -318,7 +318,7 @@ menu to select one of the installed operating systems.") (modify-inputs (package-native-inputs grub) (delete "help2man" "texinfo" "parted" "qemu" "qemu-minimal" "xorriso"))) (arguments - (substitute-keyword-arguments (package-arguments grub-pc) + (substitute-keyword-arguments arguments ((#:tests? _ #t) #f) ((#:phases phases #~%standard-phases) #~(modify-phases #$phases @@ -338,7 +338,7 @@ menu to select one of the installed operating systems.") (inherit base) (synopsis "GRand Unified Boot loader (Coreboot payload version)") (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases #~%standard-phases) #~(modify-phases #$phases (add-before 'check 'disable-broken-tests @@ -422,7 +422,7 @@ menu to select one of the installed operating systems.") (modify-inputs (package-native-inputs base) (delete "parted" "qemu-minimal" "xorriso"))))) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:tests? _ #f) (and (not (%current-target-system)) (this-package-native-input "qemu-minimal"))) ((#:configure-flags flags #~'()) @@ -497,7 +497,7 @@ menu to select one of the installed operating systems.") (name "grub-efi32") (synopsis "GRand Unified Boot loader (UEFI 32bit version)") (arguments - (substitute-keyword-arguments (package-arguments grub-efi) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(cons* #$@(cond ((target-x86?) #~("--target=i386")) @@ -587,7 +587,7 @@ menu to select one of the installed operating systems.") (package (inherit base) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ;; Running the tests isn't supported for this grub platform. ((#:tests? _ #t) #f))) (synopsis "GRand Unified Boot loader (u-boot version)") @@ -607,7 +607,7 @@ menu to select one of the installed operating systems.") (modify-inputs (package-inputs grub-efi) (prepend grub))) (arguments - (substitute-keyword-arguments (package-arguments grub-efi) + (substitute-keyword-arguments arguments ((#:modules modules `((guix build utils) (guix build gnu-build-system))) `((ice-9 ftw) ,@modules)) @@ -1176,7 +1176,7 @@ U-Boot must be used." (package-description u-boot))) (build-system gnu-build-system) (arguments - (substitute-keyword-arguments (package-arguments u-boot) + (substitute-keyword-arguments arguments ((#:target _ #f) (and (not (native-build?)) triplet)) ((#:modules modules '()) @@ -1277,7 +1277,7 @@ CONFIG_TOOLS_KWBIMAGE=n")))) (package (inherit base) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'set-environment @@ -1317,7 +1317,7 @@ removed so that it fits within common partitioning schemes."))) (package (inherit base) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'set-environment @@ -1338,7 +1338,7 @@ removed so that it fits within common partitioning schemes."))) (package (inherit base) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'set-environment @@ -1445,7 +1445,7 @@ Documentation} for more information (for example by running @samp{info (package (inherit base) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases '%standard-phases) #~(modify-phases #$phases (add-after 'install 'symlink-u-boot-command @@ -1463,7 +1463,7 @@ Documentation} for more information (for example by running @samp{info (package (inherit base) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'set-environment @@ -1479,7 +1479,7 @@ Documentation} for more information (for example by running @samp{info (package (inherit base) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'set-environment @@ -1498,7 +1498,7 @@ Documentation} for more information (for example by running @samp{info (package (inherit base) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'set-environment @@ -1676,7 +1676,7 @@ grub-efi-netboot-removable-bootloader.") (base32 "01mja33351hkcs59rmfvppqlxqw4rh9gng7a7hx2cfspqwh2y6kr")))) (arguments - (substitute-keyword-arguments (package-arguments u-boot) + (substitute-keyword-arguments arguments ((#:phases phases '%standard-phases) #~(modify-phases #$phases (add-after 'unpack 'patch-u-boot @@ -1803,7 +1803,7 @@ For more information, refer to (package (inherit base) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases '%standard-phases) #~(modify-phases #$phases (add-after 'patch-u-boot 'set-default-fdt-file @@ -2044,7 +2044,7 @@ the features of iPXE without the hassle of reflashing.") binutils (name "binutils-64-bit-bfd") (arguments - (substitute-keyword-arguments (package-arguments binutils) + (substitute-keyword-arguments arguments ((#:configure-flags flags ''()) #~(cons* "--enable-64-bit-bfd" #$flags))))))) (modify-inputs (package-native-inputs ipxe) @@ -2066,7 +2066,7 @@ the features of iPXE without the hassle of reflashing.") ("rtl8139" . ("10ec" . "8139")) ("virtio" . ("1af4" . "1000")) ("vmxnet3" . ("15ad" . "07b0"))))) - (substitute-keyword-arguments (package-arguments ipxe) + (substitute-keyword-arguments arguments ((#:modules modules) `((ice-9 match) ,@modules)) ((#:make-flags flags) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 07217ea12d5..b27d52a2b96 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -537,7 +537,7 @@ other lower-level build files.") (base32 "0q287af75d6w3c7dbfq7rmbh9isqzs9v30fjpm37lcafs2p7966k")))) (arguments - (substitute-keyword-arguments (package-arguments premake4) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (replace 'enter-source diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index e9e6a97f9ad..023a1124195 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -1005,7 +1005,7 @@ electromagnetic properties for molecules and crystals.") ;; Autogenerated code (delete-file-recursively "src/autocode"))))) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:configure-flags flags '()) #~(cons "-DBUILD_MARCH_NATIVE=OFF" #$flags)) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 5d1b9efaf66..67fc681fc06 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -502,7 +502,7 @@ (package/inherit opus (name "opus+custom") (arguments - (substitute-keyword-arguments (package-arguments opus) + (substitute-keyword-arguments arguments ((#:configure-flags flags ''()) ;; Opus Custom is an optional extension of the Opus ;; specification that allows for unsupported frame diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 59f71dff453..c4f7c1b79cc 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -386,7 +386,7 @@ and workspaces that can be used in the compiler environment of your choice.") "125yhgkmh5ap14w9yyh442manbb7k96dws4pa3hz32qp7njpjn3n")))) (outputs '("out" "doc")) (arguments - (substitute-keyword-arguments (package-arguments cmake-minimal) + (substitute-keyword-arguments arguments ;; Use cmake-minimal this time. ((#:cmake _ #f) (if (%current-target-system) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 3c02b8f74f8..3b9e9d4ea20 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012-2025 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012-2026 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org> @@ -1185,7 +1185,7 @@ ac_cv_c_float_format='IEEE (little-endian)' ("kernel-headers" ,%bootstrap-linux-libre-headers) ,@(%boot-mesboot-core-inputs))) (arguments - (substitute-keyword-arguments (package-arguments gcc-core-mesboot0) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (replace 'setenv @@ -1231,7 +1231,7 @@ ac_cv_c_float_format='IEEE (little-endian)' (name "binutils-mesboot1") (native-inputs (%boot-mesboot0-inputs)) (arguments - (substitute-keyword-arguments (package-arguments binutils-mesboot0) + (substitute-keyword-arguments arguments ((#:configure-flags configure-flags) #~(let ((out (assoc-ref %outputs "out"))) `("--disable-nls" "--disable-shared" @@ -1441,7 +1441,7 @@ ac_cv_c_float_format='IEEE (little-endian)' "1fqqk5zkmdg4vmqzdmip9i42q6b82i3f6yc0n86n9021cr7ms2k9")))) ,@(package-native-inputs gcc-core-mesboot1))) (arguments - (substitute-keyword-arguments (package-arguments gcc-core-mesboot1) + (substitute-keyword-arguments arguments ((#:configure-flags configure-flags) #~(let ((out (assoc-ref %outputs "out"))) `("--enable-languages=c,c++" @@ -1572,7 +1572,7 @@ ac_cv_c_float_format='IEEE (little-endian)' (native-inputs `(("headers" ,mesboot-headers) ,@(%boot-mesboot3-inputs))) (arguments - (substitute-keyword-arguments (package-arguments glibc-mesboot0) + (substitute-keyword-arguments arguments ((#:configure-flags configure-flags) #~(let ((out (assoc-ref %outputs "out")) (headers (assoc-ref %build-inputs "headers"))) @@ -1671,7 +1671,7 @@ SHELL := " shell " ,@(%boot-mesboot3-inputs))) (arguments `(#:validate-runpath? #f ; fails when using --enable-shared - ,@(substitute-keyword-arguments (package-arguments glibc-headers-mesboot) + ,@(substitute-keyword-arguments arguments ((#:make-flags make-flags) #~(let ((bash (assoc-ref %build-inputs "bash"))) (list (string-append "SHELL=" bash "/bin/sh")))) @@ -1768,7 +1768,7 @@ exec " gcc "/bin/" program ,@(%boot-mesboot4-inputs))) (arguments `(#:validate-runpath? #f - ,@(substitute-keyword-arguments (package-arguments gcc-mesboot1) + ,@(substitute-keyword-arguments arguments ((#:configure-flags configure-flags) #~(let ((out (assoc-ref %outputs "out")) (glibc (assoc-ref %build-inputs "libc"))) @@ -1954,7 +1954,7 @@ exec " gcc "/bin/" program `(("xz" ,xz-mesboot) ("sed" ,sed-mesboot) ,@(package-native-inputs pkg))) - (arguments (substitute-keyword-arguments (package-arguments pkg) + (arguments (substitute-keyword-arguments arguments ((#:configure-flags flags ''()) `(cons "--disable-year2038" ,flags))))))) @@ -1987,7 +1987,7 @@ exec " gcc "/bin/" program `(#:guile ,%bootstrap-guile #:implicit-inputs? #f #:tests? #f ; cannot run "make check" - ,@(substitute-keyword-arguments (package-arguments gnu-make) + ,@(substitute-keyword-arguments arguments ((#:configure-flags flags ''()) ;; The generated config.status has some problems due to the ;; bootstrap environment. Disable dependency tracking to work @@ -2090,7 +2090,7 @@ exec " gcc "/bin/" program #:guile ,%bootstrap-guile ;; The build system assumes we have done a mistake when time_t is 32-bit ;; on a 64-bit system. Ignore that for our bootstrap toolchain. - ,@(substitute-keyword-arguments (package-arguments findutils) + ,@(substitute-keyword-arguments arguments ((#:configure-flags flags ''()) `(append ;; TODO: Figure out exactly with architectures need this. @@ -2275,7 +2275,7 @@ exec " gcc "/bin/" program (remove-triplet-prefix name))) (scandir "." has-triplet-prefix?)))))))) - (substitute-keyword-arguments (package-arguments binutils) + (substitute-keyword-arguments arguments ((#:configure-flags cf) #~(append (list #$(string-append "--target=" (boot-triplet)) @@ -2303,7 +2303,7 @@ exec " gcc "/bin/" program ,@(match (%current-system) ((or "i686-linux" "x86_64-linux") - (substitute-keyword-arguments (package-arguments lib) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'workaround-wrapper-bug @@ -2336,7 +2336,7 @@ exec " gcc "/bin/" program ;; XXX: libstdc++.so NEEDs ld.so for some reason. #:validate-runpath? #f - ,@(substitute-keyword-arguments (package-arguments lib) + ,@(substitute-keyword-arguments arguments ((#:configure-flags flags) (if (target-hurd64?) #~(cons* "--disable-shared" @@ -2405,7 +2405,7 @@ exec " gcc "/bin/" program (ice-9 regex) (srfi srfi-1) (srfi srfi-26)) - (substitute-keyword-arguments (package-arguments gcc) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(append (list #$(string-append "--target=" (boot-triplet)) @@ -2557,7 +2557,7 @@ exec " gcc "/bin/" program ;; At the very least, this must not depend on GCC & co. #:disallowed-references (list %bootstrap-binutils)) - (substitute-keyword-arguments (package-arguments perl) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases ;; Pthread support is missing in the bootstrap compiler @@ -2672,7 +2672,7 @@ memoized as a function of '%current-system'." (arguments `(#:guile ,%bootstrap-guile #:implicit-inputs? #f - ,@(substitute-keyword-arguments (package-arguments linux-libre-headers) + ,@(substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'lower-version-requirements @@ -2762,7 +2762,7 @@ memoized as a function of '%current-system'." gnumach-headers-boot0)) (inputs (list flex-boot0 gnumach-headers-boot0)) (arguments - (substitute-keyword-arguments (package-arguments mig) + (substitute-keyword-arguments arguments ((#:configure-flags flags '()) #~(list (string-append "LDFLAGS=-Wl,-rpath=" #$(this-package-native-input "flex") @@ -2852,7 +2852,7 @@ memoized as a function of '%current-system'." `(#:implicit-inputs? #f #:guile ,%bootstrap-guile - ,@(substitute-keyword-arguments (package-arguments expat) + ,@(substitute-keyword-arguments arguments ((#:configure-flags flags ''()) ;; Since we're not passing the right -Wl,-rpath flags, build the ;; static library to avoid RUNPATH validation failure. @@ -2986,7 +2986,7 @@ memoized as a function of '%current-system'." `(#:guile ,%bootstrap-guile #:implicit-inputs? #f - ,@(substitute-keyword-arguments (package-arguments libc) + ,@(substitute-keyword-arguments arguments ((#:configure-flags flags) `(append (list ,(string-append "--host=" (boot-triplet)) ,(string-append "--build=" @@ -3104,7 +3104,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" `(#:implicit-inputs? #f #:guile ,%bootstrap-guile - ,@(substitute-keyword-arguments (package-arguments static-bash) + ,@(substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) ;; Add a '-L' flag so that the pseudo-cross-ld of ;; BINUTILS-BOOT0 can find libc.a. @@ -3236,7 +3236,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ,@(if (target-powerpc? (%current-system)) (list static-bash-for-glibc) '()))) - (substitute-keyword-arguments (package-arguments binutils) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) ;; For gprofng, tell the build system where to look for libstdc++. #~(append #$flags @@ -3301,6 +3301,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (srfi srfi-26) ,@%default-gnu-modules) + ;; TODO: Consider writing 'arguments' instead of (package-arguments gcc). (substitute-keyword-arguments (package-arguments gcc) ((#:make-flags flags) ;; Since $LIBRARY_PATH is not honored, add the relevant flags. @@ -3430,7 +3431,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (modify-inputs (package-inputs parent) (delete "libxcrypt"))) (arguments - (substitute-keyword-arguments (package-arguments parent) + (substitute-keyword-arguments arguments ((#:phases phases #~%standard-phases) #~(modify-phases #$phases (delete 'add-libxcrypt-reference-pkgconfig)))))))) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 3af60e9658d..3ff9781ad24 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -923,7 +923,7 @@ C, forked from the zip manipulation library found in the zlib distribution.") (package/inherit minizip-ng (name "minizip-ng-compat") (arguments - (substitute-keyword-arguments (package-arguments minizip-ng) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(delete "-DMZ_COMPAT=OFF" #$flags)))))) @@ -3148,7 +3148,7 @@ exported by the zlib library.") "0672q35vjrpakmsr1gwj9k5fwv5ihzhahm19bq4y74wqpn91p7fw")) (patches (search-patches "miniz-for-pytorch.patch")))) (arguments - (substitute-keyword-arguments (package-arguments miniz) + (substitute-keyword-arguments arguments ((#:configure-flags flags '()) ;; The changes break the examples. `(cons "-DBUILD_EXAMPLES=OFF" ,flags)))) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index c2b31ecbb6c..cbccbf5fc5a 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2290,7 +2290,7 @@ Google's C++ code base.") (patches (search-patches "abseil-cpp-20220623.1-no-kepsilon-i686.patch")))) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) (if (target-riscv64?) #~(cons* "-DCMAKE_SHARED_LINKER_FLAGS=-latomic" @@ -2337,7 +2337,7 @@ Google's C++ code base.") (hidden-package (package/inherit base (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons* #$(string-append "-DCMAKE_CXX_STANDARD=" (number->string version)) @@ -2348,7 +2348,7 @@ Google's C++ code base.") (hidden-package (package/inherit base (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons* "-DCMAKE_POSITION_INDEPENDENT_CODE=ON" (delete "-DBUILD_SHARED_LIBS=ON" #$flags))))))))) @@ -3810,7 +3810,7 @@ parsing with only a single memory allocation.") "sajson-for-gemmi-numbers-as-strings.patch") (origin-patches (package-source sajson)))))) (arguments - (substitute-keyword-arguments (package-arguments sajson) + (substitute-keyword-arguments arguments ;; This is a modified version used in gemmi, in which numbers are kept ;; as strings. Building the tests fails with the modification. ((#:tests? _ #f) #f))) @@ -4059,7 +4059,7 @@ common controls and win32-style extensions.") (inherit swell) (name "swell-colortheme") (arguments - (substitute-keyword-arguments (package-arguments swell) + (substitute-keyword-arguments arguments ((#:make-flags flags) #~(append #$flags '("libSwell.colortheme"))) ((#:phases phases) @@ -4083,7 +4083,7 @@ programs that use @code{swell}."))) (inherit swell) (name "jnetlib") (arguments - (substitute-keyword-arguments (package-arguments swell) + (substitute-keyword-arguments arguments ((#:tests? _ #t) #t) ((#:phases phases) #~(modify-phases #$phases @@ -4116,7 +4116,7 @@ features: (inherit swell) (name "eel2") (arguments - (substitute-keyword-arguments (package-arguments swell) + (substitute-keyword-arguments arguments ((#:tests? _ #t) #f) ;no tests ;; FIXME: Remove this flag when this issue will be fixed: ;; https://github.com/justinfrankel/WDL/issues/32. @@ -4675,7 +4675,7 @@ on @code{.po} files and doesn't need @code{.mo} files pre-generated.") (define-public tinygettext-with-sdl2 (package/inherit tinygettext (arguments - (substitute-keyword-arguments (package-arguments tinygettext) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(list "-DTINYGETTEXT_WITH_SDL=ON" "-DBUILD_TESTS=ON")))) (native-inputs (list pkg-config tinycmmc)) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index cbabc0517e3..a550e0c47b1 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -79,7 +79,7 @@ (package (inherit p) (name (string-append (package-name p) "-cross-" target)) (arguments - (substitute-keyword-arguments (package-arguments p) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(cons #$(string-append "--target=" target) #$flags)))))) @@ -438,7 +438,7 @@ target that libc." (name (string-append (package-name gnumach-headers) "-cross-" target)) (arguments - (substitute-keyword-arguments (package-arguments gnumach-headers) + (substitute-keyword-arguments arguments ((#:phases phases #~%standard-phases) #~(modify-phases #$phases ;; Cheat by setting the host_cpu variable manually, since using @@ -474,7 +474,7 @@ the base compiler. Use XBINUTILS as the associated cross-Binutils." (inherit mig) (name (string-append "mig-cross")) (arguments - (substitute-keyword-arguments (package-arguments mig) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(list #$(string-append "--target=" target))) ((#:tests? _ #f) @@ -543,7 +543,7 @@ the base compiler. Use XBINUTILS as the associated cross-Binutils." "-cross-" target)) (arguments - (substitute-keyword-arguments (package-arguments hurd-headers) + (substitute-keyword-arguments arguments ((#:configure-flags flags) `(cons* ,(string-append "--build=" (%current-system)) ,(string-append "--host=" target) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 3a45a3ed37d..31dfecb2153 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -1769,7 +1769,7 @@ SunMD5, sha1crypt, NT, bsdicrypt, bigcrypt, and descrypt.") (package/inherit libxcrypt (name "libxcrypt-without-failure-tokens") (arguments - (substitute-keyword-arguments (package-arguments libxcrypt) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(cons* "--disable-failure-tokens" #$flags))))))) diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm index 2d2a2fbf60c..925f5489c52 100644 --- a/gnu/packages/cryptsetup.scm +++ b/gnu/packages/cryptsetup.scm @@ -122,7 +122,7 @@ files). This assumes LIBRARY uses Libtool." (inherit library) (name (string-append (package-name library) "-static")) (arguments - (substitute-keyword-arguments (package-arguments library) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) (let* ((build-system (package-build-system library)) (static-flags (cond ((eq? build-system cmake-build-system) @@ -138,7 +138,7 @@ files). This assumes LIBRARY uses Libtool." (inherit cryptsetup-minimal) (name "cryptsetup-static") (arguments - (substitute-keyword-arguments (package-arguments cryptsetup-minimal) + (substitute-keyword-arguments arguments ((#:configure-flags flags ''()) `(cons* "--disable-shared" "--enable-static-cryptsetup" diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index e6a7801e160..31243868f14 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -777,7 +777,7 @@ should only be used as part of the Guix cups-pk-helper service.") (package/inherit hplip (name "hplip-minimal") (arguments - (substitute-keyword-arguments (package-arguments hplip) + (substitute-keyword-arguments arguments ((#:configure-flags cf) ;; Produce a "light build", meaning that only the printer (CUPS) and ;; scanner (SANE) support gets built, without all the 'hp-*' diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 544d7dd13e7..65bb536cefe 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -185,7 +185,7 @@ tunneling, and so on.") (define-public curl-ssh (package/inherit curl (arguments - (substitute-keyword-arguments (package-arguments curl) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--with-libssh2" #$flags)))) (inputs diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 02012e3bfbf..f84b0ac11c4 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1491,7 +1491,7 @@ as a drop-in replacement of MySQL.") (package/inherit mariadb (name "mariadb-embedded") (arguments - (substitute-keyword-arguments (package-arguments mariadb) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(append '("-DWITH_EMBEDDED_SERVER=ON") #$flags)))))) @@ -2228,7 +2228,7 @@ data in a single database. RocksDB is partially based on @code{LevelDB}.") (sha256 (base32 "0pdy461m9a48x4i829sirpypdlzf3q79p8iw3dng9wd4r4vyv594")))) - (arguments (substitute-keyword-arguments (package-arguments rocksdb) + (arguments (substitute-keyword-arguments arguments ((#:configure-flags flags ''()) #~(cons "-DCMAKE_CXX_FLAGS=-Wno-error=maybe-uninitialized" #$flags))))))) @@ -3256,7 +3256,7 @@ database.") (sha256 (base32 "1p7jr5048syd9ln0bsh2n5ba6fd7x9wfa1x67b7wychv7a46dfx1")))) (arguments - (substitute-keyword-arguments (package-arguments valkey-7) + (substitute-keyword-arguments arguments ((#:phases phases '%standard-phases) #~(modify-phases #$phases (replace 'adjust-tests diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 38e20eeea5e..6c8b192f6d8 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -322,7 +322,7 @@ tool.") (sha256 (base32 "03352zbp73wgwyk25f26rw7h5yqyjp6fysl2n7nj32wp16vxmlza")))) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:configure-flags _ #~'()) #~(list (string-append "--target-list=" diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index d102c7bc752..44f054d1a54 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -309,7 +309,7 @@ to the @dfn{don't repeat yourself} (DRY) principle.") (sha256 (base32 "1znc2q1m9p2kxz1rkfkh2hg2sx6i3aqv72zsraad7bci364cvfd4")))) (arguments - (substitute-keyword-arguments (package-arguments python-django) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (delete 'delete-sitecustomize))))))) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 260e4cf10d4..6cac689282c 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -127,7 +127,7 @@ by no means limited to these applications.) This package provides XML DTDs.") (inherit template) (arguments (let ((dest-dir (format #f "xml/docbook/~a/" version))) - (substitute-keyword-arguments (package-arguments template) + (substitute-keyword-arguments arguments ;; XXX: A default value must be provided otherwise this ;; substitution has no effect. ((#:install-plan _ #f) @@ -147,7 +147,7 @@ by no means limited to these applications.) This package provides XML DTDs.") (inherit template) (arguments (let ((dest-dir (format #f "xml/docbook/~a/" version))) - (substitute-keyword-arguments (package-arguments template) + (substitute-keyword-arguments arguments ((#:install-plan _ #f) #~`(("catalog.xml" #$dest-dir) ("docbook.nvdl" #$dest-dir) @@ -167,7 +167,7 @@ downloading from @var{source}, where @var{version} is a string and (inherit base-template) (arguments (let* ((dest-dir (format #f "xml/docbook/~a/" version))) - (substitute-keyword-arguments (package-arguments base-template) + (substitute-keyword-arguments arguments ((#:phases phases) ;; Some programs, such as kdoctools, instead of using ;; XML_CATALOG_FILES, prefer to use cmake to locate @@ -247,7 +247,7 @@ downloading from @var{source}, where @var{version} is a string and (package (inherit template) (arguments - (substitute-keyword-arguments (package-arguments template) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'copy-catalog-file diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index ea1923a8069..209e481ff8c 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -1762,7 +1762,7 @@ which allows one to install the M8 firmware on any Teensy.") (inherit m8c) (name "m8c-serial") (arguments - (substitute-keyword-arguments (package-arguments m8c) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons* "-DUSE_LIBSERIAL=ON" (delete "-DUSE_LIBUSB=ON" #$flags))))) @@ -2054,7 +2054,7 @@ Automation}, portable and vendor neutral FPGA place and route tool.") (arguments (delkw #:qtbase - (substitute-keyword-arguments (package-arguments nextpnr) + (substitute-keyword-arguments arguments ((#:configure-flags flags '()) #~(delete! "-DBUILD_GUI=ON" #$flags))))) (synopsis @@ -2069,7 +2069,7 @@ Automation}, portable and vendor neutral FPGA place and route tool.") (inherit libngspice) (name "ngspice") (arguments - (substitute-keyword-arguments (package-arguments libngspice) + (substitute-keyword-arguments arguments ;; Tests require a X server running, so we keep them disabled ((#:configure-flags flags) #~(cons* "--enable-rpath" "--with-x" "--with-readline=yes" @@ -2536,7 +2536,7 @@ clock tree synthesis, routing, parasitic extraction, and timing analysis.") (arguments (delkw #:qtbase - (substitute-keyword-arguments (package-arguments openroad) + (substitute-keyword-arguments arguments ((#:configure-flags flags '()) #~(cons* "-DBUILD_GUI=OFF" (delete! "-DBUILD_GUI=ON" #$flags)))))) @@ -2690,7 +2690,7 @@ verification.") (sha256 (base32 "1kn18ibvm7bzdyw2d914284wriravyh5qwfarj06pb052x1yblyx")))) (arguments - (substitute-keyword-arguments (package-arguments osvvm) + (substitute-keyword-arguments arguments ((#:tests? _ #t) #f) ((#:phases phases #~%standard-phases) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index a670d716409..3ed2cde0428 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -319,7 +319,7 @@ static analysis of the ELF binaries at hand.") (package (inherit libelf) (arguments - (substitute-keyword-arguments (package-arguments libelf) + (substitute-keyword-arguments arguments ((#:make-flags flags #~'()) #~(append #$flags '("CFLAGS=-fPIC"))))) (properties `((hidden? . #t) ,@(package-properties libelf))))) @@ -389,7 +389,7 @@ changed.") (base32 "0zdby3gpmm8q4735pviaq92zj41i2rdnhwhyrsb3sinc9hzmz4db")))) (arguments - (substitute-keyword-arguments (package-arguments patchelf) + (substitute-keyword-arguments arguments ((#:phases phases '%standard-phases) #~(modify-phases #$phases (add-after 'fix-tests 'skip-empty-rpath-test diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a2c204d4eb5..289a87c268c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -24457,7 +24457,7 @@ of XELB.") (inherit emacs-xelb) (name "emacs-xelb-no-x-toolkit") (arguments - (substitute-keyword-arguments (package-arguments emacs-xelb) + (substitute-keyword-arguments arguments ((#:emacs emacs) `,emacs-no-x-toolkit))))) (define-public emacs-exwm-no-x-toolkit @@ -24468,7 +24468,7 @@ of XELB.") (propagated-inputs (list emacs-xelb-no-x-toolkit)) (arguments - (substitute-keyword-arguments (package-arguments emacs-exwm) + (substitute-keyword-arguments arguments ((#:emacs emacs) `,emacs-no-x-toolkit))))) (define-public emacs-switch-window @@ -43935,7 +43935,7 @@ conversion program}, a Japanese input method on Emacs.") (string-append "LISPDIR=" #$output "/share/emacs/site-lisp"))) ;; no tests in this subtree #:tests? #f) - (substitute-keyword-arguments (package-arguments emacs-ddskk) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'fix-test 'chdir diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6ad18152ebf..7a2bf97d3bd 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -496,7 +496,7 @@ languages.") (synopsis "The extensible, customizable, self-documenting text editor (console only)") (arguments - (substitute-keyword-arguments (package-arguments emacs-minimal) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(cons* "--with-modules" "--with-native-compilation=aot" (delete "--with-gnutls=no" #$flags))) @@ -592,7 +592,7 @@ editor (console only)") (synopsis "The extensible, customizable, self-documenting text editor") (build-system glib-or-gtk-build-system) (arguments - (substitute-keyword-arguments (package-arguments emacs-no-x) + (substitute-keyword-arguments arguments ((#:modules _) (%emacs-modules build-system)) ((#:configure-flags flags #~'()) #~(cons* "--with-cairo" #$flags)) @@ -637,7 +637,7 @@ editor (console only)") (package/inherit emacs (name "emacs-pgtk") (arguments - (substitute-keyword-arguments (package-arguments emacs) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(cons* "--with-pgtk" #$flags)))) (synopsis "Emacs text editor with @code{pgtk} frames") @@ -650,7 +650,7 @@ of GTK."))) (synopsis "The extensible, customizable, self-documenting text editor (with xwidgets support)") (arguments - (substitute-keyword-arguments (package-arguments emacs) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(cons "--with-xwidgets" #$flags)))) (inputs @@ -663,7 +663,7 @@ editor (with xwidgets support)") (name "emacs-pgtk-xwidgets") (synopsis "Emacs text editor with @code{xwidgets} and @code{pgtk} support") (arguments - (substitute-keyword-arguments (package-arguments emacs-pgtk) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(cons "--with-xwidgets" #$flags)))) (inputs @@ -712,7 +712,7 @@ editor (without X toolkit)" ) (delete "gtk+") (prepend inotify-tools))) (arguments - (substitute-keyword-arguments (package-arguments emacs-no-x) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(cons "--with-x-toolkit=no" #$flags)))))) @@ -722,7 +722,7 @@ editor (without X toolkit)" ) (synopsis "The extensible, customizable, self-documenting text editor (with wide ints)" ) (arguments - (substitute-keyword-arguments (package-arguments emacs) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--with-wide-int" #$flags)))))) @@ -751,7 +751,7 @@ editor (with wide ints)" ) "emacs-next-native-comp-fix-filenames.patch" "emacs-native-comp-pin-packages.patch")))) (arguments - (substitute-keyword-arguments (package-arguments emacs-minimal) + (substitute-keyword-arguments arguments ((#:make-flags flags #~'()) #~(append #$flags (list (string-append "SELECTOR=" #$%emacs-next-selector))))))))) @@ -768,7 +768,7 @@ editor (with wide ints)" ) (version version) (source source) (arguments - (substitute-keyword-arguments (package-arguments emacs) + (substitute-keyword-arguments arguments ((#:make-flags flags #~'()) #~(append #$flags (list (string-append "SELECTOR=" #$%emacs-next-selector)))))))) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index b69a54b1332..0d06e7c41e4 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -168,7 +168,7 @@ embedded-4_9-branch/") ("gcc@5" ,gcc-5) ,@(package-native-inputs xgcc))) (arguments - (substitute-keyword-arguments (package-arguments xgcc) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'set-paths 'augment-CPLUS_INCLUDE_PATH @@ -285,7 +285,7 @@ usable on embedded products.") (inherit base) (name "newlib-nano") (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ;; The configure flags are identical to the flags used by the "GCC ;; ARM embedded" project. They optimize newlib for use on small ;; embedded systems with limited memory. @@ -378,7 +378,7 @@ embedded-7-branch/") (delete "isl") (prepend flex isl-0.18))) (arguments - (substitute-keyword-arguments (package-arguments xgcc) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'expand-version-string @@ -463,7 +463,7 @@ embedded-7-branch/") (base32 "1dq23fqrk75g1a4v7569fvnnw5q440zawbxi3w0g05n8jlqsmvcy")))) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ;; The configure flags are identical to the flags used by the "GCC ;; ARM embedded" project. ((#:configure-flags flags) @@ -517,7 +517,7 @@ embedded-7-branch/") (delete "isl") (prepend flex isl-0.18))) (arguments - (substitute-keyword-arguments (package-arguments xgcc) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'expand-version-string @@ -602,7 +602,7 @@ embedded-7-branch/") (base32 "095j23mg928rmf4yqmj39wc0nsd207liqrdw4ygh58nygsm4gpmh")))) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ;; The configure flags are identical to the flags used by the "GCC ;; ARM embedded" project. ((#:configure-flags flags) @@ -645,7 +645,7 @@ embedded-7-branch/") (sha256 (base32 "0r6q0m3d8g3k3rkmnqjw8aw5fcnsrmywf4ispdkxmk1al3whk1vk")))) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (replace 'expand-version-string @@ -685,7 +685,7 @@ embedded-7-branch/") (sha256 (base32 "0drs9v8avh4y2h5bs0ixjn9x662jzkkikx8z034wgl41dxmn6786")))) - (arguments (substitute-keyword-arguments (package-arguments base) + (arguments (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons* "--enable-newlib-mb" "--enable-newlib-reent-check-verify" @@ -761,7 +761,7 @@ embedded-7-branch/") (package (inherit base) (name "libstdc++-nano-arm-none-eabi") - (arguments (substitute-keyword-arguments (package-arguments base) + (arguments (substitute-keyword-arguments arguments ((#:make-flags flags) #~(map (lambda (flag) (if (or (string-prefix? "CFLAGS=" flag) @@ -902,7 +902,7 @@ languages are C and C++.") (inherit gdb) (name "gdb-arm-none-eabi") (arguments - (substitute-keyword-arguments (package-arguments gdb) + (substitute-keyword-arguments arguments ((#:configure-flags flags '()) #~(cons* "--target=arm-none-eabi" "--enable-multilib" @@ -1069,7 +1069,7 @@ with a layered architecture of JTAG interface and TAP support.") "0w0dff3s7wv2d9m78a4jhckiik58q38wx6wpbba5hzbs4yxz35ck")) (patches '()))) (arguments - (substitute-keyword-arguments (package-arguments xbinutils) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--disable-werror" #$flags)) ;; FIXME: For some reason there are many test failures. It's not @@ -1149,7 +1149,7 @@ with a layered architecture of JTAG interface and TAP support.") (search-patches "gcc-cross-environment-variables.patch"))))) (arguments - (substitute-keyword-arguments (package-arguments xgcc) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (delete 'pre-x86-configure) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 25ac99f20d2..4a6a9d16325 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -692,7 +692,7 @@ turbo speed, networked multiplayer, and graphical enhancements.") "libretro-dolphin-emu-libusb-assert.patch" "libretro-dolphin-emu-vulkan-headers.patch")))) (arguments - (substitute-keyword-arguments (package-arguments dolphin-emu) + (substitute-keyword-arguments arguments ((#:configure-flags flags ''()) #~(cons* (string-append "-DCMAKE_CXX_FLAGS=" "-I" (search-input-directory @@ -1154,7 +1154,7 @@ The following systems are supported: (base32 "1bbcsikgcycf3cp9ciicg4yckjyamdfvgk4fgw079la59q8aw13q")))) (arguments - (substitute-keyword-arguments (package-arguments mgba) + (substitute-keyword-arguments arguments ((#:configure-flags flags ''()) ;; Relax error checks to avoid a build failure with GCC 14. #~(cons "-DCMAKE_C_FLAGS=-Wno-error=incompatible-pointer-types" @@ -4249,7 +4249,7 @@ performance, features, and ease of use.") (base32 "0z9wqmx351f9160jsmprznqw5sx5lslyisbr41b9igzsr5j94db3")))) (build-system gnu-build-system) - (arguments (substitute-keyword-arguments (package-arguments bsnes) + (arguments (substitute-keyword-arguments arguments ((#:make-flags flags ''()) ;; This is needed because the modified bsnes code that ;; bsnes-hd uses is based on an older copy that still @@ -4280,7 +4280,7 @@ turn into actual gradients (without influencing the sharpness of the artwork). (package/inherit bsnes-hd (name "libretro-bsnes-hd") (arguments - (substitute-keyword-arguments (package-arguments bsnes-hd) + (substitute-keyword-arguments arguments ((#:make-flags flags ''()) #~(cons "target=libretro" #$flags)) ((#:phases phases '%standard-phases) @@ -4508,7 +4508,7 @@ Advance.") (base32 "1sbhq614rvcm01ln7883ivdhni1mg1v4lyyvcwsy92i9wbh8qd9i")))) (arguments - (substitute-keyword-arguments (package-arguments jg-bsnes) + (substitute-keyword-arguments arguments ((#:make-flags flags) #~(cons* #$(string-append "GIT_VERSION=" version) (string-append "prefix=" #$output) @@ -4853,7 +4853,7 @@ and Atomiswave emulator derived from reicast.") (define-public libretro-flycast (package/inherit flycast (name "libretro-flycast") - (arguments (substitute-keyword-arguments (package-arguments flycast) + (arguments (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "-DLIBRETRO=ON" #$flags)))))) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 4becd0bd493..81bcb034a50 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2806,7 +2806,7 @@ models in the STL and OFF file formats.") "")))) (file-name (git-file-name name version)))) (arguments - (substitute-keyword-arguments (package-arguments openscad) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(begin (use-modules (srfi srfi-1)) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index fc8693319f7..5a9e86aa150 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -894,7 +894,7 @@ performance and other characteristics.") (inherit bcachefs-tools-minimal) (name "bcachefs-tools-minimal-static") (arguments - (substitute-keyword-arguments (package-arguments bcachefs-tools-minimal) + (substitute-keyword-arguments arguments ((#:phases phases #~%standard-phases) #~(modify-phases #$phases (add-after 'unpack 'patch-makefile @@ -2182,7 +2182,7 @@ memory-efficient.") #:configure-flags #~'("CFLAGS=-ffunction-sections -fdata-sections -Os -no-pie" "LDFLAGS=-static") - (substitute-keyword-arguments (package-arguments squashfuse) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'install 'install-private-headers diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 70cbf096f80..14d85248b2c 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -236,7 +236,7 @@ line client and a client based on Qt.") (base32 "04kh88xklyq5w2x0zykfas6ssxajp1z33c2899fq342jnfr510b6")))) (arguments - (substitute-keyword-arguments (package-arguments bitcoin-core) + (substitute-keyword-arguments arguments ((#:qtbase original-flags #f) qtbase-5))) (native-inputs diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 74f68927354..da6f84d8939 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -601,7 +601,7 @@ provide OpenFirmware functionality on top of an already running system.") (package (inherit base) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ;; No need to cross-compile, package produces reproducible firmware. ((#:target _ #f) #f) ((#:phases phases) @@ -792,7 +792,7 @@ source." (cross-binutils "i686-linux-gnu"))))) (supported-systems %supported-systems) (arguments - (substitute-keyword-arguments (package-arguments seabios) + (substitute-keyword-arguments arguments ((#:modules modules %default-gnu-modules) `((ice-9 match) (ice-9 threads) @@ -1186,7 +1186,7 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.") (inherit base) (name "ovmf-x86-64") (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (replace 'install @@ -1226,7 +1226,7 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.") (package (inherit base) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (replace 'install @@ -1248,7 +1248,7 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.") (package (inherit base) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (replace 'install @@ -1269,7 +1269,7 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.") (inherit base) (name "ovmf-arm") (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (replace 'install @@ -1285,7 +1285,7 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.") (package (inherit base) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (replace 'install @@ -1997,7 +1997,7 @@ or passthrough board.") (base32 "1skj7iq6dad48xhy2ljjmwpbhhdv3gk7cmi28lh3xfsnxphm4v8r")))) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (replace 'copy-lufa-source diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm index 22c309ec23c..17a7a7348ab 100644 --- a/gnu/packages/flex.scm +++ b/gnu/packages/flex.scm @@ -51,7 +51,7 @@ (inherit bison) (arguments ;; Disable tests, since they require flex. - (substitute-keyword-arguments (package-arguments bison) + (substitute-keyword-arguments arguments ((#:tests? _ #f) #f))) (inputs (alist-delete "flex" (package-inputs bison)))))) `(("bison" ,bison-for-tests)))) diff --git a/gnu/packages/fluidplug.scm b/gnu/packages/fluidplug.scm index 6edbe20367f..1c446992390 100644 --- a/gnu/packages/fluidplug.scm +++ b/gnu/packages/fluidplug.scm @@ -357,7 +357,7 @@ (inherit fluidplug-lv2) (name (fluidplug-plugin->package-name record)) (arguments - (substitute-keyword-arguments (package-arguments fluidplug-lv2) + (substitute-keyword-arguments arguments ((#:make-flags make-flags) #~(list (string-append "CC=" #$(cc-for-target)) (string-append "DESTDIR=" #$output) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 741826f4091..90c8119ab33 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -682,7 +682,7 @@ implementing the pen protocol for manipulating glyphs.") (package/inherit python-fontpens-bootstrap (name "python-fontpens") (arguments - (substitute-keyword-arguments (package-arguments python-fontpens-bootstrap) + (substitute-keyword-arguments arguments ((#:tests? _ #f) #t) ((#:phases phases #~%standard-phases) @@ -1463,7 +1463,7 @@ high quality, anti-aliased and subpixel rendered text on a display.") (name "fontconfig") (outputs (cons "doc" (package-outputs fontconfig))) (arguments - (substitute-keyword-arguments (package-arguments fontconfig) + (substitute-keyword-arguments arguments ((#:configure-flags configure-flags) #~(delete "--disable-docs" #$configure-flags)) ((#:phases phases '%standard-phases) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index aa2a8d334ff..512b034a269 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -228,7 +228,7 @@ application-centers for distributions.") (modify-inputs (package-inputs appstream) (prepend qtbase-5))) (arguments - (substitute-keyword-arguments (package-arguments appstream) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(append '("-Dqt=true" "-Dqt-versions=5") #$flags)))))) @@ -242,7 +242,7 @@ application-centers for distributions.") (modify-inputs (package-inputs appstream) (prepend qtbase))) (arguments - (substitute-keyword-arguments (package-arguments appstream) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(append '("-Dqt=true" "-Dqt-versions=6") #$flags)))))) @@ -696,7 +696,7 @@ other applications that need to directly deal with input devices.") (fold alist-delete (package-inputs libinput) '("cairo" "glib" "gtk+" "libwacom"))) (arguments - (substitute-keyword-arguments (package-arguments libinput) + (substitute-keyword-arguments arguments ((#:configure-flags flags ''()) `(cons* "-Dlibwacom=false" "-Ddebug-gui=false" ;requires gtk+@3 diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6a1dd5df1ac..a621467cf72 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -834,7 +834,7 @@ fight or flee@dots{} (inherit boohu) (name "boohu-tk") (arguments - (substitute-keyword-arguments (package-arguments boohu) + (substitute-keyword-arguments arguments ((#:tests? _ #t) #f) ((#:build-flags _ #~()) #~(list "--tags=tk")) @@ -3488,7 +3488,7 @@ corruption… You hope luck will be on your side! (package/inherit shamogu (name "shamogu-sdl") (arguments - (substitute-keyword-arguments (package-arguments shamogu) + (substitute-keyword-arguments arguments ((#:tests? _ #t) #f) ((#:build-flags _ #'()) #~(list "--tags=sdl")) ((#:phases _ #~%standard-phases) @@ -5439,7 +5439,7 @@ next campaign.") (native-inputs (list pkg-config)) (arguments - (substitute-keyword-arguments (package-arguments wesnoth) + (substitute-keyword-arguments arguments ((#:configure-flags _) #~'("-DENABLE_SYSTEM_LUA=ON" "-DENABLE_GAME=OFF")))) (synopsis "Dedicated @emph{Battle for Wesnoth} server") @@ -5834,7 +5834,7 @@ Transport Tycoon Deluxe.") (inputs (modify-inputs (package-inputs openttd) (append zstd harfbuzz))) (arguments - (substitute-keyword-arguments (package-arguments openttd) + (substitute-keyword-arguments arguments ((#:phases phases '%standard-phases) #~(modify-phases #$phases (add-before 'check 'build-tests @@ -11470,7 +11470,7 @@ player adaptability for character progression.") (package/inherit harmonist (name "harmonist-sdl") (arguments - (substitute-keyword-arguments (package-arguments harmonist) + (substitute-keyword-arguments arguments ((#:tests? _ #t) #f) ((#:build-flags _ #'()) #~(list "--tags=sdl")) ((#:phases _ #~%standard-phases) diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm index 730af0761c6..a4e9ad61722 100644 --- a/gnu/packages/gawk.scm +++ b/gnu/packages/gawk.scm @@ -249,7 +249,7 @@ programs can be captured and transferred to systems that have Awk but not (package/inherit cppawk (name "cppawk-egawk") (arguments - (substitute-keyword-arguments (package-arguments cppawk) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (replace 'fix-awk-paths diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 0a1a2b6ffc6..63a2981c620 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -441,7 +441,7 @@ Go. It also includes runtime support libraries for these languages.") (package-arguments parent) ;; For native builds of some GCC versions the C++ include path needs to ;; be adjusted so it does not interfere with GCC's own build processes. - (substitute-keyword-arguments (package-arguments parent) + (substitute-keyword-arguments arguments ((#:modules modules %default-gnu-modules) `((srfi srfi-1) ,@modules)) @@ -498,10 +498,10 @@ Go. It also includes runtime support libraries for these languages.") (inherit gcc-base) (version (package-version this-package))))) (if (%current-target-system) - (substitute-keyword-arguments (package-arguments parent) + (substitute-keyword-arguments arguments ((#:configure-flags flags '()) `(cons "CXX=g++ -std=c++03" ,flags))) - (substitute-keyword-arguments (package-arguments parent) + (substitute-keyword-arguments arguments ((#:modules modules %default-gnu-modules) `((srfi srfi-1) ,@modules)) @@ -567,10 +567,10 @@ Go. It also includes runtime support libraries for these languages.") (inherit gcc-base) (version (package-version this-package))))) (if (%current-target-system) - (substitute-keyword-arguments (package-arguments parent) + (substitute-keyword-arguments arguments ((#:configure-flags flags '()) `(cons "CXX=g++ -std=c++11" ,flags))) - (substitute-keyword-arguments (package-arguments parent) + (substitute-keyword-arguments arguments ((#:modules modules %default-gnu-modules) `((srfi srfi-1) ,@modules)) @@ -650,7 +650,7 @@ Go. It also includes runtime support libraries for these languages.") (let ((parent (package (inherit gcc-base) (version (package-version this-package))))) - (substitute-keyword-arguments (package-arguments parent) + (substitute-keyword-arguments arguments ((#:modules modules %default-gnu-modules) `((srfi srfi-1) ,@modules)) @@ -1009,7 +1009,7 @@ It also includes runtime support libraries for these languages.") (modules '((guix build utils))) (snippet gcc-canadian-cross-objdump-snippet))) (arguments - (substitute-keyword-arguments (package-arguments gcc-11) + (substitute-keyword-arguments arguments ((#:phases phases #~%standard-phases) (if (target-hurd?) #~(modify-phases #$phases @@ -1039,7 +1039,7 @@ It also includes runtime support libraries for these languages.") "gcc-5.0-libvtv-runpath.patch")) (modules '((guix build utils))) (snippet gcc-canadian-cross-objdump-snippet))) - (arguments (substitute-keyword-arguments (package-arguments gcc-13) + (arguments (substitute-keyword-arguments arguments ((#:phases phases #~%standard-phases) #~(modify-phases #$phases (add-before 'configure 'pre-x86-configure @@ -1073,7 +1073,7 @@ It also includes runtime support libraries for these languages.") (modules '((guix build utils))) (snippet gcc-canadian-cross-objdump-snippet))) (arguments - (substitute-keyword-arguments (package-arguments gcc-14) + (substitute-keyword-arguments arguments ((#:phases phases #~%standard-phases) #~(modify-phases #$phases (add-after 'install 'adjust-modules-file @@ -1369,7 +1369,7 @@ as the 'native-search-paths' field." (delete "lib" (package-outputs gcc)))) (native-search-paths search-paths) (arguments - (substitute-keyword-arguments (package-arguments gcc) + (substitute-keyword-arguments arguments ((#:modules modules %default-gnu-modules) `(,@modules (srfi srfi-1) @@ -1635,7 +1635,7 @@ also includes the druntime and phobos libraries." (outputs (delete "lib" (package-outputs gcc))) (properties (alist-delete 'hidden? (package-properties gcc))) (arguments - (substitute-keyword-arguments (package-arguments gcc) + (substitute-keyword-arguments arguments ((#:modules _ '()) '((guix build gnu-build-system) (guix build utils) @@ -1696,7 +1696,7 @@ misnomer."))) "This package is part of the GNU Compiler Collection and provides the GNU compiler for the Go programming language.") (arguments - (substitute-keyword-arguments (package-arguments gccgo) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases #$@(if (and (version>=? (package-version gccgo) "12.0") diff --git a/gnu/packages/gdb.scm b/gnu/packages/gdb.scm index 8221d868d37..709807888c4 100644 --- a/gnu/packages/gdb.scm +++ b/gnu/packages/gdb.scm @@ -266,7 +266,7 @@ written in C, C++, Ada, Objective-C, Pascal and more.") (package/inherit gdb (name "gdb-multiarch") (arguments - (substitute-keyword-arguments (package-arguments gdb) + (substitute-keyword-arguments arguments ((#:configure-flags flags '()) #~(cons* "--enable-targets=all" "--enable-multilib" @@ -292,7 +292,7 @@ written in C, C++, Ada, Objective-C, Pascal and more.") (package/inherit gdb-14 (name "avr-gdb") (arguments - (substitute-keyword-arguments (package-arguments gdb-14) + (substitute-keyword-arguments arguments ((#:configure-flags flags '()) #~(cons* "--target=avr" "--disable-nls" @@ -380,7 +380,7 @@ AMD's commercially available GPU architectures.") (modify-inputs (package-native-inputs gdb) (prepend bison flex perl))) (arguments - (substitute-keyword-arguments (package-arguments gdb) + (substitute-keyword-arguments arguments ((#:configure-flags _ '()) ''("--program-prefix=roc" "--disable-binutils" diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index d3789b0fdf7..43fdcf8a343 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -934,7 +934,7 @@ hydrology and waste deposition.") (native-inputs (modify-inputs (package-native-inputs ogs-serial) (prepend pkg-config))) (arguments - (substitute-keyword-arguments (package-arguments ogs-serial) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons* "-DOGS_USE_PETSC=ON" "-DCMAKE_C_COMPILER=mpicc" "-DCMAKE_CXX_COMPILER=mpic++" diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index 6b717044812..039f736b0d4 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -163,7 +163,7 @@ translated messages from the catalogs. Nearly all GNU packages use Gettext.") "04kbg1sx0ncfrsbr85ggjslqkzzb243fcw9nyh3rrv1a22ihszf7")) (patches (search-patches "gettext-libunicode-update.patch")))) (arguments - (substitute-keyword-arguments (package-arguments gettext-minimal) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'touch-test @@ -187,7 +187,7 @@ translated messages from the catalogs. Nearly all GNU packages use Gettext.") (package/inherit gettext-minimal (name "gettext") (arguments - (substitute-keyword-arguments (package-arguments gettext-minimal) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'install 'add-emacs-autoloads @@ -352,6 +352,6 @@ areas where they were not expected like documentation.") (modify-inputs (package-native-inputs po4a) (delete "docbook-xml" "perl-test-pod" "texlive-local-tree"))) (arguments - (substitute-keyword-arguments (package-arguments po4a) + (substitute-keyword-arguments arguments ((#:tests? _ #t) #f))) (properties '((hidden? . #t))))) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 396d2693b7f..f8f34599cb8 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -309,7 +309,7 @@ also known as DXTn or DXTC) for Mesa.") (arguments (strip-keyword-arguments '(#:make-flags) - (substitute-keyword-arguments (package-arguments libva) + (substitute-keyword-arguments arguments ((#:configure-flags flags) '(list "--disable-glx")))))))) @@ -657,7 +657,7 @@ from software emulation to complete hardware acceleration for modern GPUs.") (source (origin (inherit (package-source mesa)))) (arguments - (substitute-keyword-arguments (package-arguments mesa) + (substitute-keyword-arguments arguments ((#:modules modules) (cons '(ice-9 textual-ports) modules)) ((#:configure-flags flags) @@ -1093,7 +1093,7 @@ and surfaces, receiving input and events.") ;; 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": ;; No such file or directory - (arguments (substitute-keyword-arguments (package-arguments glfw) + (arguments (substitute-keyword-arguments arguments ((#:out-of-source? _ #f) #f))))) (define-public nanovg diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index eff1c52dddf..2319e35bfb7 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -204,7 +204,7 @@ shared NFS home directories.") (package/inherit dbus (name "dbus-for-jami") (arguments - (substitute-keyword-arguments (package-arguments dbus) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'customize-config @@ -234,7 +234,7 @@ shared NFS home directories.") (define-public dbus-verbose (package/inherit dbus (name "dbus-verbose") - (arguments (substitute-keyword-arguments (package-arguments dbus) + (arguments (substitute-keyword-arguments arguments ((#:configure-flags flags '()) #~(cons "-Dverbose_mode=true" #$flags)))) (synopsis "D-Bus with verbose mode enabled for debugging") @@ -450,7 +450,7 @@ functions for strings and common data structures.") (modify-inputs (package-native-inputs base) (prepend gobject-introspection-minimal))) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases ;; GI tests require installed libraries @@ -469,7 +469,7 @@ functions for strings and common data structures.") (modify-inputs (package-native-inputs base) (append gi-docgen python-docutils))) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:configure-flags flags ''()) #~(cons "-Ddocumentation=true" (delete "-Dman-pages=disabled" #$flags))) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index de02add65ff..7b0d87ca247 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -409,7 +409,7 @@ services.") (name "libcloudproviders") (outputs (cons "doc" (package-outputs libcloudproviders-minimal))) (arguments - (substitute-keyword-arguments (package-arguments libcloudproviders-minimal) + (substitute-keyword-arguments arguments ((#:configure-flags _) '(list "-Denable-gtk-doc=true")) ;false by default ((#:phases phases '%standard-phases) @@ -2353,7 +2353,7 @@ GNOME Desktop.") (base32 "1dqsgrb62fgmy4w63bjl3b525nil4idrrdcscia1h3isaly0zlds")))) (arguments - (substitute-keyword-arguments (package-arguments gcr) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (replace 'skip-gtk-update-icon-cache @@ -2409,7 +2409,7 @@ GNOME Desktop.") (package/inherit gdl (name "gdl-minimal") (arguments - (substitute-keyword-arguments (package-arguments gdl) + (substitute-keyword-arguments arguments ((#:phases phases #~%standard-phases) #~(modify-phases #$phases (add-after 'unpack 'disable-doc-generation @@ -3073,7 +3073,7 @@ API.") (base32 "1jcyfs912h29xpnj3fd2mk7pr1mljs61vhdpypphj88xfrlrv6hy")))) (arguments - (substitute-keyword-arguments (package-arguments libpeas) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~(list)) #~(cons* "-Dlua51=false" #$flags)))) (inputs @@ -3260,7 +3260,7 @@ compiles to GTKBuilder XML.") (base32 "0hj7f4xhwjc4x32r3lswwclbw37fw3spy806g4plkmym25hz4ydy")))) (arguments - (substitute-keyword-arguments (package-arguments blueprint-compiler) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (delete 'fix-tests))))))) @@ -4442,7 +4442,7 @@ targeting the GNOME stack simple.") "0xvhg32sxnfyvxn86hh9mn65mh1g189vhsjcahccj0zbwnrkqz3w")) (patches (search-patches "vala-0.52-fix-valagirparser.patch")))) (arguments - (substitute-keyword-arguments (package-arguments vala) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(cons* (string-append "CFLAGS=-g -O2" @@ -4493,7 +4493,7 @@ editors, IDEs, etc.") (define-public vte/gtk+-3 (package/inherit vte (name "vte-with-gtk+3") - (arguments (substitute-keyword-arguments (package-arguments vte) + (arguments (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(cons "-Dgtk4=false" (delete "-Dgtk3=false" #$flags))))) (propagated-inputs (modify-inputs (package-propagated-inputs vte) @@ -4514,7 +4514,7 @@ editors, IDEs, etc.") (file-name (git-file-name name version)) (sha256 (base32 "0fv6lx7kk1xrfsvc95jm23vxkmyfypriz4nvj0kjy4nshgccwlch")))) - (arguments (substitute-keyword-arguments (package-arguments vte) + (arguments (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(append (list "-Dsixel=true") #$flags)))) (inputs (modify-inputs (package-inputs vte) @@ -4668,7 +4668,7 @@ GLib and GObject, and integrates JSON with GLib data types.") (name "json-glib") (outputs (cons "doc" (package-outputs json-glib-minimal))) (arguments - (substitute-keyword-arguments (package-arguments json-glib-minimal) + (substitute-keyword-arguments arguments ((#:configure-flags _) #~(list "-Dman=true" #$@(if (%current-target-system) @@ -4976,7 +4976,7 @@ and the GLib main loop, to integrate well with GNOME applications.") (base32 "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4")))) (arguments - (substitute-keyword-arguments (package-arguments libsoup-minimal) + (substitute-keyword-arguments arguments ((#:configure-flags configure-flags) ;; The option name changed between libsoup 2 and libsoup 3. #~(cons "-Dgtk_doc=false" @@ -4998,7 +4998,7 @@ and the GLib main loop, to integrate well with GNOME applications.") (name "libsoup") (outputs (cons "doc" (package-outputs libsoup-minimal))) (arguments - (substitute-keyword-arguments (package-arguments libsoup-minimal) + (substitute-keyword-arguments arguments ((#:configure-flags configure-flags) #~(cons "-Ddocs=enabled" ;; The default value is 'auto', meaning it could be skipped. @@ -5523,7 +5523,7 @@ output devices.") (sha256 (base32 "0vwfx06k1in8hci3kdxpc3c0bh81f1vl5bp7favd3rdz4wd661vl")))) (arguments - (substitute-keyword-arguments (package-arguments colord-minimal) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(begin (use-modules (srfi srfi-1)) @@ -7181,7 +7181,7 @@ USB transfers with your high-level application or system daemon.") (package/inherit gusb-minimal (name "gusb") (arguments - (substitute-keyword-arguments (package-arguments gusb-minimal) + (substitute-keyword-arguments arguments ((#:configure-flags flags) `(cons "-Ddocs=true" (delete "-Ddocs=false" ,flags))))) @@ -12207,7 +12207,7 @@ for usage on small and big screens.") (sha256 (base32 "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5")))) (arguments - (substitute-keyword-arguments (package-arguments libhandy) + (substitute-keyword-arguments arguments ((#:configure-flags flags) '(list "-Dglade_catalog=disabled" "-Dgtk_doc=true")))))) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 4a05e9ced10..57e07f77991 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -309,7 +309,7 @@ in C/C++.") (base32 "1a3h7p7126pxzpidb1lqckvhfh1had805mai4l96mnc878phbx61")))) (arguments - (substitute-keyword-arguments (package-arguments mozjs) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(delete "--enable-rust-simd" #$flags)) ((#:phases phases) @@ -387,7 +387,7 @@ fractional-second-digits-append-item.js") (base32 "0xvwk3vkbxnybpi3gwk48nxffg44lbv58mbk2xq6cz50ffq0k5k2")))) (arguments - (substitute-keyword-arguments (package-arguments mozjs) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(delete "--enable-rust-simd" #$flags)) ((#:phases phases) diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index f5b5649622d..b49f0d75b40 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -160,7 +160,7 @@ and track podcasts.") (modify-inputs (package-inputs libmygpo-qt) (replace "qtbase" qtbase-5))) (arguments - (substitute-keyword-arguments (package-arguments libmygpo-qt) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(delete "-DBUILD_WITH_QT6=ON" #$flags)))))) diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index be5fe287c8f..6a3996a46d1 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -591,7 +591,7 @@ contains supporting code for evaluation and parameter tuning.") (sha256 (base32 "0m0hyqn9db0xdbvan0lin7xf11dl4xdpjwwpagw01hl4z72w3al0")))) (arguments - (substitute-keyword-arguments (package-arguments faiss) + (substitute-keyword-arguments arguments ((#:configure-flags flags '()) ;; Add -fpermissive to suppress errors about non-conforming code. #~(cons "-DCMAKE_CXX_FLAGS=-fpermissive" diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index de7716c40c0..39711d3d969 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1843,7 +1843,7 @@ in Julia).") (base32 "0l7gqxxz7rmdqrv65r6ki7avg636d7s6bfq7h1213gjr1dz8hiij")))) (arguments - (substitute-keyword-arguments (package-arguments openscenegraph) + (substitute-keyword-arguments arguments ((#:configure-flags flags) ;; As per the above wiki link, the following plugins are enough: #~(append @@ -2619,7 +2619,7 @@ It supports: (base32 "15mbqz7kg23xgy46ijm8p5wnj4q8xipyr7ckwz8kpa5v3lxssyf3")))) (arguments - (substitute-keyword-arguments (package-arguments skia) + (substitute-keyword-arguments arguments ;; gn/find_headers.py fails to decode some JSON, probably because of ;; a warning. ((#:tests? _ #false) #false) diff --git a/gnu/packages/groff.scm b/gnu/packages/groff.scm index c06381df6a4..c32bff09578 100644 --- a/gnu/packages/groff.scm +++ b/gnu/packages/groff.scm @@ -147,7 +147,7 @@ is usually the formatter of \"man\" documentation pages.") #:configure-flags '("--with-doc=no") - ,@(substitute-keyword-arguments (package-arguments groff) + ,@(substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (add-after 'install 'remove-non-essential-programs diff --git a/gnu/packages/groovy.scm b/gnu/packages/groovy.scm index 94b2fef8330..3e8eae44ae4 100644 --- a/gnu/packages/groovy.scm +++ b/gnu/packages/groovy.scm @@ -303,7 +303,7 @@ other groovy submodules."))) (name "groovy-parser-antlr4") (arguments `(#:tests? #f - ,@(substitute-keyword-arguments (package-arguments base) + ,@(substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (add-before 'build 'generate-parser @@ -360,7 +360,7 @@ other groovy submodules.")))) (inherit base) (arguments `(#:tests? #f;Requires spock-framework which is a circular dependency - ,@(substitute-keyword-arguments (package-arguments base) + ,@(substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases ;; These annotations are used for QA, but do not affect build output. @@ -413,7 +413,7 @@ similar to javadoc.")))) (arguments `(;#:tests? #f;Requires spock-framework which is a circular dependency #:ant ,ant/java8; ant is actually a dependency of this package, and we need 1.10 - ,@(substitute-keyword-arguments (package-arguments base) + ,@(substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases ;; These annotations are used for QA, but do not affect build output. @@ -445,7 +445,7 @@ similar to javadoc.")))) (package (inherit base) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (delete 'copy-resources) @@ -529,7 +529,7 @@ arguments in Groovy using the picocli library.")))) (package (inherit base) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (add-before 'check 'fix-test @@ -553,7 +553,7 @@ library used to build graphical interfaces.")))) (package (inherit base) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (add-before 'check 'build-swing @@ -744,7 +744,7 @@ tests in Groovy.")))) (package (inherit base) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (delete 'copy-resources) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 3023daaff24..b20a1a0e057 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -1082,7 +1082,7 @@ non-linear editors.") given, also pass them to the build system instead of the ones used by PKG." (package/inherit pkg (arguments - (substitute-keyword-arguments (package-arguments pkg) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(append (list diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 781e43d9dd7..9eea8b4919c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -251,7 +251,7 @@ output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.") (modify-inputs (package-native-inputs cairo) (prepend gtk-doc/stable))) (arguments - (substitute-keyword-arguments (package-arguments cairo) + (substitute-keyword-arguments arguments ((#:configure-flags flags ''()) #~(cons "-Dgtk_doc=true" #$flags)) ((#:phases phases '%standard-phases) @@ -278,7 +278,7 @@ output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.") `(("mesa" ,mesa) ,@(package-inputs cairo))) (arguments - (substitute-keyword-arguments (package-arguments cairo) + (substitute-keyword-arguments arguments ((#:configure-flags flags ''()) #~(cons "-Dxlib-xcb=enabled" #$flags)))) (synopsis "2D graphics library (with X11 support)"))) @@ -642,7 +642,7 @@ highlighting and other features typical of a source code editor.") (list #:configure-flags #~(list "CFLAGS=-g -O2 -Wno-error=incompatible-pointer-types")) - (substitute-keyword-arguments (package-arguments gtksourceview) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (delete 'disable-gtk-update-icon-cache)))))))) @@ -855,7 +855,7 @@ is part of the GNOME accessibility project.") (package/inherit at-spi2-core (outputs (cons "doc" (package-outputs at-spi2-core))) (arguments - (substitute-keyword-arguments (package-arguments at-spi2-core) + (substitute-keyword-arguments arguments ((#:configure-flags flags ''()) #~(cons #$(if (%current-target-system) "-Ddocs=false" @@ -1503,7 +1503,7 @@ exceptions, macros, and a dynamic programming environment.") (base32 "0dslfldzgxis8g0g3xaffcqnd1njzz23fjy0v3lc0r2694ra4ny4")))) (arguments - (substitute-keyword-arguments (package-arguments guile-cairo) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases ;; To allow running the check phase before install, add two phases diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index f9f43a27a28..a66d49e89d9 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1851,7 +1851,7 @@ types are supported.") (name "guile2.2-pfds") (native-inputs (list guile-2.2)) (arguments - (substitute-keyword-arguments (package-arguments guile-pfds) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (delete 'work-around-guile-bug) @@ -2250,7 +2250,7 @@ format.") (inputs (modify-inputs (package-inputs guile-email) (replace "guile" guile-2.2))) (arguments - (substitute-keyword-arguments (package-arguments guile-email) + (substitute-keyword-arguments arguments ((#:make-flags make-flags '()) #~(cons "guile_effective_version=2.2" #$make-flags)))))) @@ -2591,7 +2591,7 @@ It currently supports MySQL, Postgres and SQLite3.") (inherit guile-dbi) (name "guile-dbd-sqlite3") (arguments - (substitute-keyword-arguments (package-arguments guile-dbi) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (replace 'chdir @@ -2616,7 +2616,7 @@ SQL databases. This package implements the interface for SQLite."))) (inherit guile-dbi) (name "guile-dbd-postgresql") (arguments - (substitute-keyword-arguments (package-arguments guile-dbi) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (replace 'chdir @@ -2646,7 +2646,7 @@ PostgreSQL."))) (inherit guile-dbi) (name "guile-dbd-mysql") (arguments - (substitute-keyword-arguments (package-arguments guile-dbi) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (replace 'chdir @@ -4155,7 +4155,7 @@ inspired by the SCSH regular expression system.") (inherit guile-irregex) (name "guile2.0-irregex") (arguments - (substitute-keyword-arguments (package-arguments guile-irregex) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases ;; For some reason guile 2.0 cannot load foo.scm using diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index a31d8e50257..77cc2f9b538 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -687,7 +687,7 @@ GNU@tie{}Guile. Use the @code{(ice-9 readline)} module and call its (base32 "0xfnd99iws9dwk5va8bmqpysmb8pnb1w91rw7rbfzzklyfvpibh6")))) (arguments - (substitute-keyword-arguments (package-arguments guile-next) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(cons* #$(string-append diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 32b6fe9a058..4aa17d1718d 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1563,7 +1563,7 @@ interactive environment for the functional language Haskell.") (patches (search-patches "ghc-9.2-cabal-support-package-path.patch" "ghc-9-StgCRunAsm-only-when-needed.patch")))) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases '%standard-phases) #~(modify-phases #$phases ;; File Common.hs has been moved to src/ in this release. @@ -1706,7 +1706,7 @@ SRC_HC_OPTS += -optc-mno-outline-atomics "1qk7rlqf02s3b6m6sqqngmjq1mxnrz88h159lz6k25gddmdg5kp8")) (patches (search-patches "ghc-9-StgCRunAsm-only-when-needed.patch")))) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases '%standard-phases) #~(modify-phases #$phases ;; Files don’t exist any more. diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 35d13c80aa7..44908653c8d 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -201,7 +201,7 @@ Library and other user programs.") (name "hurd-minimal") (inputs (list glibc/hurd-headers gnumach-headers)) (arguments - (substitute-keyword-arguments (package-arguments hurd-headers) + (substitute-keyword-arguments arguments ((#:make-flags flags '()) #~'(#$(string-append "lib-subdirs=libshouldbeinlibc libihash libstore") "prog-subdirs=" @@ -224,7 +224,7 @@ Library, Parted and netdde for GNU/Hurd.") (package (inherit hurd-headers) (name "libirqhelp") (arguments - (substitute-keyword-arguments (package-arguments hurd-headers) + (substitute-keyword-arguments arguments ((#:make-flags flags '()) #~'(#$(string-append "lib-subdirs=libirqhelp") "prog-subdirs=" @@ -277,7 +277,7 @@ Hurd-minimal package which are needed for both glibc and GCC.") (inherit gnumach-headers) (name "gnumach") (arguments - (substitute-keyword-arguments (package-arguments gnumach-headers) + (substitute-keyword-arguments arguments ((#:configure-flags flags ''()) `(cons* "--enable-kdb" ;enable kernel debugger "--disable-net-group" diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 2e0d4a87444..78ade07cb9c 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -236,7 +236,7 @@ may also simplify input method development.") (define-public ibus (package/inherit ibus-minimal (arguments - (substitute-keyword-arguments (package-arguments ibus-minimal) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons* "--enable-python-library" (delete "--disable-gtk4" #$flags))) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index dc040d02ade..68a7421b51d 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -209,7 +209,7 @@ C/C++ part.") (inherit icu4c) (name "icu4c-build-root") (arguments - (substitute-keyword-arguments (package-arguments icu4c) + (substitute-keyword-arguments arguments ((#:tests? _ #f) #f) ((#:out-of-source? _ #t) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index fb5cad2a7b8..c00a287c159 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -973,7 +973,7 @@ including 2D color images.") (inherit gmic) (name "gmic-qt") (arguments - (substitute-keyword-arguments (package-arguments gmic) + (substitute-keyword-arguments arguments ((#:configure-flags _) #~(list "-DGMIC_QT_HOST=none" "-DENABLE_DYNAMIC_LINKING=ON")) @@ -998,7 +998,7 @@ including 2D color images.") (modify-inputs (package-inputs gmic-qt) (prepend gexiv2 gdk-pixbuf gegl gimp pango))) (arguments - (substitute-keyword-arguments (package-arguments gmic-qt) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(list "-DGMIC_QT_HOST=gimp3" "-DENABLE_DYNAMIC_LINKING=ON")))) @@ -1370,7 +1370,7 @@ libraries designed for computer vision research and implementation.") (("add_subdirectory\\((tiff|png|jpeg|zlib|bzlib|geotiff)\\)") "")))))) (arguments - (substitute-keyword-arguments (package-arguments vxl) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons* ;; Needed for itk-snap "-DVNL_CONFIG_LEGACY_METHODS=ON" diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 06ad9be9114..b82e2b33e9a 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1715,7 +1715,7 @@ and XMP metadata of images in various formats.") (package (inherit exiv2) (arguments - (substitute-keyword-arguments (package-arguments exiv2) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (delete 'delete-static-libraries))))))) diff --git a/gnu/packages/instrumentation.scm b/gnu/packages/instrumentation.scm index 31b1497a07b..9e4003d8f9d 100644 --- a/gnu/packages/instrumentation.scm +++ b/gnu/packages/instrumentation.scm @@ -150,7 +150,7 @@ bindings, and the command-line tool @command{babeltrace2}.") (name "babeltrace-dev") (synopsis "Trace manipulation toolkit (variant for plugin developers)") (arguments - (substitute-keyword-arguments (package-arguments babeltrace) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (add-before 'configure 'set-environment-variables diff --git a/gnu/packages/java-bootstrap.scm b/gnu/packages/java-bootstrap.scm index 32f993496d5..426df8bcf24 100644 --- a/gnu/packages/java-bootstrap.scm +++ b/gnu/packages/java-bootstrap.scm @@ -612,7 +612,7 @@ machine."))) '(delete-file "src/classlib/gnuclasspath/lib/classes.zip")))) (build-system gnu-build-system) (arguments - (substitute-keyword-arguments (package-arguments jamvm-1-bootstrap) + (substitute-keyword-arguments arguments ((#:modules modules %default-gnu-modules) (append '((srfi srfi-1) (srfi srfi-26)) diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 79bb4fac488..e73f6e29249 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -1997,7 +1997,7 @@ valuable enough at this time.") (inherit julia-documenter) (name "julia-documenter-bootstrap") (arguments - (substitute-keyword-arguments (package-arguments julia-documenter) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (delete 'patch-source))) diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 384056c1b5c..20ce1522861 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -82,7 +82,7 @@ (julia-patch "libunwind-cfa-rsp" "0qs5b1h5lsr5qakkv6sddgy5ghlxpjrn2jiqcvg7bkczy24klr6j"))))) (arguments - (substitute-keyword-arguments (package-arguments libunwind) + (substitute-keyword-arguments arguments ;; Skip tests on this older and patched version of libunwind. ((#:tests? _ #t) #f))) (home-page "https://github.com/JuliaLang/julia/tree/master/deps/"))) diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm index 9879e4b7b4d..0f800d14bb3 100644 --- a/gnu/packages/jupyter.scm +++ b/gnu/packages/jupyter.scm @@ -591,7 +591,7 @@ installing @code{kernelspec}s for use with Jupyter frontends.") (package/inherit python-jupyter-client (name "python-jupyter-client-bootstrap") (arguments - (substitute-keyword-arguments (package-arguments python-jupyter-client) + (substitute-keyword-arguments arguments ((#:tests? _) #f))) (native-inputs (list python-hatchling))))) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index af6b9a9f9f3..484fd84215f 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1026,7 +1026,7 @@ as well as an API to create KDED modules.") (patches '()))) (inputs (modify-inputs (package-inputs kdbusaddons-5) (delete "kinit"))) (arguments - (substitute-keyword-arguments (package-arguments kdbusaddons-5) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (delete 'patch-source))))))) @@ -4146,7 +4146,7 @@ widgets with a user-interface defined in terms of actions.") (base32 "0czrlqh5cxnj1mlbz839c7hifhnpzl476d92lv4hxji50wnjlfqr")))) (arguments - (substitute-keyword-arguments (package-arguments kparts) + (substitute-keyword-arguments arguments ((#:qtbase _ #f) qtbase-5))) (propagated-inputs (list kio-5 ktextwidgets-5 kxmlgui-5)) diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index b5f9e959bc1..7860cff9e12 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -509,7 +509,7 @@ plug-in system.") (inherit kodi) (name "kodi-wayland") (arguments - (substitute-keyword-arguments (package-arguments kodi) + (substitute-keyword-arguments arguments ((#:configure-flags flags) `(cons "-DCORE_PLATFORM_NAME=wayland" (delete "-DCORE_PLATFORM_NAME=x11" ,flags))))) diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index 54489d36da6..b3f94d3fc45 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -93,7 +93,7 @@ conversions for values passed between the two languages.") (hidden-package (package/inherit libffi (arguments - (substitute-keyword-arguments (package-arguments libffi) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(append #$flags '("--disable-exec-static-tramp")))))))) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5310d1bd9b1..73d1ce13d1e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2099,7 +2099,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-pocket-reform.dtb"))))))))))) (description (string-append (package-description base) " Configuration options and patches have been applied for use with MNT/Reform systems.")) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'apply-reform-patches @@ -2434,7 +2434,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-pocket-reform.dtb"))))))))))) (description (string-append (package-description base) " Configuration options and patches have been applied for use with MNT/Reform systems.")) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'apply-reform-patches @@ -4124,7 +4124,7 @@ module.") (package (inherit e2fsprogs) (arguments ;; Do not build shared libraries. - (substitute-keyword-arguments (package-arguments e2fsprogs) + (substitute-keyword-arguments arguments ((#:configure-flags _) '(list "--disable-blkid" "--disable-fuse2fs")) ((#:make-flags _) @@ -5368,7 +5368,7 @@ user-space processes.") (sha256 (base32 "11yfl2w2a445hllyzlakq97n32g06972vxpmh7lpbclnj9fhb5zp")))) (arguments - (substitute-keyword-arguments (package-arguments fuse) + (substitute-keyword-arguments arguments ((#:configure-flags original-flags #~(list)) #~(append #$original-flags '("--default-library=static"))))))) @@ -5430,7 +5430,7 @@ UnionFS-FUSE additionally supports copy-on-write.") (("mtab_needs_update[[:blank:]]*\\([a-z_]+\\)") "0") (("/bin/") "")))))) (arguments - (substitute-keyword-arguments (package-arguments fuse) + (substitute-keyword-arguments arguments ((#:configure-flags flags '()) #~(cons "-Ddefault_library=static" #$flags)))))) @@ -5451,7 +5451,7 @@ UnionFS-FUSE additionally supports copy-on-write.") (string-append "target_link_libraries" libs " dl)"))))))) (arguments - (substitute-keyword-arguments (package-arguments unionfs-fuse) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(cons "-DCMAKE_EXE_LINKER_FLAGS=-static" #$flags)) ((#:phases phases #~%standard-phases) @@ -5663,7 +5663,7 @@ for systems using the Linux kernel. This includes commands such as (inherit kbd) (name "loadkeys-static") (arguments - (substitute-keyword-arguments (package-arguments kbd) + (substitute-keyword-arguments arguments ((#:configure-flags flags ''()) `(append '("LDFLAGS=-static" "--disable-shared" "--disable-nls" "--disable-vlock" ;so we don't need libpam @@ -6154,7 +6154,7 @@ mapper. Kernel components are part of Linux-libre.") ("udev:static" ,eudev "static"))) (arguments - (substitute-keyword-arguments (package-arguments lvm2) + (substitute-keyword-arguments arguments ((#:configure-flags flags '()) ;; LVM2 doesn't use Libtool, hence the custom option. `(append '("--enable-static_link") @@ -6573,7 +6573,7 @@ SMBus access.") (sha256 (base32 "0hd4c1w8lnwc3j95h3vpd125170l1d4myspyrlpamqx6wbr6jpnv")))) (arguments - (substitute-keyword-arguments (package-arguments i2c-tools) + (substitute-keyword-arguments arguments ((#:make-flags _) #~(list (string-append "prefix=" #$output) (string-append "CC=" #$(cc-for-target)))))))) @@ -7255,7 +7255,7 @@ arrays when needed.") (inherit mdadm) (name "mdadm-static") (arguments - (substitute-keyword-arguments (package-arguments mdadm) + (substitute-keyword-arguments arguments ((#:make-flags flags) #~(cons* "LDFLAGS = -static" "CXFLAGS = -DNO_LIBUDEV" @@ -8385,7 +8385,7 @@ The package provides additional NTFS tools.") (inherit ntfs-3g) (name "ntfs-3g-static") (arguments - (substitute-keyword-arguments (package-arguments ntfs-3g) + (substitute-keyword-arguments arguments ((#:configure-flags flags) `(append ,flags (list "--enable-really-static" @@ -10256,7 +10256,7 @@ available in the kernel Linux.") "Unprivileged chroot, bind mount, and binfmt_misc (statically linked)") (inputs `(("talloc" ,talloc/static))) (arguments - (substitute-keyword-arguments (package-arguments proot) + (substitute-keyword-arguments arguments ((#:make-flags flags) `(cons "LDFLAGS = -ltalloc -static -static-libgcc" ,flags)) ((#:phases phases) @@ -11101,7 +11101,7 @@ file systems.") (base32 "13xkn9jpmwp4fm9r68vhgznkmxhnv83n2b39mhy2qdaph90w2a1l")))) (arguments - (substitute-keyword-arguments (package-arguments xfsprogs) + (substitute-keyword-arguments arguments ((#:configure-flags configure-flags '()) `(cons "--enable-gettext=no" ,configure-flags)))) @@ -11115,7 +11115,7 @@ file systems.") (name "xfsprogs-static") (outputs (list "out")) (arguments - (substitute-keyword-arguments (package-arguments xfsprogs) + (substitute-keyword-arguments arguments ((#:configure-flags configure-flags '()) `(append ,configure-flags (list "--enable-static"))) @@ -11618,7 +11618,7 @@ tools for managing PipeWire.") (inherit base) (name "wireplumber-minimal") (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:configure-flags flags ''()) #~(cons "-Delogind=disabled" #$flags)))) (inputs @@ -12648,7 +12648,7 @@ work properly.") firejail (name "firejail-disable-sandbox-check") (arguments - (substitute-keyword-arguments (package-arguments firejail) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(append #$flags (list "--disable-sandbox-check"))))) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 92fad7b5fcc..8f71775d12c 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -1076,7 +1076,7 @@ portable between implementations.") (inherit pkg) (outputs '("out")) (arguments - (substitute-keyword-arguments (package-arguments pkg) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (delete 'build-doc)))))))) @@ -1087,7 +1087,7 @@ portable between implementations.") (inherit pkg) (outputs '("out")) (arguments - (substitute-keyword-arguments (package-arguments pkg) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (delete 'build-doc)))))))) @@ -1314,7 +1314,7 @@ computer known.") (package (inherit pkg) (arguments - (substitute-keyword-arguments (package-arguments pkg) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'fix-readtable @@ -4170,7 +4170,7 @@ and a core image.") (inherit pkg) (outputs '("out")) (arguments - (substitute-keyword-arguments (package-arguments pkg) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (delete 'build-image)))))))) @@ -9144,7 +9144,7 @@ pure Common Lisp.") (package (inherit pkg) (arguments - (substitute-keyword-arguments (package-arguments pkg) + (substitute-keyword-arguments arguments ;; Tests are failing on ECL with: ;; PCG.TEST::TEST-REWINDAn error occurred during initialization: ;; 40502229875678917802724098623316930025 is not of type @@ -9922,7 +9922,7 @@ Redis data structure store.") (package (inherit pkg) (arguments - (substitute-keyword-arguments (package-arguments pkg) + (substitute-keyword-arguments arguments ;; Tests are failing on ECL with: ;; Test L-COMMANDS: An error occurred during initialization: ;; Protocol not found: "tcp". @@ -10041,7 +10041,7 @@ versioning specification: @url{http://semver.org}.") (package (inherit pkg) (arguments - (substitute-keyword-arguments (package-arguments pkg) + (substitute-keyword-arguments arguments ;; TODO: https://github.com/cldm/cl-semver/issues/9 ((#:tests? _ #f) #f)))))) @@ -10351,7 +10351,7 @@ Development into CL+SSL was done by David Lichteblau.") (modify-inputs (package-native-inputs pkg) (delete "sbcl-trivial-sockets"))) (arguments - (substitute-keyword-arguments (package-arguments pkg) + (substitute-keyword-arguments arguments ((#:tests? _ #f) #f)))))) (define-public sbcl-cl-steamworks @@ -11040,7 +11040,7 @@ Common Lisp objects while constructing bindings for placeholders (package (inherit pkg) (arguments - (substitute-keyword-arguments (package-arguments pkg) + (substitute-keyword-arguments arguments ;; The tests fail on ECL with: ;; "In MAKE-ARRAY: the elements in :INITIAL-CONTENTS do not match ;; the array dimensions." @@ -12629,7 +12629,7 @@ interfaces as well as a functional and an object oriented interface.") (inputs (alist-delete "uffi" (package-inputs pkg))) (arguments - (substitute-keyword-arguments (package-arguments pkg) + (substitute-keyword-arguments arguments ((#:asd-systems asd-systems '()) `(cons "clsql-cffi" ,asd-systems))))))) @@ -13248,7 +13248,7 @@ interface is meant to be easy and non-intrusive.") (package (inherit pkg) (arguments - (substitute-keyword-arguments (package-arguments pkg) + (substitute-keyword-arguments arguments ;; The tests only work on SBCL. ((#:tests? _ #f) #f)))))) @@ -18620,7 +18620,7 @@ type correctness in Common Lisp. It is based on CLtL2 extensions.") (package (inherit pkg) (arguments - (substitute-keyword-arguments (package-arguments pkg) + (substitute-keyword-arguments arguments ;; The tests fail on ECL with a COMPILE-FILE-ERROR for t/package.lisp. ((#:tests? _ #f) #f)))))) @@ -22852,7 +22852,7 @@ specification}, a toolkit for writing GUIs in Common Lisp.") (package (inherit pkg) (arguments - (substitute-keyword-arguments (package-arguments pkg) + (substitute-keyword-arguments arguments ;; Tests fail with "FUNCTION: Not a valid argument (R1 ;; (GENERATE-REGION))." on ECL. ((#:tests? _ #f) #f)))))) @@ -23701,7 +23701,7 @@ library for Ruby, which is itself based on the Lucene library for Java.") (package (inherit pkg) (arguments - (substitute-keyword-arguments (package-arguments pkg) + (substitute-keyword-arguments arguments ;; Tests fail with "Pathname without a physical namestring" error ;; on ECL. ((#:tests? _ #f) #f)))))) @@ -30036,7 +30036,7 @@ multiple inspectors with independent history.") (inherit pkg) (outputs '("out")) (arguments - (substitute-keyword-arguments (package-arguments pkg) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (delete 'build-image)))))))) @@ -30047,7 +30047,7 @@ multiple inspectors with independent history.") (inherit pkg) (outputs '("out")) (arguments - (substitute-keyword-arguments (package-arguments pkg) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (delete 'build-image)))))))) @@ -31758,7 +31758,7 @@ roman numeral given in the key.") (inherit ecl-package) (outputs '("out")) (arguments - (substitute-keyword-arguments (package-arguments ecl-package) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (delete 'build-binary)))))))) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index c893e84e799..a0447fcc8fe 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -882,7 +882,7 @@ Library.") "07zby3gwy5c8jssabrhjk3nsxlwipnm6sk4dsvck1l5d0br1ywsg")) (file-name (string-append "libomp-" version ".tar.xz")))) (arguments - (substitute-keyword-arguments (package-arguments libomp-15) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (replace 'chdir-to-source-and-install-license @@ -911,7 +911,7 @@ Library.") "0d681xiixmx9inwvz14vi3xsznrcryk06a8rvk9cljiq5kc80szc")) (patches (search-patches "llvm-13-gcc-14.patch")))) (arguments - (substitute-keyword-arguments (package-arguments llvm-14) + (substitute-keyword-arguments arguments ((#:tests? _ #t) ;; The tests on riscv64 error on the differences between ;; generic and generic-rv64. @@ -956,7 +956,7 @@ Library.") "0kvbr4j6ldpssiv7chgqra5y77n7jwbyxlwcl7z32v31f49jcybb")) (file-name (string-append "libomp-" version ".tar.xz")))) (arguments - (substitute-keyword-arguments (package-arguments libomp-14) + (substitute-keyword-arguments arguments ((#:configure-flags flags) ;; Work around faulty target detection, fixed in 14: ;; https://github.com/llvm/llvm-project/issues/52910 @@ -985,7 +985,7 @@ Library.") "1pzx9zrmd7r3481sbhwvkms68fwhffpp4mmz45dgrkjpyl2q96kx")) (patches (search-patches "llvm-13-gcc-14.patch")))) (arguments - (substitute-keyword-arguments (package-arguments llvm-13) + (substitute-keyword-arguments arguments ;; Disable tests for old releases now compiled with newer GCC. ((#:tests? _ #false) #false) ((#:phases phases) @@ -1042,7 +1042,7 @@ Library.") "14dh0r6h2xh747ffgnsl4z08h0ri04azi9vf79cbz7ma1r27kzk0")) (file-name (string-append "libomp-" version ".tar.xz")))) (arguments - (substitute-keyword-arguments (package-arguments libomp-13) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~`(,@(delete "-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF" #$flags))))) (native-inputs @@ -1122,7 +1122,7 @@ Library.") (version "18.1.8") (source (llvm-monorepo version)) (arguments - (substitute-keyword-arguments (package-arguments llvm-15) + (substitute-keyword-arguments arguments ((#:modules modules '((guix build cmake-build-system) (guix build utils))) (if (%current-target-system) @@ -1409,7 +1409,7 @@ Library.") "clang-rocm-default-new-dtags.patch" (assoc-ref %llvm-patches (package-version llvm-base))))))) (arguments - (substitute-keyword-arguments (package-arguments llvm-base) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(append #$flags (list "-DLLVM_TARGETS_TO_BUILD=AMDGPU;X86" @@ -1452,7 +1452,7 @@ This AMD fork includes AMD-specific additions.")))) (replace "clang-runtime" clang-runtime-rocm) (append python-lit))) (arguments - (substitute-keyword-arguments (package-arguments clang-base) + (substitute-keyword-arguments arguments ;; The tests can be run, as allowed by check phase rewrite and ;; LLVM_EXTERNAL_LIT setting. However, 84/46171 are failing. Most ;; should probably be disabled. @@ -2102,7 +2102,7 @@ generator targetting AMD hardware.") (source (package-source llvm-rocm)) (inputs (list llvm-rocm)) (arguments - (substitute-keyword-arguments (package-arguments lld-base) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(append #$flags '("-DLLVM_TARGETS_TO_BUILD=AMDGPU;X86"))))))) @@ -2121,7 +2121,7 @@ generator targetting AMD hardware.") (version (package-version llvm-rocm)) (source (package-source llvm-rocm)) (arguments - (substitute-keyword-arguments (package-arguments libomp-20) + (substitute-keyword-arguments arguments ((#:configure-flags flags '()) #~(cons (string-append "-DOPENMP_LIT_ARGS=" @@ -2210,7 +2210,7 @@ the host.") rocr-runtime rocm-device-libs))) (arguments - (substitute-keyword-arguments (package-arguments clang-rocm-toolchain) + (substitute-keyword-arguments arguments ((#:builder _) #~(begin (use-modules (ice-9 match) @@ -2326,7 +2326,7 @@ using @code{clang-rename}."))) (inherit base-llvm) (name "llvm-for-mesa") (arguments - (substitute-keyword-arguments (package-arguments base-llvm) + (substitute-keyword-arguments arguments ((#:modules modules '((guix build cmake-build-system) (guix build utils))) `((ice-9 regex) @@ -2463,7 +2463,7 @@ LLVM bitcode files.") (package (inherit llvm-13) (arguments - (substitute-keyword-arguments (package-arguments llvm-13) + (substitute-keyword-arguments arguments ((#:configure-flags flags ''()) #~(cons* "-DLLVM_BUILD_LLVM_DYLIB=ON" "-DLLVM_LINK_LLVM_DYLIB=ON" @@ -2500,7 +2500,7 @@ LLVM bitcode files.") ;; This reduces the package size on disk from 547 MiB to 311 MiB. ;; Cling is intended to be used as a REPL on the host machine, not as a ;; cross-compiling toolchain. - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:configure-flags cf ''()) #~(cons* "-DLLVM_TARGETS_TO_BUILD=host;NVPTX" #$cf))))))) @@ -2511,7 +2511,7 @@ LLVM bitcode files.") (version (package-version llvm-cling)) (source (package-source llvm-cling)) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases '%standard-phases) #~(modify-phases #$phases (add-after 'install 'delete-static-libraries @@ -2785,7 +2785,7 @@ required to build Swift.") "00bpplh8zd495n7dw5a64ncy23r2sgj7071kyhw7r9s53ihw1k1m")) (patches (search-patches "clang-18.0-libc-search-path.patch")))) (arguments - (substitute-keyword-arguments (package-arguments swift-llvm) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "-DUSE_DEPRECATED_GCC_INSTALL_PREFIX=ON" #$flags)) ((#:phases phases) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 6a09a838140..5de59de4bb4 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -152,7 +152,7 @@ for configuration, scripting, and rapid prototyping.") (package (inherit lua) (version "5.4.8") (arguments - (substitute-keyword-arguments (package-arguments lua) + (substitute-keyword-arguments arguments ((#:make-flags flags) (append (delete "linux" flags) '("linux-readline"))))) diff --git a/gnu/packages/luanti.scm b/gnu/packages/luanti.scm index 4726bf3a5ee..d0f0463baff 100644 --- a/gnu/packages/luanti.scm +++ b/gnu/packages/luanti.scm @@ -157,7 +157,7 @@ sources.") (inherit luanti) (name "luanti-server") (arguments - (substitute-keyword-arguments (package-arguments luanti) + (substitute-keyword-arguments arguments ((#:configure-flags configure-flags) #~(cons* "-DBUILD_CLIENT=FALSE" "-DBUILD_SERVER=TRUE" @@ -238,7 +238,7 @@ new features.") (sha256 (base32 "1qk98kzjv748f0aak8k20nxkqa7wbxwj3qjd4ks08ab9apgwzlps")))) (arguments - (substitute-keyword-arguments (package-arguments luanti) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'disable-development-build @@ -507,7 +507,7 @@ complicated to maintain.") (package/inherit luanti-mineclonia (name "luanti-mineclonia-csm") (arguments - (substitute-keyword-arguments (package-arguments luanti-mineclonia) + (substitute-keyword-arguments arguments ((#:phases phases '%standard-phases) #~(modify-phases #$phases (add-after 'unpack 'enable-csm-support diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index dcf8cc728d5..bb0f35828d4 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -2573,7 +2573,7 @@ data analysis.") (sha256 (base32 "08z1b58n31grfvl42wi6rdwrfhrdhnzkkxhg19iag3zkvkcvxqjl")))) (arguments - (substitute-keyword-arguments (package-arguments python-scikit-learn) + (substitute-keyword-arguments arguments ((#:test-flags flags) #~(list "--numprocesses" (number->string (min 8 (parallel-job-count))) "-m" "not network" @@ -4928,7 +4928,7 @@ PyTorch.") (chdir outdir) (delete-file-recursively "deps")))))) (arguments - (substitute-keyword-arguments (package-arguments qnnpack) + (substitute-keyword-arguments arguments ((#:phases phases #~%standard-phases) #~(modify-phases %standard-phases (add-after 'unpack 'patch-cmake @@ -5395,7 +5395,7 @@ in the audio domain.") (modify-inputs (package-inputs python-pytorch) (append fbgemm nnpack))) (arguments - (substitute-keyword-arguments (package-arguments python-pytorch) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (delete 'disable-avx-dependencies))))) @@ -5435,7 +5435,7 @@ in the audio domain.") (modify-inputs (package-inputs python-pytorch) (replace "gloo" gloo-for-r-torch))) (arguments - (substitute-keyword-arguments (package-arguments python-pytorch) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (replace 'use-system-libraries diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 16a20271421..5368a092c70 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -79,7 +79,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (_ "glibc-bootstrap-system.patch"))) (origin-patches (package-source base)))))) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:configure-flags flags) ;; Arrange so that getaddrinfo & co. do not contact the nscd, ;; and can use statically-linked NSS modules. @@ -187,7 +187,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (bzip2 (package (inherit bzip2) (arguments - (substitute-keyword-arguments (package-arguments bzip2) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-before 'build 'dash-static @@ -222,7 +222,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (origin-patches (package-source gawk)))))) (arguments - (substitute-keyword-arguments (package-arguments gawk) + (substitute-keyword-arguments arguments ((#:configure-flags _ #~'()) ;; Starting from gawk 4.1.0, some of the tests for the ;; plug-in mechanism just fail on static builds: @@ -245,7 +245,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (tar (package (inherit tar) (arguments - (substitute-keyword-arguments (package-arguments tar) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) ;; Work around a cross-compilation bug whereby libgnu.a ;; would provide '__mktime_internal', which conflicts @@ -268,7 +268,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (inherit grep) (inputs '()) ;remove PCRE, which is optional (arguments - (substitute-keyword-arguments (package-arguments grep) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(cons "--disable-perl-regexp" (delete "--enable-perl-regexp" #$flags))) @@ -481,7 +481,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (name "gcc-static") (outputs '("out")) ; all in one (arguments - (substitute-keyword-arguments (package-arguments gcc-14) + (substitute-keyword-arguments arguments ((#:modules modules %default-gnu-modules) `((srfi srfi-1) (srfi srfi-26) @@ -625,7 +625,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (replace "libgc" libgc/static-libs))) (arguments - (substitute-keyword-arguments (package-arguments guile) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) ;; When `configure' checks for ltdl availability, it ;; doesn't try to link using libtool, and thus fails diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index a2223146982..6b2d51f4851 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1226,7 +1226,7 @@ large scale eigenvalue problems.") (modify-inputs (package-inputs arpack-ng) (prepend openmpi))) (arguments - (substitute-keyword-arguments (package-arguments arpack-ng) + (substitute-keyword-arguments arguments ((#:configure-flags _ #~()) #~'("-DMPI=ON")) ((#:phases phases #~%standard-phases) @@ -2153,7 +2153,7 @@ Interface to wrap the HDF5 library, which is implemented in C.") (inputs (modify-inputs (package-inputs hdf5) (prepend openmpi))) (arguments - (substitute-keyword-arguments (package-arguments hdf5) + (substitute-keyword-arguments arguments ((#:configure-flags flags '()) #~(append (filter (lambda (flag) (not @@ -2459,7 +2459,7 @@ sharing of scientific data.") (replace "hdf5" hdf5-parallel-openmpi))) ;; TODO: Replace pkg-config references in nc-config with absolute references (arguments - (substitute-keyword-arguments (package-arguments netcdf) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons* "CC=mpicc" "CXX=mpicxx" @@ -3495,7 +3495,7 @@ script files.") ("texlive" ,(texlive-local-tree (list texlive-epsf))) ; for texi2dvi ,@(package-native-inputs octave-cli))) (arguments - (substitute-keyword-arguments (package-arguments octave-cli) + (substitute-keyword-arguments arguments ((#:modules modules %default-gnu-modules) `((guix build qt-utils) ,@modules)) ((#:imported-modules imported-modules %default-gnu-imported-modules) @@ -4097,7 +4097,7 @@ scientific applications modeled by partial differential equations.") (inherit petsc) (name "petsc-complex") (arguments - (substitute-keyword-arguments (package-arguments petsc) + (substitute-keyword-arguments arguments ((#:configure-flags cf) #~(cons "--with-scalar-type=complex" #$cf)))) (synopsis "Library to solve PDEs (with complex scalars)"))) @@ -4117,7 +4117,7 @@ scientific applications modeled by partial differential equations.") pt-scotch32 `(,pt-scotch32 "metis")))) (arguments - (substitute-keyword-arguments (package-arguments petsc) + (substitute-keyword-arguments arguments ((#:configure-flags cf) #~`("--with-hypre=1" "--with-mpiexec=mpirun" @@ -4157,7 +4157,7 @@ scientific applications modeled by partial differential equations.") (modify-inputs (package-inputs petsc-complex) (prepend openmpi))) (arguments - (substitute-keyword-arguments (package-arguments petsc-complex) + (substitute-keyword-arguments arguments ((#:configure-flags cf) #~`("--with-mpiexec=mpirun" ,(string-append "--with-mpi-dir=" @@ -4839,7 +4839,7 @@ arising after the discretization of partial differential equations.") (package (inherit slepc) (name "slepc-openmpi") (arguments - (substitute-keyword-arguments (package-arguments slepc) + (substitute-keyword-arguments arguments ((#:phases phases '%standard-phases) `(modify-phases ,phases (add-before 'check 'mpi-setup @@ -5212,7 +5212,7 @@ sparse system of linear equations A x = b using Gaussian elimination.") (delete "scotch") (prepend openmpi scalapack pt-scotch))) (arguments - (substitute-keyword-arguments (package-arguments mumps) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (add-before 'check 'mpi-setup @@ -5478,7 +5478,7 @@ bio-chemistry.") (inherit scotch) (name "scotch32") (arguments - (substitute-keyword-arguments (package-arguments scotch) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~'("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=OFF" "-DINTSIZE=32")))) (synopsis @@ -5491,7 +5491,7 @@ bio-chemistry.") (propagated-inputs (list openmpi)) ;headers include MPI headers (arguments - (substitute-keyword-arguments (package-arguments scotch) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~'("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=ON" "-DINTSIZE=64")) ((#:phases phases #~%standard-phases) @@ -5507,7 +5507,7 @@ bio-chemistry.") (propagated-inputs (list openmpi)) ;headers include MPI headers (arguments - (substitute-keyword-arguments (package-arguments pt-scotch) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~'("-DBUILD_SHARED_LIBS=YES" "-DBUILD_PTSCOTCH=ON" "-DINTSIZE=32")))) (synopsis @@ -5783,7 +5783,7 @@ point numbers.") (delete "sbcl") (prepend ecl))) (arguments - (substitute-keyword-arguments (package-arguments maxima) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(list "--enable-ecl")) ((#:phases phases) @@ -6036,7 +6036,7 @@ from the GotoBLAS2-1.13 BSD version.") (name "openblas-ilp64") (supported-systems %64bit-supported-systems) (arguments - (substitute-keyword-arguments (package-arguments openblas) + (substitute-keyword-arguments arguments ((#:make-flags flags #~'()) ;; These should be '64' but julia hardcodes '64_'. #~(append (list "INTERFACE64=1" @@ -6648,7 +6648,7 @@ COLAMD which has the the option to apply constraints to the ordering.") "gklib-suitesparse.patch") (origin-patches (package-source gklib)))))) (arguments - (substitute-keyword-arguments (package-arguments gklib) + (substitute-keyword-arguments arguments ((#:phases phases #~%standard-phases) #~(modify-phases #$phases (add-after 'unpack 'patch-cmake @@ -7876,7 +7876,7 @@ problems.") (inputs (modify-inputs (package-inputs hypre) (prepend openmpi))) (arguments - (substitute-keyword-arguments (package-arguments hypre) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~`("--with-MPI" ,@(delete "--without-MPI" #$flags))) ((#:phases phases) @@ -8529,7 +8529,7 @@ symmetric matrices.") (modify-inputs (package-inputs elpa) (prepend openmpi scalapack zlib))) (arguments - (substitute-keyword-arguments (package-arguments elpa) + (substitute-keyword-arguments arguments ((#:configure-flags cf #~()) #~(cons "--with-mpi=yes" (delete "--with-mpi=no" #$cf))) @@ -8780,7 +8780,7 @@ easily be incorporated into existing simulation codes.") hypre-openmpi petsc-openmpi)) (arguments - (substitute-keyword-arguments (package-arguments sundials) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~()) #~(cons* "-DENABLE_MPI:BOOL=ON" "-DENABLE_HYPRE:BOOL=ON" @@ -9418,7 +9418,7 @@ built on top of DUNE, the Distributed and Unified Numerics Environment.") (inputs (modify-inputs (package-inputs p) (append openmpi))) (arguments - (substitute-keyword-arguments (package-arguments p) + (substitute-keyword-arguments arguments ((#:phases phases '%standard-phases) `(modify-phases ,phases (add-before 'check 'mpi-setup @@ -10011,7 +10011,7 @@ true in all models.") (sha256 (base32 "1zznrlj4zp1mc7s4pfw11aq773q2lr9yl6pph630zg5mqijaim5g")))) (arguments - (substitute-keyword-arguments (package-arguments cadiback) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'patch-build-files 'fix-prefix diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index a7d4c859b6b..52ad3dbf636 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -575,7 +575,7 @@ tool. This package contains the Maven parent POM.") (package (inherit base) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (delete 'install-plugins) @@ -588,7 +588,7 @@ tool. This package contains the Maven parent POM.") (package (inherit base) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (delete 'install-plugins) @@ -606,7 +606,7 @@ tool. This package contains the Maven parent POM.") (package (inherit base) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (delete 'install-plugins) diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index 183de8eb40b..ecd0433b088 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -1695,7 +1695,7 @@ process.")))) (package (inherit maven-core-bootstrap) (arguments - (substitute-keyword-arguments (package-arguments maven-core-bootstrap) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (add-before 'build 'modify-metainf @@ -2693,7 +2693,7 @@ reporting or the build process."))) (version (package-version maven-3.0-pom)) (source (package-source maven-3.0-pom)) (arguments - (substitute-keyword-arguments (package-arguments maven-settings-builder) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (add-before 'build 'generate-components.xml @@ -2723,7 +2723,7 @@ reporting or the build process."))) (version (package-version maven-3.0-pom)) (source (package-source maven-3.0-pom)) (arguments - (substitute-keyword-arguments (package-arguments maven-model-builder) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (add-before 'build 'generate-components.xml @@ -2755,7 +2755,7 @@ reporting or the build process."))) (version (package-version maven-3.0-pom)) (source (package-source maven-3.0-pom)) (arguments - (substitute-keyword-arguments (package-arguments maven-plugin-api) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (add-before 'install 'fix-pom @@ -2932,7 +2932,7 @@ reporting or the build process."))) (source (package-source maven-3.0-pom)) (arguments `(#:tests? #f ;require an old version of java-easymock - ,@(substitute-keyword-arguments (package-arguments maven-compat) + ,@(substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (add-before 'install 'fix-pom @@ -3215,7 +3215,7 @@ Maven project dependencies.") (base32 "1cl1qk4r0gp62bjzfm7lml9raz1my2kd4yf0ci0lnfsn0h5qivnb")))) (arguments - (substitute-keyword-arguments (package-arguments maven-common-artifact-filters) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (delete 'fix-aether) diff --git a/gnu/packages/medical.scm b/gnu/packages/medical.scm index fda579e1ee0..c4d2be640d9 100644 --- a/gnu/packages/medical.scm +++ b/gnu/packages/medical.scm @@ -358,7 +358,7 @@ Medicine} server instead of SQLite.") (package/inherit orthanc-mysql (name "orthanc-mariadb") (arguments - (substitute-keyword-arguments (package-arguments orthanc-mysql) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (replace 'check @@ -440,7 +440,7 @@ GUI application (@code{xmedcon}).") (package/inherit xmedcon (name "xmedcon-minimal") (arguments - (substitute-keyword-arguments (package-arguments xmedcon) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(append (list "--disable-glib" "--disable-gui") #$flags)))) (inputs (modify-inputs (package-inputs xmedcon) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index cc82c8ae4df..d26e04dfa66 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -702,7 +702,7 @@ identi.ca and status.net).") (files (list (string-append "lib/purple-2") "lib/pidgin"))))) (arguments - (substitute-keyword-arguments (package-arguments bitlbee) + (substitute-keyword-arguments arguments ((#:phases phases '%standard-phases) `(modify-phases ,phases (replace 'configure ;add "--purple=1" diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 2e74fc1327c..657ce22d21e 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -168,7 +168,7 @@ (name "aw-client") (version "0.5.15") (arguments - (substitute-keyword-arguments (package-arguments aw-core) + (substitute-keyword-arguments arguments ((#:test-flags test-flags #~(list)) #~(list ;; Most likely requires the server to run. @@ -191,7 +191,7 @@ (name "aw-notify") (version "0.0.0") ;unreleased. (arguments - (substitute-keyword-arguments (package-arguments aw-core) + (substitute-keyword-arguments arguments ((#:tests? tests? #t) #f))) ;No tests. (synopsis "Notify library for ActivityWatch") @@ -203,7 +203,7 @@ (name "aw-qt") (version "0.1.0") (arguments - (substitute-keyword-arguments (package-arguments aw-core) + (substitute-keyword-arguments arguments ((#:phases phases #~%standard-phases) #~(modify-phases #$phases ;; (delete 'sanity-check) @@ -276,7 +276,7 @@ retrieval of all your quantified self data.") (name "aw-watcher-afk") (version "0.2.0") (arguments - (substitute-keyword-arguments (package-arguments aw-core) + (substitute-keyword-arguments arguments ((#:tests? tests? #t) #f) ;Most likely requires the server to run. ((#:test-backend _ #f) @@ -295,7 +295,7 @@ retrieval of all your quantified self data.") (name "aw-watcher-input") (version "0.1.0") (arguments - (substitute-keyword-arguments (package-arguments aw-core) + (substitute-keyword-arguments arguments ((#:tests? tests? #t) #f))) ;No tests. (propagated-inputs @@ -309,7 +309,7 @@ retrieval of all your quantified self data.") (name "aw-watcher-window") (version "0.2.0") (arguments - (substitute-keyword-arguments (package-arguments aw-core) + (substitute-keyword-arguments arguments ((#:tests? tests? #t) #f))) ;No tests. (propagated-inputs @@ -631,7 +631,7 @@ solution (client-side agent)") (name "zabbix-server") (outputs '("out" "front-end" "schema")) (arguments - (substitute-keyword-arguments (package-arguments zabbix-agentd) + (substitute-keyword-arguments arguments ((#:phases phases '%standard-phases) #~(modify-phases #$phases (add-after 'install 'install-front-end diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 72ba4ecd6aa..b6e76ceac6f 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -196,7 +196,7 @@ bind processes, and much more.") (append rocm-smi-lib) (delete "numactl"))) ;libnuma is no longer needed. (arguments - (substitute-keyword-arguments (package-arguments hwloc-1) + (substitute-keyword-arguments arguments ((#:configure-flags flags '()) #~(cons* (string-append "--with-opencl=" #$(this-package-input "opencl-icd-loader")) @@ -488,7 +488,7 @@ software vendors, application developers and computer science researchers.") (name "openmpi-c++") (outputs '("out")) (arguments - (substitute-keyword-arguments (package-arguments openmpi) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-mpi-cxx" #$flags)))) (synopsis "C++ bindings for MPI"))) @@ -512,7 +512,7 @@ software vendors, application developers and computer science researchers.") (guix build utils)) #:imported-modules `((guix build ant-build-system) ,@%default-gnu-imported-modules) - (substitute-keyword-arguments (package-arguments openmpi) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-mpi-java" #$flags)) ((#:make-flags flags ''()) @@ -541,7 +541,7 @@ software vendors, application developers and computer science researchers.") (package/inherit openmpi (name "openmpi-thread-multiple") (arguments - (substitute-keyword-arguments (package-arguments openmpi) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-mpi-thread-multiple" #$flags)))) (description "This version of Open@tie{}MPI has an implementation of @@ -747,7 +747,7 @@ modular framework for other derived implementations.") (append rdma-core) (append psm2))) (arguments - (substitute-keyword-arguments (package-arguments mpich) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(list "--disable-silent-rules" ;let's see what's happening "--enable-debuginfo" diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index b8e2bfc8f14..1cac72b22ad 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1782,7 +1782,7 @@ session can be interrupted and easily resumed at a later time.") (package (inherit non-sequencer) (name "non-session-manager") (arguments - (substitute-keyword-arguments (package-arguments non-sequencer) + (substitute-keyword-arguments arguments ((#:configure-flags flags) `(cons "--project=session-manager" (delete "--project=sequencer" ,flags))))) @@ -1803,7 +1803,7 @@ communicate with the session management daemon.") (package (inherit non-sequencer) (name "non-mixer") (arguments - (substitute-keyword-arguments (package-arguments non-sequencer) + (substitute-keyword-arguments arguments ((#:configure-flags flags) `(cons "--project=mixer" (delete "--project=sequencer" ,flags))))) @@ -1825,7 +1825,7 @@ studio.") (package (inherit non-sequencer) (name "non-timeline") (arguments - (substitute-keyword-arguments (package-arguments non-sequencer) + (substitute-keyword-arguments arguments ((#:configure-flags flags) `(cons "--project=timeline" (delete "--project=sequencer" ,flags))))) diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm index af88683ce6f..389ed9ec977 100644 --- a/gnu/packages/ncurses.scm +++ b/gnu/packages/ncurses.scm @@ -236,7 +236,7 @@ ncursesw library provides wide character support.") (package/inherit ncurses (name "ncurses-with-gpm") (arguments - (substitute-keyword-arguments (package-arguments ncurses) + (substitute-keyword-arguments arguments ((#:configure-flags cf) #~(cons (string-append "--with-gpm=" #$(this-package-input "gpm") @@ -250,7 +250,7 @@ ncursesw library provides wide character support.") (package/inherit ncurses (name "ncurses-with-tinfo") (arguments - (substitute-keyword-arguments (package-arguments ncurses) + (substitute-keyword-arguments arguments ((#:configure-flags cf) #~(cons "--with-termlib=tinfo" #$cf)))))) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 99f8843f083..5b47e94ebda 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -773,7 +773,7 @@ source files.") "deps/uv" "deps/zlib")))))) (arguments - (substitute-keyword-arguments (package-arguments node-bootstrap) + (substitute-keyword-arguments arguments ((#:configure-flags configure-flags) ''("--shared-cares" "--shared-libuv" @@ -998,7 +998,7 @@ fi" (package/inherit node-lts (name "libnode") (arguments - (substitute-keyword-arguments (package-arguments node-lts) + (substitute-keyword-arguments arguments ((#:configure-flags flags ''()) `(cons* "--shared" "--without-npm" ,flags)) ((#:phases phases '%standard-phases) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 904a1fb5576..daab1de4917 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2261,7 +2261,7 @@ module of this library is parameterised by the type of S-expressions.") (arguments `(#:ocaml ,ocaml-4.09 #:findlib ,ocaml4.09-findlib - ,@(substitute-keyword-arguments (package-arguments ocaml-csexp) + ,@(substitute-keyword-arguments arguments ((#:dune _) ocaml4.09-dune-bootstrap)))) (propagated-inputs `(("ocaml-result" ,ocaml4.09-result))))) @@ -2273,7 +2273,7 @@ module of this library is parameterised by the type of S-expressions.") (arguments `(#:ocaml ,ocaml-5.0 #:findlib ,ocaml5.0-findlib - ,@(substitute-keyword-arguments (package-arguments ocaml-csexp) + ,@(substitute-keyword-arguments arguments ((#:dune _) ocaml5.0-dune-bootstrap)))) (propagated-inputs `(("ocaml-result" ,ocaml5.0-result))))) @@ -3895,7 +3895,7 @@ and consumable.") (base32 "1z8mmk1idh9hjhh2b9rp5b1h8kmzcxhagqkw0pvxn6ykx1brskq1")))) (arguments - (substitute-keyword-arguments (package-arguments ocaml-sedlex) + (substitute-keyword-arguments arguments ((#:tests? _ #t) #f))) ; no tests (native-inputs '()))) diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm index 9b66987c722..2ecf5b9d1e9 100644 --- a/gnu/packages/onc-rpc.scm +++ b/gnu/packages/onc-rpc.scm @@ -92,7 +92,7 @@ IPv4 and IPv6. ONC RPC is notably used by the network file system (NFS).") (patches (search-patches "libtirpc-hurd.patch" "libtirpc-CVE-2021-46828.patch")))) (arguments - (substitute-keyword-arguments (package-arguments libtirpc) + (substitute-keyword-arguments arguments ((#:configure-flags flags ''()) ;; When cross-building the target system's krb5-config should be used. #~(list (string-append "ac_cv_prog_KRB5_CONFIG=" diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index 68179ed2075..61341300062 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -139,7 +139,7 @@ (base32 "06qf8lcalvgzr3w1m697xrj12ikav5im00wjmxa62qdmsg5rvji1")))) (arguments - (substitute-keyword-arguments (package-arguments openldap) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(append (list #$(string-append "CFLAGS=-g -O2" diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 359880fcbff..f062e7e1c63 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -91,7 +91,7 @@ formatters, and other extensions.") (hidden-package (package/inherit python-cliff (arguments - (substitute-keyword-arguments (package-arguments python-cliff) + (substitute-keyword-arguments arguments ((#:tests? t? #t) #f) ((#:phases phases #~%standard-phases) @@ -249,7 +249,7 @@ is for some reason not possible and local caching of the fetched data.") (hidden-package (package/inherit python-os-service-types (arguments - (substitute-keyword-arguments (package-arguments python-os-service-types) + (substitute-keyword-arguments arguments ((#:tests? t? #t) #f) ((#:phases phases #~%standard-phases) @@ -352,7 +352,7 @@ extensions.") (hidden-package (package/inherit python-stevedore (arguments - (substitute-keyword-arguments (package-arguments python-stevedore) + (substitute-keyword-arguments arguments ((#:tests? t? #t) #f) ((#:phases phases #~%standard-phases) @@ -682,7 +682,7 @@ in an application or library.") (hidden-package (package/inherit python-oslo-i18n (arguments - (substitute-keyword-arguments (package-arguments python-oslo-i18n) + (substitute-keyword-arguments arguments ((#:tests? t? #t) #f) ((#:phases phases #~%standard-phases) @@ -739,7 +739,7 @@ handlers and support for context specific logging (like resource id’s etc).") (hidden-package (package/inherit python-oslo-log (arguments - (substitute-keyword-arguments (package-arguments python-oslo-log) + (substitute-keyword-arguments arguments ((#:tests? t? #t) #f) ((#:phases phases #~%standard-phases) @@ -865,7 +865,7 @@ for debugging, and better support for mocking results.") (hidden-package (package/inherit python-oslotest (arguments - (substitute-keyword-arguments (package-arguments python-oslotest) + (substitute-keyword-arguments arguments ((#:tests? t? #t) #f) ((#:phases phases #~%standard-phases) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 8a35f2064b2..5f173d9979c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -601,7 +601,7 @@ the Nix package manager.") (propagated-inputs '()) (arguments - (substitute-keyword-arguments (package-arguments guix) + (substitute-keyword-arguments arguments ((#:configure-flags flags '()) ;; Pretend we have those libraries; we don't actually need them. #~(append #$flags @@ -1908,7 +1908,7 @@ resolution compared to the classic solver.") (search-patches "conda-fix-plugin-settings-test.patch" "conda-fix-cross-platform-export-tests.patch")))) (arguments - (substitute-keyword-arguments (package-arguments conda-bootstrap) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases ;; Remove the patch that forces classic solver - we have libmamba @@ -2221,7 +2221,7 @@ outputs of those builds.") (inherit guix-build-coordinator) (name "guix-build-coordinator-agent-only") (arguments - (substitute-keyword-arguments (package-arguments guix-build-coordinator) + (substitute-keyword-arguments arguments ((#:phases phases #~%standard-phases) #~(modify-phases #$phases (add-after 'install 'strip-non-agent-files diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 18031885dc4..50baa27293f 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -328,7 +328,7 @@ minimal slurm package BASE-SLURM." (inherit base-slurm) (name "slurm") (arguments - (substitute-keyword-arguments (package-arguments base-slurm) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(cons* "--enable-slurmrestd" (string-append "--with-bpf=" @@ -761,7 +761,7 @@ commonly needed services in distributed and parallel computing systems.") ;; Remove ~5 MiB of pre-built HTML doc. (delete-file-recursively "docs/_build/html"))))) (arguments - (substitute-keyword-arguments (package-arguments openpmix) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(list (string-append "--with-hwloc=" (ungexp (this-package-input "hwloc") "lib")) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 95a5a4eaafb..ebd44d0ca34 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -1277,7 +1277,7 @@ using password-store through rofi interface: (inherit rofi-pass) (name "rofi-pass-wayland") (arguments - (substitute-keyword-arguments (package-arguments rofi-pass) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases ;; Set the clipboard and backend tools to ones for Wayland in the diff --git a/gnu/packages/plan9.scm b/gnu/packages/plan9.scm index 5190414e5ae..c070fc0cdfa 100644 --- a/gnu/packages/plan9.scm +++ b/gnu/packages/plan9.scm @@ -132,7 +132,7 @@ reconstruct a Plan 9 terminal-like experience from a non-Plan 9 system.") (inherit drawterm) (name "drawterm-wayland") (arguments - (substitute-keyword-arguments (package-arguments drawterm) + (substitute-keyword-arguments arguments ((#:make-flags _) `(list "CONF=linux" ,(string-append "CC=" (cc-for-target)))))) diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm index 8227e356546..9cae7f1d4af 100644 --- a/gnu/packages/potassco.scm +++ b/gnu/packages/potassco.scm @@ -406,7 +406,7 @@ in particular ones that can be solved by @command{clingo}.") (name name) (version (package-version clingo)) ; for #$version in arguments (arguments - (substitute-keyword-arguments (package-arguments clingo) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(cons* "-DCLINGO_BUILD_WITH_LUA=yes" (string-append "-DLUACLINGO_INSTALL_DIR=" @@ -429,7 +429,7 @@ Lua code."))) (name "python-clingo") (version (package-version clingo)) ; for #$version in arguments (arguments - (substitute-keyword-arguments (package-arguments clingo) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(cons* "-DCLINGO_BUILD_WITH_PYTHON=pip" (string-append "-DCMAKE_MODULE_PATH=" @@ -526,7 +526,7 @@ directly from the python command line."))) #:modules '((guix build cmake-build-system) ((guix build pyproject-build-system) #:prefix python:) (guix build utils)) - (substitute-keyword-arguments (package-arguments clingcon) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'install 'install-distinfo diff --git a/gnu/packages/profiling.scm b/gnu/packages/profiling.scm index c50eaab5935..55b20ae0556 100644 --- a/gnu/packages/profiling.scm +++ b/gnu/packages/profiling.scm @@ -301,7 +301,7 @@ project.") (sha256 (base32 "0hwl0aihn6fgpl0qhqckxc3sslb78wq6xav5ykfgfjzpyddqyrd0")))) (arguments - (substitute-keyword-arguments (package-arguments cubew) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(append #$flags (list "--with-compression=full"))) @@ -423,7 +423,7 @@ sampling profiler for games and other applications.") (inherit tracy-wayland) (name "tracy") (arguments - (substitute-keyword-arguments (package-arguments tracy-wayland) + (substitute-keyword-arguments arguments ((#:make-flags flags #~'()) #~(append #$flags ;; The LEGACY flag indicate we want to build tracy with glfw. diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index 309a6a6f55f..8c7353056ef 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -313,7 +313,7 @@ internal RPC protocols and file formats.") (base32 "0ggyfrfal7wms4n8pba224jwpjxn19rigd5y90m3x2bg97ych775")))) (build-system gnu-build-system) - (arguments (substitute-keyword-arguments (package-arguments protobuf) + (arguments (substitute-keyword-arguments arguments ;; XXX: insists on using bundled googletest ((#:tests? _ #f) #false) ((#:configure-flags _ #f) @@ -336,7 +336,7 @@ internal RPC protocols and file formats.") (base32 "0a955bz59ihrb5wg7dwi12xajdi5pmz4bl0g147rbdwv393jwwxk")))) (build-system gnu-build-system) - (arguments (substitute-keyword-arguments (package-arguments protobuf) + (arguments (substitute-keyword-arguments arguments ((#:configure-flags _ #f) #~(list)) ((#:phases phases) diff --git a/gnu/packages/pypy.scm b/gnu/packages/pypy.scm index d1ae00aa79d..87e8acc7644 100644 --- a/gnu/packages/pypy.scm +++ b/gnu/packages/pypy.scm @@ -295,7 +295,7 @@ Python code natively, including C extensions.") (base32 "1yq6n888fxfdqid29q3w8bn7ii800bjkf44w82kjwgh0c2kxv1kp")))) (arguments - (substitute-keyword-arguments (package-arguments pypy2) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (replace 'patch-source diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 4a9b0a8128d..9b66cb62115 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1084,7 +1084,7 @@ PyCryptodome variants, the other being python-pycryptodomex.") (package/inherit python-pycryptodome (name "python-pycryptodomex") (arguments - (substitute-keyword-arguments (package-arguments python-pycryptodome) + (substitute-keyword-arguments arguments ((#:test-flags _) #~(list "-m" "Cryptodome.SelfTest")) ((#:phases phases #~%standard-phases) diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index cfdf2e56c65..c25be19ac8f 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -403,7 +403,7 @@ object-oriented library such as @code{scikit-learn}.") (package/inherit python-anndata (name "python-anndata-minimal") (arguments - (substitute-keyword-arguments (package-arguments python-anndata) + (substitute-keyword-arguments arguments ((#:tests? _ #t) #f))) (native-inputs (list python-hatch-vcs @@ -1948,7 +1948,7 @@ between dataframe libraries. (package/inherit python-narwhals (name "python-narwhals-minimal") (arguments - (substitute-keyword-arguments (package-arguments python-anndata) + (substitute-keyword-arguments arguments ((#:tests? _ #t) #f))) (native-inputs (list python-hatchling)) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 80b71286781..0f1b8fb0fad 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -5955,7 +5955,7 @@ outside of the Zope framework.") #:tests? #f #:phases #~(modify-phases %standard-phases (delete 'sanity-check))) - (substitute-keyword-arguments (package-arguments orig) + (substitute-keyword-arguments arguments ((#:tests? _ #f) #f) ((#:phases phases '%standard-phases) #~(modify-phases #$phases diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a9bff220bd8..b1afbd051fd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8341,7 +8341,7 @@ and convert DDL to BigQuery JSON schema.") (base32 "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68")))) (arguments - (substitute-keyword-arguments (package-arguments python-jsonschema) + (substitute-keyword-arguments arguments ((#:tests? _ #t) #f))) (propagated-inputs (list python-attrs @@ -16758,7 +16758,7 @@ from an XML-based format.") (package/inherit base (name "python-fonttools") (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:tests? _ #f) (not (%current-target-system))) ((#:phases phases '%standard-phases) @@ -22013,7 +22013,7 @@ feels like an AST.") (inherit python-libcst) (name "python-libcst-minimal") (arguments - (substitute-keyword-arguments (package-arguments python-libcst) + (substitute-keyword-arguments arguments ((#:tests? _ #t) #f))) (native-inputs (list python-minimal-wrapper @@ -25942,7 +25942,7 @@ events on Linux.") (inherit python-pyinotify) (name "python-pyinotify-cli") (arguments - (substitute-keyword-arguments (package-arguments python-pyinotify) + (substitute-keyword-arguments arguments ((#:phases phases #~%standard-phases) #~(modify-phases #$phases (delete 'drop-shebang) @@ -28199,7 +28199,7 @@ Complete support for Berkeley DB Base Replication. Support for RPC.") (sha256 (base32 "00bqdsfx8jgmfz5bgkx10nlw5bfsw11a86f91zkl53snvk45xl3h")))) (arguments - (substitute-keyword-arguments (package-arguments python-berkeleydb) + (substitute-keyword-arguments arguments ((#:phases phases #~%standard-phases) #~(modify-phases #$phases (delete 'remove-legacy))) @@ -41139,7 +41139,7 @@ interfaces.") (search-patches "python-zeroc-ice-3.6.5-python-3.11-support.patch")))) (arguments - (substitute-keyword-arguments (package-arguments python-zeroc-ice) + (substitute-keyword-arguments arguments ((#:phases phases #~%standard-phases) #~(modify-phases #$phases (add-before 'build 'relax-gcc-14-strictness diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c28f76f97ca..687e2857924 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -493,7 +493,7 @@ data types.") (for-each delete-file (find-files "Lib/distutils/command" "\\.exe$")))))) (arguments - (substitute-keyword-arguments (package-arguments python-2) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(append #$flags ;; XXX Use quote to avoid world rebuild at this time @@ -1509,7 +1509,7 @@ data types.") (outputs '("out" "debug")) (build-system gnu-build-system) (arguments - (substitute-keyword-arguments (package-arguments python) + (substitute-keyword-arguments arguments ((#:configure-flags configure-flags) #~(append #$configure-flags (list "--with-pydebug"))))) @@ -1580,7 +1580,7 @@ and the unversioned commands available."))) (hidden-package (package/inherit python (arguments - (substitute-keyword-arguments (package-arguments python) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~()) #~(append '("--with-ensurepip=no") (delete "--with-ensurepip=install" #$flags)))))))) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 03eaa2db29e..f31537676fb 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -872,7 +872,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") "qtbase-patch-libvulkan.patch")))) (build-system cmake-build-system) (arguments - (substitute-keyword-arguments (package-arguments qtbase-5) + (substitute-keyword-arguments arguments ((#:configure-flags _ ''()) `(let ((out (assoc-ref %outputs "out"))) (list "-GNinja" ;officially supported @@ -1620,7 +1620,7 @@ support for MNG, TGA, TIFF and WBMP image formats.") (base32 "145hbdaj4r3lljgiasx404c12dl5sk4nghc1pc7w5xy1m8gppcgf")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg-5) + (substitute-keyword-arguments arguments ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs (list perl)) (inputs @@ -1686,7 +1686,7 @@ XLSX document format.") (base32 "19pq6bmr7zs2n7m8hqsyxyml7kggdkvz0sdhxsg5gvk9fa264b4i")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg-5) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'disable-network-tests @@ -1716,7 +1716,7 @@ xmlpatternsvalidator."))) "1nnmch6a3k8ja9q8vzhl6kcl52xyy90rpbnaaqqvirwdgrfjvkg1")) (patches (search-patches "qtdeclarative-5-disable-qmlcache.patch")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg-5) + (substitute-keyword-arguments arguments ((#:tests? _ #f) #f) ;TODO: Enable the tests ((#:phases phases) #~(modify-phases #$phases @@ -1983,7 +1983,7 @@ with Bluetooth and NFC.") (base32 "11fb6bvabkdhjlwyd3q0nmzhaildv9dnda78j9sphfdd5c0x1i6c")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg-5) + (substitute-keyword-arguments arguments ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs (list perl qtdeclarative-5)) @@ -2067,7 +2067,7 @@ recognition API for devices."))) (base32 "00h0qm6g0qjy56q3b7vp1m93p1jyaidlsl1cqmvv38ws5r79pb4h")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg-5) + (substitute-keyword-arguments arguments ((#:parallel-tests? _ #f) #f) ; can lead to race condition ((#:phases phases) `(modify-phases ,phases @@ -2106,7 +2106,7 @@ recognition API for devices."))) (substitute* "examples/multimedia/multimedia.pro" (("spectrum") "#")))))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg-5) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (replace 'configure @@ -2296,7 +2296,7 @@ record media, and manage a collection of media content.") (base32 "07gqgd6ixqnsvc9r1c9y92vaxwj11ijrqvnxib8sv6xwhcmhvw43")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg-5) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'disable-failing-tests @@ -2440,7 +2440,7 @@ compositor libraries.") (native-inputs (list perl)) (inputs (list qtbase-5 eudev)) (arguments - (substitute-keyword-arguments (package-arguments qtsvg-5) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'patch-dlopen-paths @@ -2501,7 +2501,7 @@ interacting with serial ports from within Qt.") (base32 "0408pp9glr17yh60snmb2gx0vr7fwk0xf17hiwpwg837qk4si07f")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg-5) + (substitute-keyword-arguments arguments ((#:phases phases '%standard-phases) #~(modify-phases #$phases (add-after 'unpack 'patch-libsocketcan-reference @@ -2584,7 +2584,7 @@ application).") (base32 "0msg2ghi5g7anv7nlkj55b1dwpz6dgd4qv1brikb06nvmxs6dl8b")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg-5) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'disable-network-tests @@ -2702,7 +2702,7 @@ Server Protocol (LSP) for Qt.") deps/rapidjson/1\\.1\\.0/include \\\\") ""))))))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg-5) + (substitute-keyword-arguments arguments ((#:tests? _ #f) #f) ; TODO: Enable the tests ((#:phases phases) #~(modify-phases #$phases @@ -2727,7 +2727,7 @@ positioning and geolocation plugins."))) (base32 "1ybk3ig69p6zyrxabcfkb4pcyc251gy1m2brkf4q52cmcwcysias")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments arguments ((#:tests? _ #f) #f) ; TODO: Enable the tests ((#:phases phases) #~(modify-phases #$phases @@ -2785,7 +2785,7 @@ plugin for Adobe After Effects.") (base32 "1imzr7gxbbl1m05g6a4ji0pxvabp0j4x3q33dxa7zfrjczmhcc23")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg-5) + (substitute-keyword-arguments arguments ((#:tests? _ #f) #f) ; TODO: Enable the tests ((#:phases phases '%standard-phases) #~(modify-phases #$phases @@ -2977,7 +2977,7 @@ body can have its own physical properties like mass, density and friction.") (base32 "0d22z6a1l7iv1xmzgsf7inpgi857mg1ffv327wv7q2iapg2fsiw3")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg-5) + (substitute-keyword-arguments arguments ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Quick Controls and other Quick modules") @@ -2997,7 +2997,7 @@ can be used to build complete interfaces in Qt Quick."))) (base32 "0v7mwzhc42cwf12z11g9qmysqhsqcvfk4pghh9n2p2kbrz6xdnd0")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg-5) + (substitute-keyword-arguments arguments ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Quick Controls 2 and other Quick 2 modules") @@ -3018,7 +3018,7 @@ not available."))) (base32 "07m25w5qm6i13ygxg0pwaqfda4b8zyhs87n366cyn3wwm96x18ma")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg-5) + (substitute-keyword-arguments arguments ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Graphical Effects module") @@ -3073,7 +3073,7 @@ and mobile applications targeting TV-like form factors."))) ;; the scion test refers to the bundled 3rd party test code. (substitute* "tests/auto/auto.pro" (("scion") "#")))))) - (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) + (arguments (substitute-keyword-arguments arguments ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs (list qtbase-5 qtdeclarative-5)) (synopsis "Qt SCXML module") @@ -3192,7 +3192,7 @@ purchasing goods and services."))) (base32 "0csimm84df9f70irp8di8r208jpiv6hhfbxdi4sxh9935ygpqgc4")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg-5) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'remove-failing-test @@ -3265,7 +3265,7 @@ graphs by selecting one of the charts themes.") (base32 "09xwhff4l0yn6dn22qcnsn8k929r7xvg2a4zmslq1hd6ph2d2as2")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg-5) + (substitute-keyword-arguments arguments ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Data Visualization module") @@ -3413,7 +3413,7 @@ processes or computers.") (base32 "11s5nhcj7ns7fwwmpmfv8i45b5h3xmjlq8rhm6qk11plvwi44dss")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg-5) + (substitute-keyword-arguments arguments ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs (list qtbase-5)) (native-inputs (list perl qtdeclarative-5 qtmultimedia-5 qtxmlpatterns-5)) @@ -3482,7 +3482,7 @@ message.") (base32 "03qxll32431qwrrbnb75mm9xbdq0lvzj03037yzw6mxfhl491sh6")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg-5) + (substitute-keyword-arguments arguments ((#:tests? _ #f) #f) ; TODO: pass 2 fail test ((#:phases phases) `(modify-phases ,phases @@ -3896,7 +3896,7 @@ linux/libcurl_wrapper.h") ;; Required by Qt5WebEngineCoreConfig.cmake. (list qtbase-5 qtdeclarative-5 qtwebchannel-5)) (arguments - (substitute-keyword-arguments (package-arguments qtsvg-5) + (substitute-keyword-arguments arguments ((#:modules modules '()) `((guix build gnu-build-system) (guix build utils) @@ -4541,7 +4541,7 @@ instances.") (base32 "069aww3aww6968hmipzfbj57a5vw6jxj1mr20nsb1yh98n5c01rv")))) (arguments - (substitute-keyword-arguments (package-arguments single-application-qt5) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "-DQT_DEFAULT_MAJOR_VERSION=6" #$flags)))) (inputs (list qtbase)))) @@ -4603,7 +4603,7 @@ Python.") (package/inherit pyotherside (name "pyotherside-for-qt5") (arguments - (substitute-keyword-arguments (package-arguments pyotherside) + (substitute-keyword-arguments arguments ((#:qtbase _ #f) qtbase-5) ((#:phases phases '%standard-phases) @@ -5320,7 +5320,7 @@ securely. It will not store any data unencrypted unless explicitly requested.") (modify-inputs (package-inputs qtkeychain) (replace "qtbase" qtbase))) (arguments - (substitute-keyword-arguments (package-arguments qtkeychain) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~(list)) #~(cons "-DBUILD_WITH_QT6=ON" #$flags)) ((#:phases phases '%standard-phases) @@ -5960,7 +5960,7 @@ color-related widgets.") (replace "qtbase" qtbase) (delete "qtxmlpatterns"))) (arguments - (substitute-keyword-arguments (package-arguments python-shiboken-2) + (substitute-keyword-arguments arguments ((#:phases p) #~(modify-phases #$p (delete 'workaround-importlib-error) @@ -6571,7 +6571,7 @@ a secure way.") (package (inherit packagekit-qt5) (name "packagekit-qt6") - (arguments (substitute-keyword-arguments (package-arguments packagekit-qt5) + (arguments (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(cons "-DBUILD_WITH_QT6=ON" #$flags)))) (inputs (modify-inputs (package-inputs packagekit-qt5) diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm index 4efaa79f758..58ad66caa42 100644 --- a/gnu/packages/racket.scm +++ b/gnu/packages/racket.scm @@ -406,7 +406,7 @@ code to use the 3M garbage collector.") (modify-inputs (package-native-inputs racket-vm-cgc) (prepend racket-vm-cgc)))) (arguments - (substitute-keyword-arguments (package-arguments racket-vm-cgc) + (substitute-keyword-arguments arguments ((#:configure-flags _ '()) #~(cons "--enable-bconly" #$(cond @@ -458,7 +458,7 @@ collector, 3M (``Moving Memory Manager'').") (prepend chez-scheme-for-racket chez-nanopass-bootstrap)))) (arguments - (substitute-keyword-arguments (package-arguments racket-vm-cgc) + (substitute-keyword-arguments arguments ((#:phases those-phases #~%standard-phases) #~(modify-phases #$those-phases (add-after 'unpack 'unpack-nanopass @@ -997,7 +997,7 @@ DrRacket IDE, are not included.") '("xrepl" "xrepl-doc" "xrepl-lib")))) (build-system gnu-build-system) (arguments - (substitute-keyword-arguments (package-arguments racket-minimal) + (substitute-keyword-arguments arguments ((#:make-flags _ '()) #~`("main-distribution")) ((#:configure-flags _ '()) diff --git a/gnu/packages/ruby-xyz.scm b/gnu/packages/ruby-xyz.scm index 8a815181779..c2235eeb73a 100644 --- a/gnu/packages/ruby-xyz.scm +++ b/gnu/packages/ruby-xyz.scm @@ -555,7 +555,7 @@ eq(1)\\}}.") (package (inherit ruby-rspec-its) (arguments - (substitute-keyword-arguments (package-arguments ruby-rspec-its) + (substitute-keyword-arguments arguments ((#:tests? _ #f) #f))) (native-inputs '())))) @@ -1845,7 +1845,7 @@ for performance optimizations in Ruby code.") (package (inherit ruby-rubocop-performance) (arguments - (substitute-keyword-arguments (package-arguments ruby-rubocop-performance) + (substitute-keyword-arguments arguments ((#:tests? _ #f) #f))) (propagated-inputs '()) (native-inputs '())))) @@ -3735,7 +3735,7 @@ It is a low-dependency variant of ruby-hydra.") (inherit ruby-hydra-minimal) (name "ruby-hydra") (arguments - (substitute-keyword-arguments (package-arguments ruby-hydra-minimal) + (substitute-keyword-arguments arguments ((#:tests? tests? #t) #t) ((#:phases phases #~%standard-phases) @@ -10512,7 +10512,7 @@ engine.") (base32 "0ngirjbai3f5ki2sf6m4gxbbrjpr3b35bz5nrz1cifyw1jk6a6sr")))) (arguments - (substitute-keyword-arguments (package-arguments ruby-sqlite3) + (substitute-keyword-arguments arguments ((#:tests? #t #t) #f) ((#:gem-flags _ #f) ''("--" @@ -11056,7 +11056,7 @@ defined in a @file{.env} file.") (inherit ruby-dotenv) (name "ruby-dotenv-rails") (arguments - (substitute-keyword-arguments (package-arguments ruby-dotenv) + (substitute-keyword-arguments arguments ((#:phases phases '%standard-phases) #~(modify-phases #$phases (delete 'do-not-build-dotenv-rails) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 55cb7b1a849..a89a09de057 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -4621,7 +4621,7 @@ and users are in full control of their data and workflow.") (inherit rust-xremap) (name "xremap-gnome") (arguments - (substitute-keyword-arguments (package-arguments rust-xremap) + (substitute-keyword-arguments arguments ((#:features _) '(list "gnome")))))) (define-public xremap-hyprland @@ -4629,7 +4629,7 @@ and users are in full control of their data and workflow.") (inherit rust-xremap) (name "xremap-hyprland") (arguments - (substitute-keyword-arguments (package-arguments rust-xremap) + (substitute-keyword-arguments arguments ((#:features _) '(list "hypr")))))) (define-public xremap-kde @@ -4637,7 +4637,7 @@ and users are in full control of their data and workflow.") (inherit rust-xremap) (name "xremap-kde") (arguments - (substitute-keyword-arguments (package-arguments rust-xremap) + (substitute-keyword-arguments arguments ((#:features _) '(list "kde")))))) (define-public xremap-niri @@ -4645,7 +4645,7 @@ and users are in full control of their data and workflow.") (inherit rust-xremap) (name "xremap-niri") (arguments - (substitute-keyword-arguments (package-arguments rust-xremap) + (substitute-keyword-arguments arguments ((#:features _) '(list "niri")))))) (define-public xremap-wlroots @@ -4653,7 +4653,7 @@ and users are in full control of their data and workflow.") (inherit rust-xremap) (name "xremap-wlroots") (arguments - (substitute-keyword-arguments (package-arguments rust-xremap) + (substitute-keyword-arguments arguments ((#:features _) '(list "wlroots")))))) (define-deprecated-package xremap-sway @@ -4664,7 +4664,7 @@ and users are in full control of their data and workflow.") (inherit rust-xremap) (name "xremap-x11") (arguments - (substitute-keyword-arguments (package-arguments rust-xremap) + (substitute-keyword-arguments arguments ((#:features _) '(list "x11")))))) (define-public xsv diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 338e3f013ae..f393b73eaf4 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -472,7 +472,7 @@ destructors. It is the core memory allocator used in Samba.") (synopsis "Hierarchical, reference counted memory pool system (static library)") (arguments - (substitute-keyword-arguments (package-arguments talloc) + (substitute-keyword-arguments arguments ((#:phases phases) ;; Since Waf, the build system talloc uses, apparently does not ;; support building static libraries from a ./configure flag, roll our diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index 66ea7dabf3a..5b61416a416 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -236,7 +236,7 @@ package contains the library, but no drivers.") ("libxml2" ,libxml2) ; for pixma back end ,@(package-inputs sane))) (arguments - (substitute-keyword-arguments (package-arguments sane) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (delete 'disable-backends) diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index f36c1b231b1..a36d240d70c 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -435,7 +435,7 @@ decompression.") (package/inherit recoll (name "recoll-cli") (arguments - (substitute-keyword-arguments (package-arguments recoll) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~(list)) #~(cons* "-Dqtgui=false" "-Dx11mon=false" #$flags)) ((#:phases phases #~%standard-phases) diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index df13a7935a0..08b0c09fd57 100644 --- a/gnu/packages/selinux.scm +++ b/gnu/packages/selinux.scm @@ -142,7 +142,7 @@ module into a binary representation.") (name "libselinux") (outputs '("out" "python")) (arguments - (substitute-keyword-arguments (package-arguments libsepol) + (substitute-keyword-arguments arguments ((#:make-flags flags) #~(cons* "PYTHON=python3" (string-append "LIBSEPOLA=" @@ -197,7 +197,7 @@ the core SELinux management utilities.") (package/inherit libsepol (name "libsemanage") (arguments - (substitute-keyword-arguments (package-arguments libsepol) + (substitute-keyword-arguments arguments ((#:make-flags flags) #~(cons* "PYTHON=python3" (string-append "PYTHONLIBDIR=" @@ -236,7 +236,7 @@ binary policies.") (package/inherit libsepol (name "secilc") (arguments - (substitute-keyword-arguments (package-arguments libsepol) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (delete 'portability) @@ -255,7 +255,7 @@ binary policies.") (package/inherit libsepol (name "python-sepolgen") (arguments - (substitute-keyword-arguments (package-arguments libsepol) + (substitute-keyword-arguments arguments ((#:modules _ #~%default-gnu-modules) '((srfi srfi-1) (guix build gnu-build-system) diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 3f1eebd17c9..1aaf489a8b1 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -326,7 +326,7 @@ that implements both the msgpack and msgpack-rpc specifications.") (package/inherit lua-libmpack (name "lua5.1-libmpack") (arguments - (substitute-keyword-arguments (package-arguments lua-libmpack) + (substitute-keyword-arguments arguments ((#:make-flags flags) `(let* ((lua-version ,(package-version lua-5.1)) (lua-major+minor ,(version-major+minor (package-version lua-5.1)))) @@ -346,7 +346,7 @@ that implements both the msgpack and msgpack-rpc specifications.") (package/inherit lua-libmpack (name "lua5.2-libmpack") (arguments - (substitute-keyword-arguments (package-arguments lua-libmpack) + (substitute-keyword-arguments arguments ((#:make-flags flags) `(let* ((lua-version ,(package-version lua-5.2)) (lua-major+minor ,(version-major+minor (package-version lua-5.2)))) @@ -971,7 +971,7 @@ game development and other performance-critical applications.") (sha256 (base32 "0cd12dvkzqdafz46q4302mzgpzbz589zmmiga7bq07f2sqy4vrvv")))) (arguments - (substitute-keyword-arguments (package-arguments flatbuffers) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(append #$flags '("-DCMAKE_POSITION_INDEPENDENT_CODE=ON")))))))) diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 9b6e80696eb..b35470352a2 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -650,7 +650,7 @@ problems for efficient solution on parallel systems.") (let ((parent (package (inherit openfoam-org) (version (package-version this-package))))) - (substitute-keyword-arguments (package-arguments parent) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (delete 'disable-failing-tests)))))) diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index b607227bb77..ab9745809ff 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -126,7 +126,7 @@ is in the public domain.") (base32 "19bc2inw7f9fn0y6j3b57w4mk6bzi2q8hp5yn6qyd8kav7ynvqj2")))) (arguments - (substitute-keyword-arguments (package-arguments sqlite) + (substitute-keyword-arguments arguments ((#:tests? _ #f) #f) ((#:configure-flags flags #~(list)) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index a01ea94c3b7..6a505f47141 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -374,7 +374,7 @@ Additionally, various channel-specific options can be negotiated.") (file-name (git-file-name name version)) (sha256 (base32 "13g7b652rf9lqlp492fiyi8ypf04v65ar3z174gjmkskl77m4b7k")))) (arguments - (substitute-keyword-arguments (package-arguments openssh) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~(list)) #~(cons* "--with-privsep-user=sshd" "--with-pam-service=sshd" diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 1ad9c34bbd5..f774bf2b40e 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -803,7 +803,7 @@ posteriors and evidences.") (package (inherit r-with-tests) (name "r-minimal") (arguments - (substitute-keyword-arguments (package-arguments r-with-tests) + (substitute-keyword-arguments arguments ((#:tests? #f #f) #f) ((#:disallowed-references refs '()) (cons (this-package-native-input "perl") refs)) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 9f50321affa..8c47907fdab 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -510,7 +510,7 @@ drawing.") (sha256 (base32 "1cqnl8zlxccqg0901gx21h06j9wk3ja6lr8wp4k85ni4msf4m09g")))) (arguments - (substitute-keyword-arguments (package-arguments st) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'remove-calls-to-git @@ -1456,7 +1456,7 @@ until the screensaver should be activated.") (inherit lib9) (name "9yacc") (arguments - (substitute-keyword-arguments (package-arguments lib9) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'patch 'patch-for-9yacc @@ -1487,7 +1487,7 @@ generator."))) (inherit 9yacc) (name "9base") (arguments - (substitute-keyword-arguments (package-arguments 9yacc) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'patch-for-9yacc 'patch-for-9base diff --git a/gnu/packages/swift.scm b/gnu/packages/swift.scm index 27daa33ee63..48597b6bdb7 100644 --- a/gnu/packages/swift.scm +++ b/gnu/packages/swift.scm @@ -131,7 +131,7 @@ Swift-specific modifications, required to build Swift 4.2.4.") (base32 "1405irbglx933i6jc8546gcrgb3y3703h66jm1jnd6acgfyg74ly")))) (arguments - (substitute-keyword-arguments (package-arguments swift-cmark) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (delete 'install-cmake-exports))))))) @@ -389,7 +389,7 @@ a previous Swift compiler.") (version %swift-6.2-version) (source %swift-6.2-source) (arguments - (substitute-keyword-arguments (package-arguments swift-bootstrap) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(append (cons (string-append "-DCMAKE_INSTALL_RPATH=" #$output "/lib/swift/linux:" diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index ef81715a083..ecfe6e85a15 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -486,7 +486,7 @@ support for high performance Telegram Bot creation.") (inherit base) (name "tde2e") (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:tests? _ #f) #f) ((#:configure-flags flags #~'()) #~(list "-DTD_E2E_ONLY=ON"))))))) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index b883e8a6e34..6746a5f5454 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -896,7 +896,7 @@ Initiation Protocol (SIP) and a multimedia framework.") (base32 "1n5k1pk8v2rbq8gnhnpck6m9ljyl9ynr5bbyy2k1ln1nmdjn909n")))) (arguments - (substitute-keyword-arguments (package-arguments pjproject) + (substitute-keyword-arguments arguments ((#:configure-flags _ ''()) ;; This package is tailored for DhtNet; see how it is built for its ;; CI in diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index febcf97ed90..6763f1ff7bc 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -2219,7 +2219,7 @@ ligatures, but also offers additional control over them.") (delete-other-directories "utils" '()) (delete-other-directories "texk" '("afm2pl")))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-afm2pl" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -2515,7 +2515,7 @@ extensions of TeX, itself developed for e-TeX.") (inherit texlive-bin) (name "texlive-aleph-bin") (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons* "--disable-web2c" "--enable-aleph" @@ -5173,7 +5173,7 @@ other parts.") (delete-other-directories "utils" '("autosp")) (delete-other-directories "texk" '()))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-autosp" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -5257,7 +5257,7 @@ the pdf code inserted in the output file. The processing involves a run of (delete-other-directories "utils" '("axodraw2")) (delete-other-directories "texk" '()))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-axodraw2" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -12149,7 +12149,7 @@ supported.") (delete-other-directories "utils/" '()) (delete-other-directories "texk/" '("cjkutils")))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-cjkutils-x" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -20717,7 +20717,7 @@ create a PDF of your score.") (delete-other-directories "utils" '()) (delete-other-directories "texk" '("gregorio")))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-gregorio" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -22329,7 +22329,7 @@ TeX to format a document for nearly-arbitrary values of @code{\\hsize} and (inherit texlive-bin) (name "texlive-hitex-bin") (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons* "--disable-web2c" "--enable-hitex" @@ -27940,7 +27940,7 @@ those who prefer its language.") (delete-other-directories "utils" '("m-tx")) (delete-other-directories "texk" '()))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-m-tx" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -30270,7 +30270,7 @@ source file. This should be used before using @code{\\TransformNotes}.") (delete-other-directories "utils" '()) (delete-other-directories "texk" '("musixtnt")))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-musixtnt" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -32298,7 +32298,7 @@ Omega (and Aleph) ideas include Omega-2 and LuaTeX.") (inherit texlive-bin) (name "texlive-omegaware-bin") (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(delete "--enable-web2c" #$flags)) ((#:phases phases) @@ -33979,7 +33979,7 @@ a score.") (delete-other-directories "utils" '("pmx")) (delete-other-directories "texk" '()))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-pmx" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -43229,7 +43229,7 @@ fonts, in both Metafont and Type 1 formats.") (delete-other-directories "utils" '("devnag")) (delete-other-directories "texk" '()))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-devnag" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -43393,7 +43393,7 @@ the end of a line.") (delete-other-directories "utils" '("vlna")) (delete-other-directories "texk" '()))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-vlna" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -44746,7 +44746,7 @@ order are controlled by an external configuration file.") (scandir "." (lambda (f) (not (member f '("." ".." "texmf.cnf"))))))))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons* "--enable-bibtex-x" "--enable-bibtex8" @@ -44814,7 +44814,7 @@ supported via the ICU library.") (inherit texlive-bibtex8-bin) (name "texlive-bibtexu-bin") (arguments - (substitute-keyword-arguments (package-arguments texlive-bibtex8-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons* "--enable-bibtexu" "--disable-bibtex8" @@ -44996,7 +44996,7 @@ Filters are also provided for checking the LaTeX parts of CWEB documents.") (delete-other-directories "utils" '()) (delete-other-directories "texk" '("chktex")))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-chktex" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -45536,7 +45536,7 @@ Kubowicz's OpenDetex as its successor.") (delete-other-directories "utils" '()) (delete-other-directories "texk" '("detex")))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-detex" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -45705,7 +45705,7 @@ which is readily readable by humans. The DTL bundle contains an assembler (delete-other-directories "utils" '()) (delete-other-directories "texk" '("dtl")))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-dtl" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -45827,7 +45827,7 @@ the document.") (delete-other-directories "utils" '()) (delete-other-directories "texk" '("dvi2tty")))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-dvi2tty" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -45911,7 +45911,7 @@ drivers (much like DVItype).") (inherit texlive-bin) (name "texlive-dvicopy-bin") (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(delete "--enable-web2c" #$flags)) ((#:phases phases) @@ -45982,7 +45982,7 @@ exclusions.") (delete-other-directories "utils" '()) (delete-other-directories "texk" '("dvidvi")))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-dvidvi" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -46089,7 +46089,7 @@ file. It also supports XeTeX XDV format.") (delete-other-directories "utils" '()) (delete-other-directories "texk" '("dviljk")))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-dviljk" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -46165,7 +46165,7 @@ transforms between a DVI file and a text file.") (delete-other-directories "utils" '()) (delete-other-directories "texk" '("dviout-util" "tests")))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-dviout-util" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -46243,7 +46243,7 @@ not read the postamble, so it can be started before TeX finishes.") (delete-other-directories "utils" '()) (delete-other-directories "texk" '("dvipng")))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-dvipng" (delete "--disable-web2c" #$flags))) ((#:phases phases) @@ -46326,7 +46326,7 @@ and @samp{y} location.") (delete-other-directories "utils" '()) (delete-other-directories "texk" '("dvipos")))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-dvipos" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -46436,7 +46436,7 @@ support SVG fonts are enabled to render the graphics properly.") ;; be preserved. (delete-other-directories "texk/dvipsk" '("testdata") #t))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-dvisvgm" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -47256,7 +47256,7 @@ file and generates a VPL file.") (inherit texlive-bin) (name "texlive-fontware-bin") (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(delete "--enable-web2c" #$flags)) ((#:phases phases) @@ -49344,7 +49344,7 @@ distributed as package @code{pTeX-manual}.") (delete-other-directories "utils" '()) (delete-other-directories "texk" '("makejvf" "mendexk" "web2c")))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons* "--enable-makejvf" "--enable-mendexk" @@ -50655,7 +50655,7 @@ also process original LaTeX with @code{\\inputenc@{utf8@}} and Babel (inherit texlive-bin) (name "texlive-uptex-bin") (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(delete "--enable-web2c" #$flags)) ((#:phases phases) @@ -51206,7 +51206,7 @@ a Type 1 font. (delete-other-directories "utils" '()) (delete-other-directories "texk" '("lcdf-typetools")))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-lcdf-typetools" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -52047,7 +52047,7 @@ does pdfTeX.") (delete-other-directories "utils" '()) (delete-other-directories "texk" '("dvipdfm-x")))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-dvipdfm-x" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -52139,7 +52139,7 @@ PostScript.") (scandir "." (lambda (f) (not (member f '("." ".." "texmf.cnf"))))))))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-dvipsk" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -52244,7 +52244,7 @@ generated code can be included in any LaTeX document.") (delete-other-directories "utils" '("lacheck")) (delete-other-directories "texk" '()))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-lacheck" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -52779,7 +52779,7 @@ without HarfBuzz.") (inherit texlive-bin) (name "texlive-luajittex-bin") (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons* "--disable-web2c" "--enable-luajithbtex" @@ -52927,7 +52927,7 @@ MFLua without any modification to produce exactly the same result.") (inherit texlive-bin) (name "texlive-mflua-bin") (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons* "--disable-web2c" "--enable-mflua" @@ -53173,7 +53173,7 @@ that can be used by the TeX 82 hyphenation algorithm.") (inherit texlive-bin) (name "texlive-patgen-bin") (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(delete "--enable-web2c" #$flags)) ((#:phases phases) @@ -53591,7 +53591,7 @@ SeeTeX project. (delete-other-directories "utils" '()) (delete-other-directories "texk" '("seetexk")))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-seetexk" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -55600,7 +55600,7 @@ processing the output of Metafont.") (inherit texlive-bin) (name "texlive-mfware-bin") (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(delete "--enable-web2c" #$flags)) ((#:phases phases) @@ -56798,7 +56798,7 @@ produce bounding box values for Rawppm or Rawpbm format files.") (delete-other-directories "utils" '("ps2eps")) (delete-other-directories "texk" '()))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-ps2eps" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -56885,7 +56885,7 @@ documents generated that use Type 1 fonts.") (delete-other-directories "utils" '()) (delete-other-directories "texk" '("ps2pk")))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-ps2pk" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -56985,7 +56985,7 @@ printing. Utilities include @command{psbook}, @command{psselect}, (delete-other-directories "utils" '()) (delete-other-directories "texk" '("psutils")))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-psutils" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -58254,7 +58254,7 @@ and -editable format; (delete-other-directories "texk" '()) (delete-other-directories "utils" '("t1utils")))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-t1utils" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -58638,7 +58638,7 @@ such as @code{gellmu}.") (delete-other-directories "utils" '()) (delete-other-directories "texk" '("tex4htk")))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-tex4htk" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -59337,7 +59337,7 @@ and vice versa.") (inherit texlive-bin) (name "texlive-texware-bin") (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(delete "--enable-web2c" #$flags)) ((#:phases phases) @@ -61603,7 +61603,7 @@ is planned.") (delete-other-directories "utils" '("tpic2pdftex")) (delete-other-directories "texk" '()))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons* "--enable-tpic2pdftex" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -61762,7 +61762,7 @@ emulates the macro, using TikZ.") (delete-other-directories "utils" '()) (delete-other-directories "texk" '("ttfdump" "ttf2pk2")))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons* "--enable-ttfdump" "--enable-ttf2pk2" @@ -61938,7 +61938,7 @@ Zhuyin) for Chinese Han scripts (Hanzi ideographs). (delete-other-directories "utils/" '()) (delete-other-directories "texk/" '("upmendex")))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-upmendex" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -62392,7 +62392,7 @@ command line or from within a (shell) script. The programs work with (delete-other-directories "utils" '("xpdfopen")) (delete-other-directories "texk" '()))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-xpdfopen" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -64027,7 +64027,7 @@ dealing with Type 1 fonts, direct.") (delete-other-directories "utils" '()) (delete-other-directories "texk" '("gsftopk")))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-gsftopk" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -64230,7 +64230,7 @@ MusiXTeX processing.") (delete-other-directories "utils" '("xml2pmx")) (delete-other-directories "texk" '()))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-xml2pmx" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -72981,7 +72981,7 @@ always (re)defines a command. There is also @code{\\makeenvironment} and (delete-other-directories "texk" '("makeindexk" "tests")) (delete-other-directories "utils" '()))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-makeindexk" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -76895,7 +76895,7 @@ than the bitmaps Metafont creates.") (inherit texlive-bin) (name "texlive-metapost-bin") (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(delete "--enable-web2c" #$flags)) ((#:phases phases) @@ -79131,7 +79131,7 @@ package, such as @command{natbib} as well).") (inherit texlive-bin) (name "texlive-bibtex-bin") (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(delete "--enable-web2c" #$flags)) ((#:phases phases) @@ -93841,7 +93841,7 @@ in terms of the collating order of the text being processed.") (delete-other-directories "utils/" '("xindy")) (delete-other-directories "texk/" '()))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--enable-xindy" (delete "--enable-web2c" #$flags))) ((#:phases phases) @@ -97497,7 +97497,7 @@ that it will build with web2c out of the box.") (delete-other-directories "utils" '()) (delete-other-directories "texk" '("xdvik")))))) (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons* "CFLAGS=-g -O2 -Wno-error=incompatible-pointer-types" @@ -97613,7 +97613,7 @@ which is ordinarily processed by a tightly bound processor (called (inherit texlive-bin) (name "texlive-xetex-bin") (arguments - (substitute-keyword-arguments (package-arguments texlive-bin) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons* "--disable-web2c" "--enable-xetex" diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 09a1550c739..18971ea6a7c 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -144,7 +144,7 @@ is on expressing the content semantically, avoiding physical markup commands.") perl-unicode-eastasianwidth perl-text-unidecode perl-libintl-perl))) (arguments - (substitute-keyword-arguments (package-arguments texinfo) + (substitute-keyword-arguments arguments ((#:modules modules `((guix build utils) (guix build gnu-build-system))) `((srfi srfi-26) @@ -228,7 +228,7 @@ is on expressing the content semantically, avoiding physical markup commands.") (name "info-reader") (arguments (append - (substitute-keyword-arguments (package-arguments texinfo-7) + (substitute-keyword-arguments arguments ((#:modules modules `((guix build utils) (guix build gnu-build-system))) `((srfi srfi-1) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 723671e7c8f..b1bad513385 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -1418,7 +1418,7 @@ more.") (delete "guile") (prepend curl))) (arguments - (substitute-keyword-arguments (package-arguments texmacs) + (substitute-keyword-arguments arguments ((#:phases orig) #~(modify-phases #$orig ;; The non-deterministic compression issue is solved in Mogan. diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 9dc4044bbdd..d708808843d 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -262,7 +262,7 @@ case-folding, and other operations for data in the UTF-8 encoding.") (if (this-package-native-input "julia") (strip-keyword-arguments '(#:tests?) - (substitute-keyword-arguments (package-arguments utf8proc-bootstrap) + (substitute-keyword-arguments arguments ((#:phases phases '%standard-phases) #~(modify-phases #$phases (add-before 'check 'check-data @@ -272,7 +272,7 @@ case-folding, and other operations for data in the UTF-8 encoding.") (string-append "data/" i))) '("NormalizationTest.txt" "GraphemeBreakTest.txt" "DerivedCoreProperties.txt")))))))) - (substitute-keyword-arguments (package-arguments utf8proc-bootstrap) + (substitute-keyword-arguments arguments ((#:tests? _ #t) #f)))) (properties (alist-delete 'hidden? (package-properties utf8proc-bootstrap))))) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 7870277e210..ec45a42f7e8 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -1011,7 +1011,7 @@ coding footprint.") (hidden-package (package/inherit mbedtls (arguments - (substitute-keyword-arguments (package-arguments mbedtls) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-before 'configure 'configure-extra-features @@ -1181,7 +1181,7 @@ ciphers such as ChaCha20, Curve25519, NTRU, and Blake2b.") (package/inherit wolfssl (name "wolfssl-for-rpcs3") (arguments - (substitute-keyword-arguments (package-arguments wolfssl) + (substitute-keyword-arguments arguments ((#:configure-flags flags ''()) #~(cons* "--enable-des3" "--enable-pwdbased" diff --git a/gnu/packages/toolkits.scm b/gnu/packages/toolkits.scm index 69c097bbcd3..3b730e4df97 100644 --- a/gnu/packages/toolkits.scm +++ b/gnu/packages/toolkits.scm @@ -177,7 +177,7 @@ standard operating system features.") (base32 "02a7b05zrka20jhzag2jb4jl624i1m456bsv69jb9zgys2p9dv1n")))) (arguments - (substitute-keyword-arguments (package-arguments imgui) + (substitute-keyword-arguments arguments ((#:make-flags flags ''()) ;; Remove "-DImDrawIdx=unsigned int" and "-DIMGUI_ENABLE_FREETYPE" ;; from make-flags as this breaks MangoHud, the only user of this diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm index 03f51dc8dab..30aa4b23a3b 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -878,7 +878,7 @@ Mullvad Browser.") (base32 "0sj87q0x1lfkvhbz154dabmgm8l18j9d1h1xhyqlmwz3whz1hsfi")))) (arguments - (substitute-keyword-arguments (package-arguments mullvadbrowser-base) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'ublock-private-allowed diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 55e28369361..f93c2b8ed58 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -148,7 +148,7 @@ instead.") (inherit tor) (name "tor-client") (arguments - (substitute-keyword-arguments (package-arguments tor) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(append #$flags (list "--disable-module-relay"))))) @@ -380,7 +380,7 @@ OnionShare.") (inherit onionshare-cli) (name "onionshare") (arguments - (substitute-keyword-arguments (package-arguments onionshare-cli) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'absolutize diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 650cf76ac80..ff18e396437 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -619,7 +619,7 @@ everything from small to very large projects with speed and efficiency.") "subtree" ;git-subtree "gui")) ;gitk, git gui (arguments - (substitute-keyword-arguments (package-arguments git-minimal) + (substitute-keyword-arguments arguments ((#:disallowed-references disallowed-refs ''()) (list (this-package-native-input "bash"))) ((#:make-flags flags #~'()) @@ -835,7 +835,7 @@ everything from small to very large projects with speed and efficiency.") "0if0vqn3fj22p95a0125zpgwz3mqfqxqnvwa7fkf7b00wh0c1wyz")))) ;; Temporary measure to prevent unnecessary package rebuilds. (arguments - (substitute-keyword-arguments (package-arguments git-minimal) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) (if (%current-target-system) git-cross-configure-flags #~(list))))))) @@ -1868,7 +1868,7 @@ a built-in cache to decrease server I/O pressure.") (base32 "0yp6rm60pz8pj8wrm1aglix51hhy00al86mm94ag2bifc92q23ar")))) (arguments - (substitute-keyword-arguments (package-arguments cgit) + (substitute-keyword-arguments arguments ((#:tests? _ #f) (not (%current-target-system))) ((#:make-flags _ '()) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 2efae93d7a1..e2bcdd7bbf9 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1994,7 +1994,7 @@ audio/video codec library.") "ffmpeg-add-av_stream_get_first_dts-for-chromium.patch")))) (arguments (if (target-x86-32?) - (substitute-keyword-arguments (package-arguments ffmpeg) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-before 'configure 'relax-gcc-14-strictness @@ -2018,7 +2018,7 @@ audio/video codec library.") (base32 "1g8116rp4fgq82br8lclb2dmw3fvyh2zkzhnngm7z97pg1i0dypl")))) (arguments - (substitute-keyword-arguments (package-arguments ffmpeg-6) + (substitute-keyword-arguments arguments ((#:modules modules %default-gnu-modules) `((srfi srfi-1) ,@modules)) ((#:phases phases) @@ -2047,7 +2047,7 @@ audio/video codec library.") (base32 "05q6bpid5hfr9djp6cf3sq8majkjiqnl3v9i2y0an23w8qgld412")))) (arguments - (substitute-keyword-arguments (package-arguments ffmpeg-5) + (substitute-keyword-arguments arguments ((#:configure-flags flags ''()) #~(cons "--enable-avresample" (fold delete #$flags '("--enable-libshaderc")))))))) @@ -2078,7 +2078,7 @@ audio/video codec library.") "ffmpeg-jami-screen-sharing-x11-fix.patch" "ffmpeg-jami-pipewiregrab-source-filter.patch")))))) (arguments - (substitute-keyword-arguments (package-arguments ffmpeg) + (substitute-keyword-arguments arguments ((#:configure-flags _ '()) ;; The base configure flags preserved from ffmpeg appear first. #~(list "--disable-static" @@ -4206,7 +4206,7 @@ be used for realtime video capture via Linux-specific APIs.") (package/inherit v4l-utils (name "v4l-utils-minimal") (arguments - (substitute-keyword-arguments (package-arguments v4l-utils) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (delete 'split))) @@ -5264,7 +5264,7 @@ Content System specification.") (append zimg) (replace "svt-av1" svt-av1-3))) (arguments - (substitute-keyword-arguments (package-arguments ffmpeg) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(append #$flags (list "--enable-gpl" @@ -5298,7 +5298,7 @@ Content System specification.") (package (inherit x265) (arguments - (substitute-keyword-arguments (package-arguments x265) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'apply-handbrake-patches diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index a43e797f9fd..047a0bcb69e 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -241,7 +241,7 @@ with the editor vim."))) "--enable-xim" "--disable-selinux" "--enable-gui") - ,@(substitute-keyword-arguments (package-arguments vim) + ,@(substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (add-before 'check 'skip-some-more-tests diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index d4a6016f08a..c47fe8348bd 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -638,7 +638,7 @@ server and embedded PowerPC, and S390 guests.") (synopsis "Machine emulator and virtualizer (without GUI or docs) for the host architecture") (arguments - (substitute-keyword-arguments (package-arguments qemu) + (substitute-keyword-arguments arguments ((#:configure-flags configure-flags #~'()) ;; Restrict to the host's architecture. (let* ((system (or (%current-target-system) @@ -2083,7 +2083,7 @@ client desktops. libxrender libxtst))) (arguments - (substitute-keyword-arguments (package-arguments vmware-open-vm-tools) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(delete "--without-x" #$flags)))) (description "This package provides a GTK+ support for @code{open-vm-tools}."))) @@ -3786,7 +3786,7 @@ disks, resizing disks, and much more.") (package/inherit libguestfs-minimal (name "libguestfs") (arguments - (substitute-keyword-arguments (package-arguments libguestfs-minimal) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(append (filter diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 795218a0b25..2455bf89681 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -303,7 +303,7 @@ propagated by default) such as @code{gst-plugins-good} and (package/inherit webkitgtk (name "webkitgtk-for-gtk3") (arguments - (substitute-keyword-arguments (package-arguments webkitgtk) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons* "-DUSE_GTK4=OFF" (delete "-DUSE_GTK4=ON" #$flags))))) @@ -320,7 +320,7 @@ propagated by default) such as @code{gst-plugins-good} and (define-public webkitgtk-with-libsoup2 (package/inherit webkitgtk-for-gtk3 (name "webkitgtk-with-libsoup2") - (arguments (substitute-keyword-arguments (package-arguments webkitgtk-for-gtk3) + (arguments (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "-DUSE_SOUP2=ON" #$flags)))) (propagated-inputs @@ -339,7 +339,7 @@ propagated by default) such as @code{gst-plugins-good} and (sha256 (base32 "0bzv2h25qr7h0r8likdb8g248qvsilf41cj7prf1avghfr1pzjdg")))) (arguments - (substitute-keyword-arguments (package-arguments webkitgtk) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "-DPORT=WPE" (delete "-DPORT=GTK" #$flags))))) diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index c0ac91c5abd..44d6065b6fb 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -210,7 +210,7 @@ integrate Windows applications into your desktop.") wayland wayland-protocols)) (arguments - (substitute-keyword-arguments (package-arguments wine-minimal) + (substitute-keyword-arguments arguments ((#:configure-flags _ '()) #~'()))))) (define-public wine64 @@ -312,7 +312,7 @@ integrate Windows applications into your desktop.") (modify-inputs (package-native-inputs wine) (prepend python-3))) (arguments - (substitute-keyword-arguments (package-arguments wine) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (delete 'patch-SHELL) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 13aba49956f..99b75f608e3 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -2817,7 +2817,7 @@ modules for building a Wayland compositor.") (propagated-inputs (modify-inputs (package-propagated-inputs wlroots) (delete libdisplay-info))) (arguments - (substitute-keyword-arguments (package-arguments wlroots) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases ;; Required to fix build with GCC >= 15. @@ -3338,7 +3338,7 @@ core/thread.") (package/inherit base (name "waybar-experimental") (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:configure-flags flags '()) #~(cons "-Dexperimental=true" #$flags)))) @@ -3621,7 +3621,7 @@ productive, customizable lisp based systems.") (inputs (list sbcl-slynk stumpwm)) (arguments - (substitute-keyword-arguments (package-arguments stumpwm) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (replace 'build-program @@ -4195,7 +4195,7 @@ wasting your precious memory.") (modify-inputs (package-inputs lemonbar) (prepend freetype libxft libx11))) (arguments - (substitute-keyword-arguments (package-arguments lemonbar) + (substitute-keyword-arguments arguments ((#:make-flags make-flags) #~(#$@make-flags (format #f "CFLAGS=~a -DVERSION='~s'" diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 0bf2d7e4a2e..3563e26385c 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -183,7 +183,7 @@ and many other languages.") (delete "gtk+") (prepend gtk+-2))) (arguments - (substitute-keyword-arguments (package-arguments wxwidgets) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(append #$flags '("--with-gtk=2"))))))) @@ -198,7 +198,7 @@ and many other languages.") (package/inherit wxwidgets (name "wxwidgets-sans-egl") (arguments - (substitute-keyword-arguments (package-arguments wxwidgets) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "--disable-glcanvasegl" #$flags)))))) @@ -268,7 +268,7 @@ and many other languages.") (native-inputs (modify-inputs (package-native-inputs wxwidgets-sans-egl) (prepend nanosvg))) (arguments - (substitute-keyword-arguments (package-arguments wxwidgets-sans-egl) + (substitute-keyword-arguments arguments ((#:phases phases) #~(modify-phases #$phases (add-after 'unpack 'copy-nanosvg-source diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index e611cc3bd5f..776a06f3725 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -292,7 +292,7 @@ project (but it is usable outside of the Gnome platform).") (hidden-package (package/inherit libxml2 (arguments - (substitute-keyword-arguments (package-arguments libxml2) + (substitute-keyword-arguments arguments ((#:configure-flags flags #~'()) #~(cons "--with-zlib" #$flags))))))) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 05f51eeb54b..608a24f9fbc 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1224,7 +1224,7 @@ themselves.") (package/inherit libpciaccess (name "libpciaccess-static") (arguments - (substitute-keyword-arguments (package-arguments libpciaccess) + (substitute-keyword-arguments arguments ((#:configure-flags flags) #~(cons "-Ddefault_library=static" #$flags)))) (propagated-inputs @@ -6738,7 +6738,7 @@ and embedded platforms.") (modify-inputs (package-inputs uim) (prepend gtk+))) (arguments - (substitute-keyword-arguments (package-arguments uim) + (substitute-keyword-arguments arguments ((#:configure-flags configure-flags) #~(append #$configure-flags (list "CFLAGS=-O2 -g -fcommon"))))) diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm index 06951d36586..11d17e527ad 100644 --- a/gnu/packages/zig-xyz.scm +++ b/gnu/packages/zig-xyz.scm @@ -386,7 +386,7 @@ across several operating systems.") (sha256 (base32 "1ilq3hqprrwpbz7ckp01g4ksl41jq57rd7zf622w3immy6apc8k2")))) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:zig _ #f) zig-0.14)))))) (define-public zig-known-folders-for-zls-0.15 @@ -407,7 +407,7 @@ across several operating systems.") (sha256 (base32 "1bwv7kndr4lv7khrrjwg2vgg3cy41y28rmv7rbv7jy06shqy4nzq")))) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:zig _ #f) zig-0.15)))))) (define-public zig-pixman diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm index 3801ac8ad53..089305ef8a5 100644 --- a/gnu/packages/zig.scm +++ b/gnu/packages/zig.scm @@ -362,7 +362,7 @@ toolchain. Among other features it provides version commit "08pm3f4hh6djl3szhqgm7fa3qisdl2xh9jrp18m0z7bk2vd0bzw7")) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ;; Patch for fixing RUNPATH not applied to intermediate versions. ((#:validate-runpath? _ #t) #f) ;; Patch for cross-compilation not applied to intermediate versions. @@ -439,7 +439,7 @@ toolchain. Among other features it provides "1qsfsv8wg0kz616sgj7dw9ihdz5rsm80p3ambl5lnkrjhwym7z7x")) (patches (search-patches "zig-0.10.0-675-TypeOf-hack.patch")))) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases '%standard-phases) #~(modify-phases #$phases (add-after 'unpack 'set-host-triple @@ -488,7 +488,7 @@ toolchain. Among other features it provides version commit "0829wymcwph71zlwql6v7i7j9gr1m96acyp2xsr69vq2h98wmlap")) (arguments - (substitute-keyword-arguments (package-arguments base) + (substitute-keyword-arguments arguments ((#:phases phases '%standard-phases) #~(modify-phases #$phases (replace 'prepare-source diff --git a/gnu/packages/zile.scm b/gnu/packages/zile.scm index 3adf470853b..b5cf260ee75 100644 --- a/gnu/packages/zile.scm +++ b/gnu/packages/zile.scm @@ -137,7 +137,7 @@ default Emacs configuration, but it carries a much lighter feature set.") ,@(package-native-inputs zile))) (arguments - (substitute-keyword-arguments (package-arguments zile) + (substitute-keyword-arguments arguments ((#:phases phases) `(modify-phases ,phases (replace 'bootstrap |