From c4f5dfad0dfd4a7c29ae40bbf7951e2371c28d8b Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sun, 8 Mar 2026 11:06:45 +0100 Subject: [PATCH] treewide: Remove continuation escape at end of commands To avoid confusion and spurious newlines in the output. Found by searching for a backslash followed by a newline, some indentation, and then the end of multi-line string marker, using the following extended regex: ```regex \\\n +''; ``` --- nixos/modules/services/backup/restic-rest-server.nix | 2 +- nixos/modules/services/databases/dgraph.nix | 2 +- .../monitoring/prometheus/exporters/collectd.nix | 2 +- nixos/modules/services/networking/teamspeak3.nix | 2 +- nixos/modules/services/x11/unclutter-xfixes.nix | 2 +- nixos/modules/services/x11/unclutter.nix | 2 +- nixos/tests/matrix/mjolnir.nix | 2 +- nixos/tests/matrix/pantalaimon.nix | 2 +- pkgs/applications/science/logic/hol_light/default.nix | 2 +- pkgs/applications/virtualization/krunvm/default.nix | 2 +- pkgs/build-support/rust/lib/default.nix | 2 +- pkgs/by-name/aw/awslogs/package.nix | 2 +- pkgs/by-name/ay/ayatana-indicator-sound/package.nix | 2 +- pkgs/by-name/bl/bleep/package.nix | 2 +- pkgs/by-name/bo/bootiso/package.nix | 2 +- pkgs/by-name/cb/cbmc/package.nix | 2 +- pkgs/by-name/co/coost/package.nix | 2 +- pkgs/by-name/cu/cubelify/package.nix | 2 +- pkgs/by-name/de/deckmaster/package.nix | 2 +- pkgs/by-name/fl/flyway/package.nix | 2 +- pkgs/by-name/fs/fsautocomplete/package.nix | 2 +- pkgs/by-name/fw/fwupd/package.nix | 2 +- pkgs/by-name/gt/gtypist/package.nix | 2 +- pkgs/by-name/h5/h5utils/package.nix | 2 +- pkgs/by-name/hu/hunspell/dictionaries.nix | 2 +- pkgs/by-name/hw/hwatch/package.nix | 2 +- pkgs/by-name/hy/hyperscan/package.nix | 2 +- pkgs/by-name/je/jellyfin-web/package.nix | 2 +- pkgs/by-name/ke/kew/package.nix | 2 +- pkgs/by-name/ke/keychain/package.nix | 2 +- pkgs/by-name/li/lib60870/package.nix | 2 +- pkgs/by-name/li/libfprint-tod/package.nix | 2 +- pkgs/by-name/lo/loupe/package.nix | 2 +- pkgs/by-name/lu/lunar-client/package.nix | 2 +- pkgs/by-name/ma/mackup/package.nix | 2 +- pkgs/by-name/mp/mpv/scripts/convert.nix | 2 +- pkgs/by-name/no/notion/package.nix | 2 +- pkgs/by-name/op/open-isns/package.nix | 2 +- pkgs/by-name/po/poetry/unwrapped.nix | 2 +- pkgs/by-name/pr/prometheus-cpp-lite/package.nix | 2 +- pkgs/by-name/ra/rascal/package.nix | 2 +- pkgs/by-name/re/renode/package.nix | 2 +- pkgs/by-name/sh/sharedown/package.nix | 2 +- pkgs/by-name/sn/snowsql/package.nix | 2 +- pkgs/by-name/sp/spacectl/package.nix | 2 +- pkgs/by-name/sp/speakersafetyd/package.nix | 2 +- pkgs/by-name/sp/splix/package.nix | 2 +- pkgs/by-name/ss/sshuttle/package.nix | 2 +- pkgs/by-name/st/steamguard-cli/package.nix | 2 +- pkgs/by-name/su/supertuxkart/package.nix | 2 +- pkgs/by-name/tl/tldr/package.nix | 2 +- pkgs/by-name/vi/victoriametrics/package.nix | 2 +- pkgs/by-name/zp/zps/package.nix | 2 +- pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix | 2 +- pkgs/desktops/lxqt/compton-conf/default.nix | 2 +- .../development/compilers/opensmalltalk-vm/default.nix | 2 +- .../compilers/swift/swiftpm2nix/default.nix | 2 +- pkgs/development/coq-modules/compcert/default.nix | 10 +++++++--- pkgs/development/libraries/rlottie-qml/default.nix | 2 +- .../libraries/science/math/libtorch/bin.nix | 2 +- pkgs/development/python-modules/devtools/default.nix | 2 +- .../python-modules/django-pgpubsub/default.nix | 2 +- pkgs/development/python-modules/elgato/default.nix | 2 +- pkgs/development/python-modules/ffcv/default.nix | 2 +- pkgs/development/python-modules/green/default.nix | 2 +- pkgs/development/python-modules/ipycanvas/default.nix | 2 +- pkgs/development/python-modules/open-meteo/default.nix | 2 +- .../python-modules/pyppeteer-ng/default.nix | 2 +- pkgs/development/python-modules/pyvips/default.nix | 2 +- pkgs/development/python-modules/rdkit/default.nix | 2 +- .../python-modules/rendercv-fonts/default.nix | 2 +- .../sphinx-last-updated-by-git/default.nix | 2 +- .../python-modules/strawberry-graphql/default.nix | 2 +- pkgs/development/python-modules/tensorflow/default.nix | 2 +- pkgs/development/python-modules/vehicle/default.nix | 2 +- pkgs/development/python-modules/wled/default.nix | 2 +- pkgs/development/python-modules/zstandard/default.nix | 2 +- pkgs/development/r-modules/default.nix | 2 +- pkgs/games/fteqw/default.nix | 2 +- .../custom-components/systemair/package.nix | 2 +- 80 files changed, 86 insertions(+), 82 deletions(-) diff --git a/nixos/modules/services/backup/restic-rest-server.nix b/nixos/modules/services/backup/restic-rest-server.nix index 6b374e0b0213..9610cf0f7b1a 100644 --- a/nixos/modules/services/backup/restic-rest-server.nix +++ b/nixos/modules/services/backup/restic-rest-server.nix @@ -94,7 +94,7 @@ in ${lib.optionalString cfg.appendOnly "--append-only"} \ ${lib.optionalString cfg.privateRepos "--private-repos"} \ ${lib.optionalString cfg.prometheus "--prometheus"} \ - ${lib.escapeShellArgs cfg.extraFlags} \ + ${lib.escapeShellArgs cfg.extraFlags} ''; Type = "simple"; User = "restic"; diff --git a/nixos/modules/services/databases/dgraph.nix b/nixos/modules/services/databases/dgraph.nix index 9e0a463b0b37..f92e9d81e74e 100644 --- a/nixos/modules/services/databases/dgraph.nix +++ b/nixos/modules/services/databases/dgraph.nix @@ -16,7 +16,7 @@ let '' mkdir -p $out/bin makeWrapper ${cfg.package}/bin/dgraph $out/bin/dgraph \ - --prefix PATH : "${lib.makeBinPath [ pkgs.nodejs ]}" \ + --prefix PATH : "${lib.makeBinPath [ pkgs.nodejs ]}" ''; securityOptions = { NoNewPrivileges = true; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix index b67ac32b443a..02663ce94b4f 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/collectd.nix @@ -86,7 +86,7 @@ in let collectSettingsArgs = optionalString (cfg.collectdBinary.enable) '' --collectd.listen-address ${cfg.collectdBinary.listenAddress}:${toString cfg.collectdBinary.port} \ - --collectd.security-level ${cfg.collectdBinary.securityLevel} \ + --collectd.security-level ${cfg.collectdBinary.securityLevel} ''; in { diff --git a/nixos/modules/services/networking/teamspeak3.nix b/nixos/modules/services/networking/teamspeak3.nix index 5c8942ca6076..d13875925cd2 100644 --- a/nixos/modules/services/networking/teamspeak3.nix +++ b/nixos/modules/services/networking/teamspeak3.nix @@ -185,7 +185,7 @@ in ${optionalString (cfg.fileTransferIP != null) "filetransfer_ip=${cfg.fileTransferIP}"} \ ${optionalString (cfg.queryIP != null) "query_ip=${cfg.queryIP}"} \ ${optionalString (cfg.queryIP != null) "query_ssh_ip=${cfg.queryIP}"} \ - ${optionalString (cfg.queryIP != null) "query_http_ip=${cfg.queryIP}"} \ + ${optionalString (cfg.queryIP != null) "query_http_ip=${cfg.queryIP}"} ''; WorkingDirectory = cfg.dataDir; User = user; diff --git a/nixos/modules/services/x11/unclutter-xfixes.nix b/nixos/modules/services/x11/unclutter-xfixes.nix index 48adb3665f38..53d544af68e0 100644 --- a/nixos/modules/services/x11/unclutter-xfixes.nix +++ b/nixos/modules/services/x11/unclutter-xfixes.nix @@ -55,7 +55,7 @@ in ${cfg.package}/bin/unclutter \ --timeout ${toString cfg.timeout} \ --jitter ${toString (cfg.threshold - 1)} \ - ${concatMapStrings (x: " --" + x) cfg.extraOptions} \ + ${concatMapStrings (x: " --" + x) cfg.extraOptions} ''; serviceConfig.RestartSec = 3; serviceConfig.Restart = "always"; diff --git a/nixos/modules/services/x11/unclutter.nix b/nixos/modules/services/x11/unclutter.nix index bb11c8639783..d555aaac7f0f 100644 --- a/nixos/modules/services/x11/unclutter.nix +++ b/nixos/modules/services/x11/unclutter.nix @@ -69,7 +69,7 @@ in -jitter ${toString (cfg.threshold - 1)} \ ${optionalString cfg.keystroke "-keystroke"} \ ${concatMapStrings (x: " -" + x) cfg.extraOptions} \ - -not ${concatStringsSep " " cfg.excluded} \ + -not ${concatStringsSep " " cfg.excluded} ''; serviceConfig.PassEnvironment = "DISPLAY"; serviceConfig.RestartSec = 3; diff --git a/nixos/tests/matrix/mjolnir.nix b/nixos/tests/matrix/mjolnir.nix index bc74902c7f20..f1e5e7821f82 100644 --- a/nixos/tests/matrix/mjolnir.nix +++ b/nixos/tests/matrix/mjolnir.nix @@ -17,7 +17,7 @@ let csr = runWithOpenSSL "matrix.csr" '' openssl req \ -new -key ${key} \ - -out $out -subj "/CN=localhost" \ + -out $out -subj "/CN=localhost" ''; cert = runWithOpenSSL "matrix_cert.pem" '' openssl x509 \ diff --git a/nixos/tests/matrix/pantalaimon.nix b/nixos/tests/matrix/pantalaimon.nix index b2538ca17dfb..fdf2c4de7ad3 100644 --- a/nixos/tests/matrix/pantalaimon.nix +++ b/nixos/tests/matrix/pantalaimon.nix @@ -19,7 +19,7 @@ let csr = runWithOpenSSL "matrix.csr" '' openssl req \ -new -key ${key} \ - -out $out -subj "/CN=localhost" \ + -out $out -subj "/CN=localhost" ''; cert = runWithOpenSSL "matrix_cert.pem" '' openssl x509 \ diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index fc60ec0b1f28..021d01fffce4 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -24,7 +24,7 @@ let lib.optionalString (num != null) '' -I ${num}/lib/ocaml/${ocaml.version}/site-lib/num \ -I ${num}/lib/ocaml/${ocaml.version}/site-lib/top-num \ - -I ${num}/lib/ocaml/${ocaml.version}/site-lib/stublibs \ + -I ${num}/lib/ocaml/${ocaml.version}/site-lib/stublibs ''; start_script = '' diff --git a/pkgs/applications/virtualization/krunvm/default.nix b/pkgs/applications/virtualization/krunvm/default.nix index 5133bc090e69..cfc28c1e8bc0 100644 --- a/pkgs/applications/virtualization/krunvm/default.nix +++ b/pkgs/applications/virtualization/krunvm/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/krunvm \ - --prefix PATH : ${lib.makeBinPath [ buildah ]} \ + --prefix PATH : ${lib.makeBinPath [ buildah ]} ''; meta = { diff --git a/pkgs/build-support/rust/lib/default.nix b/pkgs/build-support/rust/lib/default.nix index e492d03e3026..7198fa961a91 100644 --- a/pkgs/build-support/rust/lib/default.nix +++ b/pkgs/build-support/rust/lib/default.nix @@ -77,7 +77,7 @@ + lib.optionalString (rustTargetPlatform != rustHostPlatform) '' "CC_${stdenv.targetPlatform.rust.cargoEnvVarTarget}=${ccForTarget}" \ "CXX_${stdenv.targetPlatform.rust.cargoEnvVarTarget}=${cxxForTarget}" \ - "CARGO_TARGET_${stdenv.targetPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForTarget}" \ + "CARGO_TARGET_${stdenv.targetPlatform.rust.cargoEnvVarTarget}_LINKER=${ccForTarget}" ''; }; } diff --git a/pkgs/by-name/aw/awslogs/package.nix b/pkgs/by-name/aw/awslogs/package.nix index 9edfbff153e4..a44cfd52444d 100644 --- a/pkgs/by-name/aw/awslogs/package.nix +++ b/pkgs/by-name/aw/awslogs/package.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { postPatch = '' substituteInPlace setup.py \ - --replace "boto3>=1.34.75" "boto3>=1.34.58" \ + --replace "boto3>=1.34.75" "boto3>=1.34.58" ''; nativeCheckInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix index 142aefe75ad6..0220ef35fa2e 100644 --- a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { tests/volume-control-test.cc \ --replace-quiet 'loop(50)' 'loop(500)' \ --replace-quiet 'loop(100)' 'loop(1000)' \ - --replace-quiet 'loop(500)' 'loop(5000)' \ + --replace-quiet 'loop(500)' 'loop(5000)' ''; strictDeps = true; diff --git a/pkgs/by-name/bl/bleep/package.nix b/pkgs/by-name/bl/bleep/package.nix index e5710dfbcdc6..2ed661c7138e 100644 --- a/pkgs/by-name/bl/bleep/package.nix +++ b/pkgs/by-name/bl/bleep/package.nix @@ -57,7 +57,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { export PATH=$PATH:$out/bin installShellCompletion --cmd bleep \ --bash <(bleep install-tab-completions-bash --stdout) \ - --zsh <(bleep install-tab-completions-zsh --stdout) \ + --zsh <(bleep install-tab-completions-zsh --stdout) ''; passthru.tests.version = testers.testVersion { diff --git a/pkgs/by-name/bo/bootiso/package.nix b/pkgs/by-name/bo/bootiso/package.nix index 38a7d7a3d540..59d30c2167d8 100644 --- a/pkgs/by-name/bo/bootiso/package.nix +++ b/pkgs/by-name/bo/bootiso/package.nix @@ -60,7 +60,7 @@ stdenvNoCC.mkDerivation rec { gnugrep busybox ] - } \ + } ''; meta = { diff --git a/pkgs/by-name/cb/cbmc/package.nix b/pkgs/by-name/cb/cbmc/package.nix index 77c0d72ce4e7..6ae48f70a8cc 100644 --- a/pkgs/by-name/cb/cbmc/package.nix +++ b/pkgs/by-name/cb/cbmc/package.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { mv $out/bin/ls_parse.py $out/share/cbmc/ls_parse.py chmod +x $out/share/cbmc/ls_parse.py wrapProgram $out/bin/goto-cc \ - --prefix PATH : "$out/share/cbmc" \ + --prefix PATH : "$out/share/cbmc" ''; env.NIX_CFLAGS_COMPILE = toString ( diff --git a/pkgs/by-name/co/coost/package.nix b/pkgs/by-name/co/coost/package.nix index 0ecdf3cf684b..3c7402c3a708 100644 --- a/pkgs/by-name/co/coost/package.nix +++ b/pkgs/by-name/co/coost/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace cmake/coost.pc.in \ --replace-fail '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace-fail '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ \ + --replace-fail '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ ''; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/cu/cubelify/package.nix b/pkgs/by-name/cu/cubelify/package.nix index 168245ba8d9d..e809ba5e108f 100644 --- a/pkgs/by-name/cu/cubelify/package.nix +++ b/pkgs/by-name/cu/cubelify/package.nix @@ -25,7 +25,7 @@ appimageTools.wrapType2 rec { install -Dm444 ${contents}/cubelify-overlay.desktop -t $out/share/applications/ install -Dm444 ${contents}/cubelify-overlay.png -t $out/share/pixmaps/ substituteInPlace $out/share/applications/cubelify-overlay.desktop \ - --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=cubelify' \ + --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=cubelify' ''; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/de/deckmaster/package.nix b/pkgs/by-name/de/deckmaster/package.nix index 88ff5d566351..93a8d50e16a7 100644 --- a/pkgs/by-name/de/deckmaster/package.nix +++ b/pkgs/by-name/de/deckmaster/package.nix @@ -33,7 +33,7 @@ buildGoModule (finalAttrs: { # Let the app find Roboto-*.ttf files (hard-coded file names). postFixup = '' wrapProgram $out/bin/deckmaster \ - --prefix XDG_DATA_DIRS : "${roboto.out}/share/" \ + --prefix XDG_DATA_DIRS : "${roboto.out}/share/" ''; meta = { diff --git a/pkgs/by-name/fl/flyway/package.nix b/pkgs/by-name/fl/flyway/package.nix index 3882140ae58f..2aadb8c25e49 100644 --- a/pkgs/by-name/fl/flyway/package.nix +++ b/pkgs/by-name/fl/flyway/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper "${jre_headless}/bin/java" $out/bin/flyway \ --add-flags "-Djava.security.egd=file:/dev/../dev/urandom" \ --add-flags "-classpath '$out/share/flyway/lib/*:$out/share/flyway/lib/flyway/*:$out/share/flyway/lib/aad/*:$out/share/flyway/lib/netty/*:$out/share/flyway/drivers/*'" \ - --add-flags "org.flywaydb.commandline.Main" \ + --add-flags "org.flywaydb.commandline.Main" ''; passthru.tests = { version = testers.testVersion { package = finalAttrs.finalPackage; }; diff --git a/pkgs/by-name/fs/fsautocomplete/package.nix b/pkgs/by-name/fs/fsautocomplete/package.nix index 3a3938ff1781..5544a6998756 100644 --- a/pkgs/by-name/fs/fsautocomplete/package.nix +++ b/pkgs/by-name/fs/fsautocomplete/package.nix @@ -24,7 +24,7 @@ buildDotnetModule (finalAttrs: { rm global.json substituteInPlace src/FsAutoComplete/FsAutoComplete.fsproj \ - --replace-fail TargetFrameworks TargetFramework \ + --replace-fail TargetFrameworks TargetFramework ''; dotnet-sdk = dotnetCorePackages.sdk_8_0; diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix index cbdf4702a393..910db09751c0 100644 --- a/pkgs/by-name/fw/fwupd/package.nix +++ b/pkgs/by-name/fw/fwupd/package.nix @@ -310,7 +310,7 @@ stdenv.mkDerivation (finalAttrs: { addToSearchPath XDG_DATA_DIRS "${shared-mime-info}/share" echo "12345678901234567890123456789012" > machine-id - export NIX_REDIRECTS=/etc/machine-id=$(realpath machine-id) \ + export NIX_REDIRECTS=/etc/machine-id=$(realpath machine-id) ''; postInstall = '' diff --git a/pkgs/by-name/gt/gtypist/package.nix b/pkgs/by-name/gt/gtypist/package.nix index 5b3c20feb5b0..605960542202 100644 --- a/pkgs/by-name/gt/gtypist/package.nix +++ b/pkgs/by-name/gt/gtypist/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { preFixup = '' wrapProgram "$out/bin/typefortune" \ - --prefix PATH : "${fortune}/bin" \ + --prefix PATH : "${fortune}/bin" ''; meta = { diff --git a/pkgs/by-name/h5/h5utils/package.nix b/pkgs/by-name/h5/h5utils/package.nix index ac2ea6164fd7..8997c406099b 100644 --- a/pkgs/by-name/h5/h5utils/package.nix +++ b/pkgs/by-name/h5/h5utils/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { # libdf is an alternative name for libhdf (hdf4) preConfigure = lib.optionalString (hdf4 != null) '' substituteInPlace configure \ - --replace "-ldf" "-lhdf" \ + --replace "-ldf" "-lhdf" ''; preBuild = lib.optionalString hdf5.mpiSupport "export CC=${lib.getBin hdf5.mpi}/mpicc"; diff --git a/pkgs/by-name/hu/hunspell/dictionaries.nix b/pkgs/by-name/hu/hunspell/dictionaries.nix index 9e88526868b5..c24e5e356ead 100644 --- a/pkgs/by-name/hu/hunspell/dictionaries.nix +++ b/pkgs/by-name/hu/hunspell/dictionaries.nix @@ -88,7 +88,7 @@ let --replace /dev/stderr stderr.log substituteInPlace ortograf/herramientas/remover_comentarios.sh \ - --replace /bin/bash ${bash}/bin/bash \ + --replace /bin/bash ${bash}/bin/bash ''; buildPhase = '' cd ortograf/herramientas diff --git a/pkgs/by-name/hw/hwatch/package.nix b/pkgs/by-name/hw/hwatch/package.nix index 8d2c7f624f55..f9e804317157 100644 --- a/pkgs/by-name/hw/hwatch/package.nix +++ b/pkgs/by-name/hw/hwatch/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { installShellCompletion --cmd hwatch \ --bash $src/completion/bash/hwatch-completion.bash \ --fish $src/completion/fish/hwatch.fish \ - --zsh $src/completion/zsh/_hwatch \ + --zsh $src/completion/zsh/_hwatch ''; passthru.tests.version = testers.testVersion { diff --git a/pkgs/by-name/hy/hyperscan/package.nix b/pkgs/by-name/hy/hyperscan/package.nix index 9ff29a06b000..41fe9c8ac965 100644 --- a/pkgs/by-name/hy/hyperscan/package.nix +++ b/pkgs/by-name/hy/hyperscan/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace CMakeLists.txt \ --replace-fail \ "cmake_minimum_required (VERSION 2.8.11)" \ - "cmake_minimum_required (VERSION 3.10)" \ + "cmake_minimum_required (VERSION 3.10)" ''; buildInputs = [ boost ]; diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix index 8ebd24ab8fff..0d4d4f5d2841 100644 --- a/pkgs/by-name/je/jellyfin-web/package.nix +++ b/pkgs/by-name/je/jellyfin-web/package.nix @@ -28,7 +28,7 @@ buildNpmPackage (finalAttrs: { postPatch = '' substituteInPlace webpack.common.js \ - --replace-fail "git describe --always --dirty" "echo ${finalAttrs.src.rev}" \ + --replace-fail "git describe --always --dirty" "echo ${finalAttrs.src.rev}" ''; npmDepsHash = "sha256-bXZn2FOWeIN8VTNLbKe7jM7yDtE2QRmyoWNZXgE5W4Q="; diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix index 14bbd1340673..62c861990cfc 100644 --- a/pkgs/by-name/ke/kew/package.nix +++ b/pkgs/by-name/ke/kew/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace Makefile \ --replace-fail '$(shell uname -s)' '${uppercaseFirst stdenv.hostPlatform.parsed.kernel.name}' \ - --replace-fail '$(shell uname -m)' '${stdenv.hostPlatform.parsed.cpu.name}' \ + --replace-fail '$(shell uname -m)' '${stdenv.hostPlatform.parsed.cpu.name}' ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/ke/keychain/package.nix b/pkgs/by-name/ke/keychain/package.nix index 2583d183f81f..9c5c35275f02 100644 --- a/pkgs/by-name/ke/keychain/package.nix +++ b/pkgs/by-name/ke/keychain/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { openssh procps ] - }" \ + }" ''; meta = { diff --git a/pkgs/by-name/li/lib60870/package.nix b/pkgs/by-name/li/lib60870/package.nix index 3887f73d2329..0878ce66cec0 100644 --- a/pkgs/by-name/li/lib60870/package.nix +++ b/pkgs/by-name/li/lib60870/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/CMakeLists.txt \ - --replace-warn "-lrt" "" \ + --replace-warn "-lrt" "" ''; separateDebugInfo = true; diff --git a/pkgs/by-name/li/libfprint-tod/package.nix b/pkgs/by-name/li/libfprint-tod/package.nix index 1f6c3515c3bb..9abebbb42b25 100644 --- a/pkgs/by-name/li/libfprint-tod/package.nix +++ b/pkgs/by-name/li/libfprint-tod/package.nix @@ -39,7 +39,7 @@ libfprint.overrideAttrs ( patchShebangs \ ./libfprint/tod/tests/*.sh \ ./tests/*.py \ - ./tests/*.sh \ + ./tests/*.sh ''; meta = { diff --git a/pkgs/by-name/lo/loupe/package.nix b/pkgs/by-name/lo/loupe/package.nix index d441f1708c7f..25042aba5cc5 100644 --- a/pkgs/by-name/lo/loupe/package.nix +++ b/pkgs/by-name/lo/loupe/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace src/meson.build --replace-fail \ "'src' / rust_target / meson.project_name()," \ - "'src' / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()," \ + "'src' / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()," ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index 9eb8b1168f3c..796ddd762411 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -26,7 +26,7 @@ appimageTools.wrapType2 rec { install -Dm444 ${contents}/lunarclient.desktop -t $out/share/applications/ install -Dm444 ${contents}/lunarclient.png -t $out/share/pixmaps/ substituteInPlace $out/share/applications/lunarclient.desktop \ - --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=lunarclient' \ + --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=lunarclient' ''; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/ma/mackup/package.nix b/pkgs/by-name/ma/mackup/package.nix index f8282f79ae86..32d046e79f4d 100644 --- a/pkgs/by-name/ma/mackup/package.nix +++ b/pkgs/by-name/ma/mackup/package.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication (finalAttrs: { postPatch = '' substituteInPlace src/mackup/utils.py \ - --replace-fail '"/usr/bin/pgrep"' '"${lib.getExe' procps "pgrep"}"' \ + --replace-fail '"/usr/bin/pgrep"' '"${lib.getExe' procps "pgrep"}"' ''; build-system = with python3Packages; [ hatchling ]; diff --git a/pkgs/by-name/mp/mpv/scripts/convert.nix b/pkgs/by-name/mp/mpv/scripts/convert.nix index 34243ab928d3..b9e2eaee739b 100644 --- a/pkgs/by-name/mp/mpv/scripts/convert.nix +++ b/pkgs/by-name/mp/mpv/scripts/convert.nix @@ -30,7 +30,7 @@ buildLua { --replace-fail 'yad_exe = "yad"' \ 'yad_exe = "${lib.getExe yad}"' \ --replace-fail 'notify_send_exe = "notify-send"' \ - 'notify_send_exe = "${lib.getExe libnotify}"' \ + 'notify_send_exe = "${lib.getExe libnotify}"' ''; scriptPath = "convert_script.lua"; diff --git a/pkgs/by-name/no/notion/package.nix b/pkgs/by-name/no/notion/package.nix index 60993705765a..46142ce9937b 100644 --- a/pkgs/by-name/no/notion/package.nix +++ b/pkgs/by-name/no/notion/package.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { xmessage xterm ] - }" \ + }" ''; meta = { diff --git a/pkgs/by-name/op/open-isns/package.nix b/pkgs/by-name/op/open-isns/package.nix index 8904c48d0729..0aafe0d6ee35 100644 --- a/pkgs/by-name/op/open-isns/package.nix +++ b/pkgs/by-name/op/open-isns/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { # The location of /var/lib is not made configurable in the meson.build file postPatch = '' substituteInPlace meson.build \ - --replace-fail "/var/lib" "$out/var/lib" \ + --replace-fail "/var/lib" "$out/var/lib" ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/po/poetry/unwrapped.nix b/pkgs/by-name/po/poetry/unwrapped.nix index 950ffddc7302..8a97759250cd 100644 --- a/pkgs/by-name/po/poetry/unwrapped.nix +++ b/pkgs/by-name/po/poetry/unwrapped.nix @@ -86,7 +86,7 @@ buildPythonPackage rec { installShellCompletion --cmd poetry \ --bash <($out/bin/poetry completions bash) \ --fish <($out/bin/poetry completions fish) \ - --zsh <($out/bin/poetry completions zsh) \ + --zsh <($out/bin/poetry completions zsh) ''; nativeCheckInputs = [ diff --git a/pkgs/by-name/pr/prometheus-cpp-lite/package.nix b/pkgs/by-name/pr/prometheus-cpp-lite/package.nix index 9a9cda17c9bb..17a5679823d2 100644 --- a/pkgs/by-name/pr/prometheus-cpp-lite/package.nix +++ b/pkgs/by-name/pr/prometheus-cpp-lite/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace 3rdpatry/http-client-lite/CMakeLists.txt --replace-fail \ 'cmake_minimum_required(VERSION 3.3 FATAL_ERROR)' \ - 'cmake_minimum_required(VERSION 3.10)' \ + 'cmake_minimum_required(VERSION 3.10)' ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/ra/rascal/package.nix b/pkgs/by-name/ra/rascal/package.nix index dd16fe1e5e73..1e7ecf028f6d 100644 --- a/pkgs/by-name/ra/rascal/package.nix +++ b/pkgs/by-name/ra/rascal/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' mkdir -p $out/bin makeWrapper ${jdk}/bin/java $out/bin/rascal \ - --add-flags "-jar ${finalAttrs.src}" \ + --add-flags "-jar ${finalAttrs.src}" ''; meta = { diff --git a/pkgs/by-name/re/renode/package.nix b/pkgs/by-name/re/renode/package.nix index 42255102d626..fe30644afbe9 100644 --- a/pkgs/by-name/re/renode/package.nix +++ b/pkgs/by-name/re/renode/package.nix @@ -171,7 +171,7 @@ buildDotnetModule rec { --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" \ --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3-x11 ]}" \ --prefix PYTHONPATH : "${pythonLibs}" \ - --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" \ + --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" ''; postFixup = '' diff --git a/pkgs/by-name/sh/sharedown/package.nix b/pkgs/by-name/sh/sharedown/package.nix index b5d89d06fe97..fedaa6db4cef 100644 --- a/pkgs/by-name/sh/sharedown/package.nix +++ b/pkgs/by-name/sh/sharedown/package.nix @@ -59,7 +59,7 @@ buildNpmPackage (finalAttrs: { --add-flags $out/lib/node_modules/sharedown/app.js \ --set PUPPETEER_EXECUTABLE_PATH ${chromium}/bin/chromium \ --prefix PATH : ${lib.makeBinPath finalAttrs.finalPackage.passthru.wrapperPaths} \ - --add-flags "--no-sandbox" \ + --add-flags "--no-sandbox" ''; desktopItems = [ diff --git a/pkgs/by-name/sn/snowsql/package.nix b/pkgs/by-name/sn/snowsql/package.nix index ebcb08dd514a..73924baaaa4e 100644 --- a/pkgs/by-name/sn/snowsql/package.nix +++ b/pkgs/by-name/sn/snowsql/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { lib64/snowflake/snowsql/snowsql makeWrapper $out/lib64/snowflake/snowsql/snowsql $out/bin/snowsql \ - --set LD_LIBRARY_PATH "${libPath}":"${placeholder "out"}"/lib64/snowflake/snowsql \ + --set LD_LIBRARY_PATH "${libPath}":"${placeholder "out"}"/lib64/snowflake/snowsql ''; meta = { diff --git a/pkgs/by-name/sp/spacectl/package.nix b/pkgs/by-name/sp/spacectl/package.nix index 79f9074f8942..57ac3c873173 100644 --- a/pkgs/by-name/sp/spacectl/package.nix +++ b/pkgs/by-name/sp/spacectl/package.nix @@ -30,7 +30,7 @@ buildGoModule (finalAttrs: { installShellCompletion --cmd spacectl \ --bash <(${emulator} $out/bin/spacectl completion bash) \ --fish <(${emulator} $out/bin/spacectl completion fish) \ - --zsh <(${emulator} $out/bin/spacectl completion zsh) \ + --zsh <(${emulator} $out/bin/spacectl completion zsh) ''; meta = { diff --git a/pkgs/by-name/sp/speakersafetyd/package.nix b/pkgs/by-name/sp/speakersafetyd/package.nix index eab22ba075df..43c658a2e4b3 100644 --- a/pkgs/by-name/sp/speakersafetyd/package.nix +++ b/pkgs/by-name/sp/speakersafetyd/package.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: { substituteInPlace Makefile \ --replace-fail "target/release" \ - "target/${stdenv.hostPlatform.rust.cargoShortTarget}/$cargoBuildType" \ + "target/${stdenv.hostPlatform.rust.cargoShortTarget}/$cargoBuildType" ''; installFlags = [ diff --git a/pkgs/by-name/sp/splix/package.nix b/pkgs/by-name/sp/splix/package.nix index e52319bbbd4c..bb326c249026 100644 --- a/pkgs/by-name/sp/splix/package.nix +++ b/pkgs/by-name/sp/splix/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { mv -v *.ppd ppd/ substituteInPlace src/pstoqpdl.cpp \ --replace "RASTERDIR \"/\" RASTERTOQPDL" "\"$out/lib/cups/filter/rastertoqpdl\"" \ - --replace "RASTERDIR" "\"${cups-filters}/lib/cups/filter\"" \ + --replace "RASTERDIR" "\"${cups-filters}/lib/cups/filter\"" ''; makeFlags = [ diff --git a/pkgs/by-name/ss/sshuttle/package.nix b/pkgs/by-name/ss/sshuttle/package.nix index dbdf4dbfc968..e30011d6803f 100644 --- a/pkgs/by-name/ss/sshuttle/package.nix +++ b/pkgs/by-name/ss/sshuttle/package.nix @@ -58,7 +58,7 @@ python3Packages.buildPythonApplication (finalAttrs: { net-tools ] ) - }" \ + }" ''; meta = { diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix index 68631bd00038..8e0c0fa2b301 100644 --- a/pkgs/by-name/st/steamguard-cli/package.nix +++ b/pkgs/by-name/st/steamguard-cli/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { installShellCompletion --cmd steamguard \ --bash <($out/bin/steamguard completion --shell bash) \ --fish <($out/bin/steamguard completion --shell fish) \ - --zsh <($out/bin/steamguard completion --shell zsh) \ + --zsh <($out/bin/steamguard completion --shell zsh) ''; meta = { diff --git a/pkgs/by-name/su/supertuxkart/package.nix b/pkgs/by-name/su/supertuxkart/package.nix index b6fae7be863e..5b17db4bec81 100644 --- a/pkgs/by-name/su/supertuxkart/package.nix +++ b/pkgs/by-name/su/supertuxkart/package.nix @@ -143,7 +143,7 @@ stdenv.mkDerivation (finalAttrs: { preFixup = '' wrapProgram $out/bin/supertuxkart \ --set-default SUPERTUXKART_ASSETS_DIR "${assets}" \ - --set-default SUPERTUXKART_DATADIR "$out/share/supertuxkart" \ + --set-default SUPERTUXKART_DATADIR "$out/share/supertuxkart" ''; meta = { diff --git a/pkgs/by-name/tl/tldr/package.nix b/pkgs/by-name/tl/tldr/package.nix index 353142bc67e0..ccf9e7dcb1c7 100644 --- a/pkgs/by-name/tl/tldr/package.nix +++ b/pkgs/by-name/tl/tldr/package.nix @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication (finalAttrs: { postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd tldr \ --bash <($out/bin/tldr --print-completion bash | sed -E "s#\"/nix/store/[^\"]+/bin/python[^\"]*\" -m tldr#\"$out/bin/tldr\"#g") \ - --zsh <($out/bin/tldr --print-completion zsh | sed -E "s#\"/nix/store/[^\"]+/bin/python[^\"]*\" -m tldr#\"$out/bin/tldr\"#g") \ + --zsh <($out/bin/tldr --print-completion zsh | sed -E "s#\"/nix/store/[^\"]+/bin/python[^\"]*\" -m tldr#\"$out/bin/tldr\"#g") ''; meta = { diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 6568a50e06fd..1936a505a2d8 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -60,7 +60,7 @@ buildGo126Module (finalAttrs: { substituteInPlace lib/storage/storage_test.go \ --replace-fail "time.After(10 " "time.After(120 " \ --replace-fail "time.NewTimer(30 " "time.NewTimer(120 " \ - --replace-fail "time.NewTimer(time.Second * 10)" "time.NewTimer(time.Second * 120)" \ + --replace-fail "time.NewTimer(time.Second * 10)" "time.NewTimer(time.Second * 120)" ''; ldflags = [ diff --git a/pkgs/by-name/zp/zps/package.nix b/pkgs/by-name/zp/zps/package.nix index c61b15706f9a..17660daf2ac0 100644 --- a/pkgs/by-name/zp/zps/package.nix +++ b/pkgs/by-name/zp/zps/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' mkdir -p $out/share/applications substitute ../.application/zps.desktop $out/share/applications/zps.desktop \ - --replace Exec=zps Exec=$out/zps \ + --replace Exec=zps Exec=$out/zps ''; meta = { diff --git a/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix b/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix index 25e59f222ec9..95f926bae663 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' # Queries QMake for QML install location, returns QtBase build path substituteInPlace src/*/PushNotifications/CMakeLists.txt \ - --replace-fail 'qmake -query QT_INSTALL_QML' 'echo ''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}' \ + --replace-fail 'qmake -query QT_INSTALL_QML' 'echo ''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}' ''; strictDeps = true; diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix index f5b086b06d13..d53ceaf0864c 100644 --- a/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/compton-conf/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace autostart/CMakeLists.txt \ - --replace-fail "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \ + --replace-fail "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" ''; postPatch = '' diff --git a/pkgs/development/compilers/opensmalltalk-vm/default.nix b/pkgs/development/compilers/opensmalltalk-vm/default.nix index e65b74b6cc5b..fd9299482bb3 100644 --- a/pkgs/development/compilers/opensmalltalk-vm/default.nix +++ b/pkgs/development/compilers/opensmalltalk-vm/default.nix @@ -60,7 +60,7 @@ let --replace "/bin/rm" "rm" substituteInPlace ./platforms/unix/config/configure \ --replace "/usr/bin/file" "file" \ - --replace "/usr/bin/pkg-config" "pkg-config" \ + --replace "/usr/bin/pkg-config" "pkg-config" ''; preConfigure = '' diff --git a/pkgs/development/compilers/swift/swiftpm2nix/default.nix b/pkgs/development/compilers/swift/swiftpm2nix/default.nix index f0765cb79a0c..208067014730 100644 --- a/pkgs/development/compilers/swift/swiftpm2nix/default.nix +++ b/pkgs/development/compilers/swift/swiftpm2nix/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { jq nurl ] - } \ + } ''; preferLocalBuild = true; diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index d5c7bd558e85..8bfca13c6837 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -98,8 +98,8 @@ let -toolprefix ${tools}/bin/ \ -use-external-Flocq \ -use-external-MenhirLib \ - ${target} \ - ''; # don't remove the \ above, the command gets appended in override below + ${target} + ''; installTargets = "documentation install"; installFlags = [ ]; # trust ./configure @@ -342,6 +342,10 @@ in patched_compcert.overrideAttrs ( o: lib.optionalAttrs (coq.version != null && coq.version == "dev") { - configurePhase = "${o.configurePhase} -ignore-ocaml-version -ignore-coq-version"; + configurePhase = '' + ${o.configurePhase} \ + -ignore-ocaml-version \ + -ignore-coq-version + ''; } ) diff --git a/pkgs/development/libraries/rlottie-qml/default.nix b/pkgs/development/libraries/rlottie-qml/default.nix index 542180c6f086..c223d4928c3b 100644 --- a/pkgs/development/libraries/rlottie-qml/default.nix +++ b/pkgs/development/libraries/rlottie-qml/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { # Fix QML install path substituteInPlace CMakeLists.txt \ --replace-fail 'QT_IMPORTS_DIR "/lib/''${ARCH_TRIPLET}"' 'QT_IMPORTS_DIR "''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"' \ - --replace-fail "\''${QT_IMPORTS_DIR}/\''${PLUGIN}" "\''${QT_IMPORTS_DIR}" \ + --replace-fail "\''${QT_IMPORTS_DIR}/\''${PLUGIN}" "\''${QT_IMPORTS_DIR}" ''; strictDeps = true; diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix index f0b5a08af427..cc6d362619be 100644 --- a/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { substituteInPlace \ $dev/share/cmake/Caffe2/Caffe2Targets-release.cmake \ - --replace \''${_IMPORT_PREFIX}/lib "$out/lib" \ + --replace \''${_IMPORT_PREFIX}/lib "$out/lib" ''; postFixup = diff --git a/pkgs/development/python-modules/devtools/default.nix b/pkgs/development/python-modules/devtools/default.nix index fd49d7e4cb10..07218162bb4e 100644 --- a/pkgs/development/python-modules/devtools/default.nix +++ b/pkgs/development/python-modules/devtools/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail 'asttokens>=2.0.0,<3.0.0' 'asttokens>=2.0.0' \ + --replace-fail 'asttokens>=2.0.0,<3.0.0' 'asttokens>=2.0.0' ''; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/django-pgpubsub/default.nix b/pkgs/development/python-modules/django-pgpubsub/default.nix index b9498dc50260..e37d3bea14b0 100644 --- a/pkgs/development/python-modules/django-pgpubsub/default.nix +++ b/pkgs/development/python-modules/django-pgpubsub/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace 'poetry.masonry.api' 'poetry.core.masonry.api' \ - --replace 'poetry>=1.1.13' 'poetry-core>=1.0.0' \ + --replace 'poetry>=1.1.13' 'poetry-core>=1.0.0' ''; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/elgato/default.nix b/pkgs/development/python-modules/elgato/default.nix index 780dcf69ad57..cef275238932 100644 --- a/pkgs/development/python-modules/elgato/default.nix +++ b/pkgs/development/python-modules/elgato/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { postPatch = '' # Upstream doesn't set a version for the pyproject.toml substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ + --replace "0.0.0" "${version}" ''; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/ffcv/default.nix b/pkgs/development/python-modules/ffcv/default.nix index 87d3bc908e1e..5a363abcea5c 100644 --- a/pkgs/development/python-modules/ffcv/default.nix +++ b/pkgs/development/python-modules/ffcv/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace-fail "'assertpy'," "" \ --replace-fail "'fastargs'," "" \ - --replace-fail "'psutil'," "" \ + --replace-fail "'psutil'," "" ''; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix index c4b655154839..26631076f719 100644 --- a/pkgs/development/python-modules/green/default.nix +++ b/pkgs/development/python-modules/green/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { checkPhase = '' $out/bin/green -tvvv \ green.test.test_version \ - green.test.test_cmdline \ + green.test.test_cmdline ''; pythonImportsCheck = [ "green" ]; diff --git a/pkgs/development/python-modules/ipycanvas/default.nix b/pkgs/development/python-modules/ipycanvas/default.nix index fa05db7ed6ee..d2a7519b76f5 100644 --- a/pkgs/development/python-modules/ipycanvas/default.nix +++ b/pkgs/development/python-modules/ipycanvas/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { # postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail '"jupyterlab>=3,<5",' "" \ + --replace-fail '"jupyterlab>=3,<5",' "" ''; build-system = [ diff --git a/pkgs/development/python-modules/open-meteo/default.nix b/pkgs/development/python-modules/open-meteo/default.nix index 562433ab6272..225d06ee13b5 100644 --- a/pkgs/development/python-modules/open-meteo/default.nix +++ b/pkgs/development/python-modules/open-meteo/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { postPatch = '' # Upstream doesn't set a version for the pyproject.toml substituteInPlace pyproject.toml \ - --replace-fail "0.0.0" "${version}" \ + --replace-fail "0.0.0" "${version}" ''; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pyppeteer-ng/default.nix b/pkgs/development/python-modules/pyppeteer-ng/default.nix index 135c4ec30ffc..b5f612bddd8d 100644 --- a/pkgs/development/python-modules/pyppeteer-ng/default.nix +++ b/pkgs/development/python-modules/pyppeteer-ng/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { --replace-fail '_port = get_free_port()' "" substituteInPlace tests/utils/server.py \ - --replace-fail '_Middleware' '_Middlewares' \ + --replace-fail '_Middleware' '_Middlewares' ''; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index 28cf124edf86..182a63c91648 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { --replace 'libvips.so.42' '${lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}' \ --replace 'libvips.42.dylib' '${lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}' \ --replace 'libgobject-2.0.so.0' '${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}' \ - --replace 'libgobject-2.0.dylib' '${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}' \ + --replace 'libgobject-2.0.dylib' '${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}' ''; disabledTests = [ diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix index 55d548fbdfab..6e5e7efcc2bc 100644 --- a/pkgs/development/python-modules/rdkit/default.nix +++ b/pkgs/development/python-modules/rdkit/default.nix @@ -137,7 +137,7 @@ buildPythonPackage rec { External/pubchem_shape/Wrap/CMakeLists.txt \ --replace-fail \ "find_package(Python3 COMPONENTS Interpreter Development.Module NumPy" \ - "find_package(Python3 COMPONENTS Interpreter Development NumPy" \ + "find_package(Python3 COMPONENTS Interpreter Development NumPy" ''; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/rendercv-fonts/default.nix b/pkgs/development/python-modules/rendercv-fonts/default.nix index 0e295edc48cf..e45be15d7d00 100644 --- a/pkgs/development/python-modules/rendercv-fonts/default.nix +++ b/pkgs/development/python-modules/rendercv-fonts/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { # pythonRelaxDeps seems not taking effect for the build-system dependencies postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail 'hatchling==1.26.3' 'hatchling' \ + --replace-fail 'hatchling==1.26.3' 'hatchling' ''; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/sphinx-last-updated-by-git/default.nix b/pkgs/development/python-modules/sphinx-last-updated-by-git/default.nix index 4b90a3c913a0..44972aaabc44 100644 --- a/pkgs/development/python-modules/sphinx-last-updated-by-git/default.nix +++ b/pkgs/development/python-modules/sphinx-last-updated-by-git/default.nix @@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: { substituteInPlace src/sphinx_last_updated_by_git.py \ --replace-fail "'git', 'ls-tree'" " '${lib.getExe gitMinimal}', 'ls-tree'" \ --replace-fail "'git', 'log'" "'${lib.getExe gitMinimal}', 'log'" \ - --replace-fail "'git', 'rev-parse'" "'${lib.getExe gitMinimal}', 'rev-parse'" \ + --replace-fail "'git', 'rev-parse'" "'${lib.getExe gitMinimal}', 'rev-parse'" ''; propagatedBuildInputs = [ gitMinimal ]; diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 96db30289612..b8524a2405fd 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "--emoji" "" \ + --replace-fail "--emoji" "" ''; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 22f2220d30c2..dabffc010f29 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -626,7 +626,7 @@ buildPythonPackage { -e "s/'gast[^']*',/'gast',/" \ -e "/'libclang[^']*',/d" \ -e "/'keras[^']*')\?,/d" \ - -e "s/'protobuf[^']*',/'protobuf',/" \ + -e "s/'protobuf[^']*',/'protobuf',/" ''; # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow diff --git a/pkgs/development/python-modules/vehicle/default.nix b/pkgs/development/python-modules/vehicle/default.nix index 69e753c08bdf..fc181961e98f 100644 --- a/pkgs/development/python-modules/vehicle/default.nix +++ b/pkgs/development/python-modules/vehicle/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { postPatch = '' # Upstream doesn't set a version for the pyproject.toml substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ + --replace "0.0.0" "${version}" ''; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index eba545151ebe..fa438c2bc15a 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { postPatch = '' # Upstream doesn't set a version for the pyproject.toml substituteInPlace pyproject.toml \ - --replace-fail "0.0.0" "${version}" \ + --replace-fail "0.0.0" "${version}" ''; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix index 854c2c8fe910..d86df1be52a8 100644 --- a/pkgs/development/python-modules/zstandard/default.nix +++ b/pkgs/development/python-modules/zstandard/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "cffi~=" "cffi>=" \ + --replace-fail "cffi~=" "cffi>=" ''; build-system = [ diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index e27a1fd17334..a1cd91cfc289 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -2970,7 +2970,7 @@ let postPatch = '' substituteInPlace src/Makefile --replace-fail \ "all:\$(PROG) ../inst/bwa clean" \ - "all:\$(PROG) ../inst/bwa" \ + "all:\$(PROG) ../inst/bwa" ''; }); diff --git a/pkgs/games/fteqw/default.nix b/pkgs/games/fteqw/default.nix index 93ad0c86a695..0663f98bfe9f 100644 --- a/pkgs/games/fteqw/default.nix +++ b/pkgs/games/fteqw/default.nix @@ -79,7 +79,7 @@ postFixup = '' patchelf $out/bin/${pname} \ - --add-needed ${gnutls}/lib/libgnutls.so \ + --add-needed ${gnutls}/lib/libgnutls.so ''; description = "Dedicated server for FTEQW"; diff --git a/pkgs/servers/home-assistant/custom-components/systemair/package.nix b/pkgs/servers/home-assistant/custom-components/systemair/package.nix index 14ccbbacdead..8ea351531cda 100644 --- a/pkgs/servers/home-assistant/custom-components/systemair/package.nix +++ b/pkgs/servers/home-assistant/custom-components/systemair/package.nix @@ -21,7 +21,7 @@ buildHomeAssistantComponent rec { postPatch = '' substituteInPlace custom_components/systemair/manifest.json \ - --replace-fail "pymodbus==" "pymodbus>=" \ + --replace-fail "pymodbus==" "pymodbus>=" ''; dependencies = [