diff --git a/flake.lock b/flake.lock
index 5de4f73512903c859775140560766f753c5537bc..6fe21ccd6412311152ce86f7f789c8cbf44adfbe 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@ }
},
"nixpkgs": {
"locked": {
"lastModified": 1708093448,
"narHash": "sha256-gohEm3/NVyu7WINFhRf83yJH8UM2ie/KY9Iw3VN6fiE=",
"lastModified": 1708751719,
"narHash": "sha256-0uWOKSpXJXmXswOvDM5Vk3blB74apFB6rNGWV5IjoN0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c7763249f02b7786b4ca36e13a4d7365cfba162f",
"rev": "f63ce824cd2f036216eb5f637dfef31e1a03ee89",
"type": "github"
},
"original": {
diff --git a/pkgs/darwin/finch/default.nix b/pkgs/darwin/finch/default.nix
index 38c06133abeb06ed240672a28dae819faa4c42be..afcab2d04e64522a16933bd86f48f5b374a228ab 100644
--- a/pkgs/darwin/finch/default.nix
+++ b/pkgs/darwin/finch/default.nix
@@ -27,17 +27,17 @@ }.${stdenv.hostPlatform.system};
in
buildGoModule rec {
pname = "finch";
src = fetchFromGitHub {
owner = "runfinch";
repo = "finch";
rev = "v${version}";
fetchSubmodules = true;
};
subPackages = [ "cmd/finch" ];
@@ -63,9 +63,9 @@ cp config.yaml $out/Applications/Finch
cp finch.yaml $out/Applications/Finch/os
substituteInPlace $out/Applications/Finch/os/finch.yaml \
--replace "<finch_image_location>" "$out/Applications/Finch/os/${os.name}" \
--replace "<finch_image_arch>" "${arch}" \
--replace "<finch_image_digest>" "sha256:$(sha256sum ${os} | cut -d' ' -f1)"
--replace-fail "<finch_image_location>" "$out/Applications/Finch/os/${os.name}" \
--replace-fail "<finch_image_arch>" "${arch}" \
--replace-fail "<finch_image_digest>" "sha256:$(sha256sum ${os} | cut -d' ' -f1)"
'';
meta = with lib; {
diff --git a/pkgs/data/dicts/tatoeba/default.nix b/pkgs/data/dicts/tatoeba/default.nix
index a2e55f62602d68cab2feff61833c1ca0c7bc7eac..8a8359d32b4e8b839d01a1f3e755d6026de72f64 100644
--- a/pkgs/data/dicts/tatoeba/default.nix
+++ b/pkgs/data/dicts/tatoeba/default.nix
@@ -36,7 +36,7 @@ tatoeba = builtins.fromJSON (builtins.readFile ./tatoeba.json);
in
stdenvNoCC.mkDerivation rec {
pname = "tatoeba";
srcs = lib.mapAttrsToList (name: spec: fetchurl spec) tatoeba;
diff --git a/pkgs/data/dicts/tatoeba/tatoeba.json b/pkgs/data/dicts/tatoeba/tatoeba.json
index 56d94a46d9c00a2e3a2a5b03b3354aef513fbf2f..812b004d4e14093cf111c25ee35a118816521a21 100644
--- a/pkgs/data/dicts/tatoeba/tatoeba.json
+++ b/pkgs/data/dicts/tatoeba/tatoeba.json
@@ -1,23 +1,23 @@
{
"bel_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/bel/bel_sentences_detailed.tsv.bz2",
},
"deu_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2",
},
"eng_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2",
},
"epo_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2",
},
"fin_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2",
},
"hye_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/hye/hye_sentences_detailed.tsv.bz2",
@@ -25,47 +25,47 @@ "hash": "sha256-dIMh7qk+oI7WdZF592ei4+H7Svbf6U8W62mL79558gc="
},
"rus_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2",
},
"swe_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe_sentences_detailed.tsv.bz2",
},
"ukr_sentences_detailed": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2",
},
"bel-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/bel/bel-eng_links.tsv.bz2",
},
"bel-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/bel/bel-rus_links.tsv.bz2",
},
"deu-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2",
},
"deu-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2",
},
"eng-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2",
},
"eng-bel_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-bel_links.tsv.bz2",
},
"eng-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2",
},
"eng-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2",
},
"eng-hye_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-hye_links.tsv.bz2",
@@ -73,27 +73,27 @@ "hash": "sha256-18OKq8AUsSsvnYmK7feauKIxN3fLSKibeQdQwZ+E/rM="
},
"eng-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2",
},
"eng-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-swe_links.tsv.bz2",
},
"eng-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2",
},
"epo-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2",
},
"epo-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2",
},
"fin-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2",
},
"fin-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-rus_links.tsv.bz2",
@@ -109,19 +109,19 @@ "hash": "sha256-Zk9+ezez1Zlyc4Gy/1hJx5T155KkRV6T9O4phu3wSsY="
},
"rus-bel_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-bel_links.tsv.bz2",
},
"rus-deu_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2",
},
"rus-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2",
},
"rus-epo_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2",
},
"rus-fin_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2",
@@ -133,26 +133,26 @@ "hash": "sha256-UfFsaUD/7v5mrBNApTe6M/xxRi9hwVIIu+VDZ0HHvQE="
},
"rus-swe_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-swe_links.tsv.bz2",
},
"rus-ukr_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-ukr_links.tsv.bz2",
},
"swe-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-eng_links.tsv.bz2",
},
"swe-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-rus_links.tsv.bz2",
},
"ukr-eng_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-eng_links.tsv.bz2",
},
"ukr-rus_links": {
"url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2",
}
}
diff --git a/pkgs/data/maps/gpxsee-maps/default.nix b/pkgs/data/maps/gpxsee-maps/default.nix
index 0b1cd3bfda6752e707d7a21e2d74706bdce2e966..6b21fe80a5f80cbe3434d0fed7db7e8e105e7c53 100644
--- a/pkgs/data/maps/gpxsee-maps/default.nix
+++ b/pkgs/data/maps/gpxsee-maps/default.nix
@@ -39,7 +39,7 @@ postPatch =
let
insertApiKey = map: key: ''
substitute ${map}.{tpl,xml} \
--replace "insert-your-apikey-here" "${key}"
--replace-fail "insert-your-apikey-here" "${key}"
'';
in
''
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 76b7d01a179c312f7b29f562b74cd39f4daafc63..3a3e8a73a44cd01400e35ecf9f2d81fd95919c98 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -29,7 +29,7 @@ amethyst = callPackage ./darwin/amethyst { };
cudatext-bin = callPackage ./darwin/cudatext/bin.nix { };
darktable-bin = callPackage ./darwin/darktable/bin.nix { };
finch = callPackage ./darwin/finch {
buildGoModule = pkgs.buildGo120Module;
buildGoModule = pkgs.buildGo122Module;
};
macpass = callPackage ./darwin/macpass { };
macsvg = callPackage ./darwin/macsvg { };
diff --git a/pkgs/development/libraries/libgnunetchat/default.nix b/pkgs/development/libraries/libgnunetchat/default.nix
index 8e38c8bc9993e4d1d38d040e9bf3b58de1596e5f..6a15ae9c935f82e1bdfad39cca007c95aa672dff 100644
--- a/pkgs/development/libraries/libgnunetchat/default.nix
+++ b/pkgs/development/libraries/libgnunetchat/default.nix
@@ -26,7 +26,7 @@ # The major and minor version should be identical, but currently they don't:
# GNUNET_MESSENGER_VERSION 0x00000002
# GNUNET_CHAT_VERSION 0x000000010000L
substituteInPlace src/gnunet_chat_lib.c \
--replace "GNUNET_CHAT_VERSION_ASSERT();" ""
--replace-fail "GNUNET_CHAT_VERSION_ASSERT();" ""
'';
nativeBuildInputs = [ meson cmake ninja pkg-config ];
diff --git a/pkgs/development/libraries/libshell/default.nix b/pkgs/development/libraries/libshell/default.nix
index 169ee825b4644fddf5e75b3c4e1a03646b2e5db5..38f81f867e594e0d00b49fe99f0a748e409589c1 100644
--- a/pkgs/development/libraries/libshell/default.nix
+++ b/pkgs/development/libraries/libshell/default.nix
@@ -23,12 +23,12 @@
nativeBuildInputs = [ help2man ];
postPatch = ''
for f in shell-* ; do
substituteInPlace $f --replace "/bin/sh" "${bash}/bin/sh"
substituteInPlace $f --replace-fail "/bin/sh" "${bash}/bin/sh"
done
'';
diff --git a/pkgs/development/libraries/microjson/default.nix b/pkgs/development/libraries/microjson/default.nix
index 91e442933f5870c46ca9a06d5720316ac49c7b14..1ab89c95eeb17151600eacb48c50f8195ca841ff 100644
--- a/pkgs/development/libraries/microjson/default.nix
+++ b/pkgs/development/libraries/microjson/default.nix
@@ -13,7 +13,7 @@ };
postPatch = ''
substituteInPlace tests/CMakeLists.txt \
--replace "find_package(microjson CONFIG REQUIRED)" ""
--replace-fail "find_package(microjson CONFIG REQUIRED)" ""
'';
nativeBuildInputs = [ cmake gtest ];
diff --git a/pkgs/development/python-modules/pytest-mp/default.nix b/pkgs/development/python-modules/pytest-mp/default.nix
index 6ee68846de6ccc9599e270016383ea199ac9a184..99f8e0f5b80c4c443b5dd15227cca1c8b4f89ce7 100644
--- a/pkgs/development/python-modules/pytest-mp/default.nix
+++ b/pkgs/development/python-modules/pytest-mp/default.nix
@@ -12,10 +12,10 @@ hash = "sha256-KJEhMMQGrkLh5JJ6oGY0k2IZy+xobOF6dXP7Yc1CaQc=";
};
postPatch = ''
# https://github.com/ansible/pytest-mp/issues/8
'';
nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
diff --git a/pkgs/embedded/embox/default.nix b/pkgs/embedded/embox/default.nix
index 87bb58080c35804ee4170c1af49f80937db254cf..53e479852cd0d3c4574daae66f7362dfbef3050a 100644
--- a/pkgs/embedded/embox/default.nix
+++ b/pkgs/embedded/embox/default.nix
@@ -35,11 +35,11 @@ patches = [ ./0001-fix-build.patch ];
postPatch = ''
substituteInPlace templates/aarch64/qemu/build.conf \
--replace "aarch64-elf" "aarch64-none-elf"
--replace-fail "aarch64-elf" "aarch64-none-elf"
substituteInPlace templates/ppc/qemu/build.conf \
--replace "powerpc-elf" "powerpc-none-eabi"
--replace-fail "powerpc-elf" "powerpc-none-eabi"
substituteInPlace templates/riscv64/qemu/build.conf \
--replace "riscv64-unknown-elf" "riscv64-none-elf"
--replace-fail "riscv64-unknown-elf" "riscv64-none-elf"
'';
nativeBuildInputs = [
diff --git a/pkgs/garmin/garminimg/default.nix b/pkgs/garmin/garminimg/default.nix
index 1f5b4a449798539ffec3a0869a56ef1667d63e7d..8eb38673cab9174f96cc8b70c160cd5cbfefc7bd 100644
--- a/pkgs/garmin/garminimg/default.nix
+++ b/pkgs/garmin/garminimg/default.nix
@@ -13,11 +13,11 @@ };
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace "PROJ4" "PROJ"
--replace-fail "PROJ4" "PROJ"
substituteInPlace srcEncodeImg/CMakeLists.txt \
--replace "PROJ4_" "PROJ_"
--replace-fail "PROJ4_" "PROJ_"
substituteInPlace srcDecodeImg/CMakeLists.txt \
--replace "PROJ4_" "PROJ_"
--replace-fail "PROJ4_" "PROJ_"
'';
nativeBuildInputs = [ cmake wrapQtAppsHook ];
diff --git a/pkgs/garmin/gimgtools/default.nix b/pkgs/garmin/gimgtools/default.nix
index 6e223a38126b17bb9da2d56aa94e60944b5951f4..652f21ae0837c80717607af97ed021d20cb93e3a 100644
--- a/pkgs/garmin/gimgtools/default.nix
+++ b/pkgs/garmin/gimgtools/default.nix
@@ -15,7 +15,7 @@ buildInputs = lib.optional stdenv.isDarwin libiconv;
postPatch = ''
substituteInPlace Makefile \
--replace "CC = gcc" ""
--replace-fail "CC = gcc" ""
'';
installPhase = ''
diff --git a/pkgs/garmin/imgdecode/default.nix b/pkgs/garmin/imgdecode/default.nix
index 6b63c202205b7db5eb09ecf88238c48c580a1ce7..92b865ef23e37dad4a9d1e596df605a344ca4c08 100644
--- a/pkgs/garmin/imgdecode/default.nix
+++ b/pkgs/garmin/imgdecode/default.nix
@@ -11,7 +11,7 @@ };
postPatch = ''
substituteInPlace garminimg.cc \
--replace "<stdio.h>" "<cstring>"
--replace-fail "<stdio.h>" "<cstring>"
'';
configurePhase = "./configure || true";
diff --git a/pkgs/garmin/ocad2img/default.nix b/pkgs/garmin/ocad2img/default.nix
index 7739d08070b70bf755bf734d5fdfcbcb62982467..f0aac0af254dcb875cbce0d5b1297c4cc6a47818 100644
--- a/pkgs/garmin/ocad2img/default.nix
+++ b/pkgs/garmin/ocad2img/default.nix
@@ -20,11 +20,11 @@ propagatedBuildInputs = [ ModulePluggable Tk ];
postPatch = ''
substituteInPlace ocad2img.pl \
--replace "cgpsmapper" "${cgpsmapper}/bin/cgpsmapper-static" \
--replace "ocad2mp.exe" "${ocad2mp}/bin/ocad2mp" \
--replace "symbols.txt" "$out/share/ocad2img/symbols.txt" \
--replace "use Win32" "#use Win32" \
--replace "require \"unicore/lib/gc_sc" "#require \"unicore/lib/gc_sc"
--replace-fail "cgpsmapper" "${cgpsmapper}/bin/cgpsmapper-static" \
--replace-fail "ocad2mp.exe" "${ocad2mp}/bin/ocad2mp" \
--replace-fail "symbols.txt" "$out/share/ocad2img/symbols.txt" \
--replace-fail "use Win32" "#use Win32" \
--replace-fail "require \"unicore/lib/gc_sc" "#require \"unicore/lib/gc_sc"
'';
preConfigure = ''
diff --git a/pkgs/garmin/ocad2mp/default.nix b/pkgs/garmin/ocad2mp/default.nix
index 34fa5fbb015f5c948e87b8304443a769ebc59949..3550ddaf335ca74dd984a61cf96bd80a046ca370 100644
--- a/pkgs/garmin/ocad2mp/default.nix
+++ b/pkgs/garmin/ocad2mp/default.nix
@@ -12,9 +12,9 @@ };
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace Makefile.gcc \
--replace "CXX=g++" "" \
--replace "LINK=g++" "LINK=$CXX" \
--replace "-lgcc" ""
--replace-fail "CXX=g++" "" \
--replace-fail "LINK=g++" "LINK=$CXX" \
--replace-fail "-lgcc" ""
'';
NIX_CFLAGS_COMPILE = [
diff --git a/pkgs/garmin/osm2mp/default.nix b/pkgs/garmin/osm2mp/default.nix
index 36ac1ad348f5a83b598afd221066e4f655aa3a7f..baa6bdcffb309aa9f42601ce1b78ec4053261480 100644
--- a/pkgs/garmin/osm2mp/default.nix
+++ b/pkgs/garmin/osm2mp/default.nix
@@ -53,7 +53,7 @@ ];
postPatch = ''
substituteInPlace osm2mp.pl \
--replace "\$Bin/cfg" "$out/share/osm2mp/cfg"
--replace-fail "\$Bin/cfg" "$out/share/osm2mp/cfg"
'';
preConfigure = "touch Makefile.PL";
diff --git a/pkgs/gemini/tom/default.nix b/pkgs/gemini/tom/default.nix
index 1ebeede78326166308216e5b2837c048a40b733c..d4f32cac8a24a53a26c9284dcafd8ee5f50be706 100644
--- a/pkgs/gemini/tom/default.nix
+++ b/pkgs/gemini/tom/default.nix
@@ -21,8 +21,8 @@ };
postPatch = ''
substituteInPlace runcgi.sh \
--replace "lua53" "${lua5_3}/bin/lua" \
--replace "tom.lua" "$out/share/lua/tom.lua"
--replace-fail "lua53" "${lua5_3}/bin/lua" \
--replace-fail "tom.lua" "$out/share/lua/tom.lua"
'';
nativeBuildInputs = [ pkg-config makeWrapper ];
diff --git a/pkgs/geospatial/arcgis2geojson/default.nix b/pkgs/geospatial/arcgis2geojson/default.nix
index 21fe81fc15fedb844978f740b1940f9c250dbc6c..2a6b7ec53cc28f1720aa4f03cd35c7cc478c3809 100644
--- a/pkgs/geospatial/arcgis2geojson/default.nix
+++ b/pkgs/geospatial/arcgis2geojson/default.nix
@@ -14,7 +14,7 @@ };
postPatch = ''
substituteInPlace pyproject.toml \
--replace "poetry.masonry" "poetry.core.masonry"
--replace-fail "poetry.masonry" "poetry.core.masonry"
'';
nativeBuildInputs = with python3Packages; [ poetry-core ];
diff --git a/pkgs/geospatial/elevation/default.nix b/pkgs/geospatial/elevation/default.nix
index 6ec81333563b715077d9a0e146cf06161a1c3da9..46fbe9212d1f3de9a11cb7c0bdadedf58e77f29a 100644
--- a/pkgs/geospatial/elevation/default.nix
+++ b/pkgs/geospatial/elevation/default.nix
@@ -33,13 +33,13 @@ for f in elevation/datasource.* \
elevation/util.py \
tests/test_*.py; do
substituteInPlace $f \
--replace "make " "${lib.getBin gnumake}/bin/make " \
--replace "curl " "${lib.getBin curl}/bin/curl " \
--replace "gunzip " "gunzip.t " \
--replace "unzip " "${lib.getBin unzip}/bin/unzip " \
--replace "gunzip.t " "${lib.getBin gzip}/bin/gunzip " \
--replace "gdal_translate " "${lib.getBin gdal}/bin/gdal_translate " \
--replace "gdalbuildvrt " "${lib.getBin gdal}/bin/gdalbuildvrt "
--replace-fail "make " "${lib.getBin gnumake}/bin/make " \
--replace-fail "curl " "${lib.getBin curl}/bin/curl " \
--replace-fail "gunzip " "gunzip.t " \
--replace-fail "unzip " "${lib.getBin unzip}/bin/unzip " \
--replace-fail "gunzip.t " "${lib.getBin gzip}/bin/gunzip " \
--replace-fail "gdal_translate " "${lib.getBin gdal}/bin/gdal_translate " \
--replace-fail "gdalbuildvrt " "${lib.getBin gdal}/bin/gdalbuildvrt "
done
'';
diff --git a/pkgs/geospatial/localtileserver/default.nix b/pkgs/geospatial/localtileserver/default.nix
index c5f12b77c98c5bd373dd07a69453aa7bf3238d62..5030dcd5e80422ea2f02ab35c48a574f4a02380c 100644
--- a/pkgs/geospatial/localtileserver/default.nix
+++ b/pkgs/geospatial/localtileserver/default.nix
@@ -13,7 +13,7 @@ };
postPatch = ''
substituteInPlace setup.py \
--replace "large-image[gdal]" "large-image-source-gdal"
--replace-fail "large-image[gdal]" "large-image-source-gdal"
'';
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/geospatial/mapsoft/2.nix b/pkgs/geospatial/mapsoft/2.nix
index 842c6d08aa157a0c94efd5a6fec8ec2b7ad9fe01..ff8793f0594c135629ac323f3444e63b29dc850a 100644
--- a/pkgs/geospatial/mapsoft/2.nix
+++ b/pkgs/geospatial/mapsoft/2.nix
@@ -50,16 +50,16 @@ patchFlags = [ "-p1" "-d modules" ];
postPatch = ''
substituteInPlace modules/get_deps \
--replace "/usr/bin/perl" "${perlPackages.perl}/bin/perl"
--replace-fail "/usr/bin/perl" "${perlPackages.perl}/bin/perl"
substituteInPlace modules/mapview/mapview.cpp \
--replace "/usr/share" "$out/share"
--replace-fail "/usr/share" "$out/share"
patchShebangs .
'';
desktopItems = [
diff --git a/pkgs/geospatial/mapsoft/default.nix b/pkgs/geospatial/mapsoft/default.nix
index 00f9c14c93b0d90efa9ff7867c62c9324469f8b2..99946ab8f8cead2706b8e44e55ac97b1ec7dcace 100644
--- a/pkgs/geospatial/mapsoft/default.nix
+++ b/pkgs/geospatial/mapsoft/default.nix
@@ -46,11 +46,11 @@
postPatch = ''
sed -i '4i #include <cstdint>' core/loaders/image_png.cpp
substituteInPlace scripts/map_rescale \
--replace "/usr/share/mapsoft" "$out/share/mapsoft"
--replace-fail "/usr/share/mapsoft" "$out/share/mapsoft"
substituteInPlace core/vmap/vmap_ocad.cpp \
--replace "/usr/share/mapsoft" "$out/share/mapsoft"
--replace-fail "/usr/share/mapsoft" "$out/share/mapsoft"
substituteInPlace core/vmap/zn.cpp \
--replace "/usr/share/mapsoft" "$out/share/mapsoft"
--replace-fail "/usr/share/mapsoft" "$out/share/mapsoft"
'';
nativeBuildInputs = [
@@ -93,10 +93,10 @@
postInstall = ''
wrapPythonProgramsIn $out/lib/gimp/${lib.versions.major gimp.version}.0/plug-ins/
substituteInPlace $out/bin/mapsoft_wp_parse \
--replace "/usr/bin/perl" "${perlPackages.perl}/bin/perl"
--replace-fail "/usr/bin/perl" "${perlPackages.perl}/bin/perl"
wrapProgram $out/bin/mapsoft_wp_parse --prefix PERL5LIB : "$PERL5LIB"
substituteInPlace $out/bin/map_rescale \
--replace "getopt " "${getopt}/bin/getopt "
--replace-fail "getopt " "${getopt}/bin/getopt "
'';
meta = with lib; {
diff --git a/pkgs/geospatial/polyvectorization/default.nix b/pkgs/geospatial/polyvectorization/default.nix
index c6d0aef2deed45d7de060918671e5ec42d776d89..de4be3f9011973bd19ee4b7fb8d4f692efbf6f52 100644
--- a/pkgs/geospatial/polyvectorization/default.nix
+++ b/pkgs/geospatial/polyvectorization/default.nix
@@ -15,7 +15,7 @@ patches = [ ./with-gui.patch ];
postPatch = ''
substituteInPlace src/main.cpp \
--replace "#define WITH_GUI 1" "//#define WITH_GUI 1"
--replace-fail "#define WITH_GUI 1" "//#define WITH_GUI 1"
'';
nativeBuildInputs = [ cmake wrapQtAppsHook ];
diff --git a/pkgs/geospatial/qlandkartegt/default.nix b/pkgs/geospatial/qlandkartegt/default.nix
index edab043662375cdad99a7b35e284cbb0ef132e1d..322b1327f382be4158f0997e7069ca4f2d5cca8e 100644
--- a/pkgs/geospatial/qlandkartegt/default.nix
+++ b/pkgs/geospatial/qlandkartegt/default.nix
@@ -89,7 +89,7 @@ ];
postPatch = ''
substituteInPlace ConfigureChecks.cmake \
--replace \$\{PLUGIN_INSTALL_DIR\} "${garmindev}/lib/qlandkartegt"
--replace-fail \$\{PLUGIN_INSTALL_DIR\} "${garmindev}/lib/qlandkartegt"
'';
postInstall = ''
diff --git a/pkgs/geospatial/rio-mbtiles/default.nix b/pkgs/geospatial/rio-mbtiles/default.nix
index 8c2a8163dbb77523aa7462ac5010bd1d59f45485..69adb465eb09e66bbfd6a693dd5847acaeae35d6 100644
--- a/pkgs/geospatial/rio-mbtiles/default.nix
+++ b/pkgs/geospatial/rio-mbtiles/default.nix
@@ -13,7 +13,7 @@ };
postPatch = ''
substituteInPlace setup.py \
--replace "shapely~=1.7.0" "shapely"
--replace-fail "shapely~=1.7.0" "shapely"
'';
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/geospatial/terracotta/default.nix b/pkgs/geospatial/terracotta/default.nix
index 496ae6de801e6b5cf8b4678e9f0bc41b5ad18318..066e8a340e4a65f9dfb1ad206c6f8ca4df38b7b7 100644
--- a/pkgs/geospatial/terracotta/default.nix
+++ b/pkgs/geospatial/terracotta/default.nix
@@ -12,7 +12,7 @@ hash = "sha256-HWNV5MwbylpcJ/u0iFe8gJJLdnvrnK4S8UMSCpuBlqs=";
};
postPatch = ''
'';
nativeBuildInputs = with python3Packages; [
diff --git a/pkgs/gpx/garta/default.nix b/pkgs/gpx/garta/default.nix
index 942f77dfa5e7b6af8d3d785d68771630d223538d..620504fbbdde1519e86529ca3c8303cbb629a49a 100644
--- a/pkgs/gpx/garta/default.nix
+++ b/pkgs/gpx/garta/default.nix
@@ -37,7 +37,7 @@ buildInputs = [ atk cairo gdk-pixbuf glib gtk3 harfbuzz openssl pango ];
postPatch = ''
substituteInPlace ./configure.sh \
--replace "target/release" "target/${rust.toRustTargetSpec stdenv.hostPlatform}/release"
--replace-fail "target/release" "target/${rust.toRustTargetSpec stdenv.hostPlatform}/release"
patchShebangs configure.sh
'';
@@ -48,7 +48,7 @@
./configure.sh --prefix $out
substituteInPlace install.sh \
--replace "/etc/firejail" "$out/etc/firejail"
--replace-fail "/etc/firejail" "$out/etc/firejail"
patchShebangs install.sh
'';
diff --git a/pkgs/gpx/gpxtools/default.nix b/pkgs/gpx/gpxtools/default.nix
index 643b1a5c33faf0eca3639d25d5cd8852f8ff4d2b..bb28d10183a3218ca3504680ca9767befba81a5f 100644
--- a/pkgs/gpx/gpxtools/default.nix
+++ b/pkgs/gpx/gpxtools/default.nix
@@ -15,7 +15,7 @@ buildInputs = [ expat ];
postPatch = ''
substituteInPlace gpxgeotag.cpp \
--replace "exiv2" "${exiv2}/bin/exiv2"
--replace-fail "exiv2" "${exiv2}/bin/exiv2"
'';
installPhase = "install -Dm755 gpx* -t $out/bin";
diff --git a/pkgs/gpx/gpxtrackposter/default.nix b/pkgs/gpx/gpxtrackposter/default.nix
index ac92be5dedc219a334c2bd7593442e10afa0938a..8d4fa8b7e449c81542efb03bb64f18b983309084 100644
--- a/pkgs/gpx/gpxtrackposter/default.nix
+++ b/pkgs/gpx/gpxtrackposter/default.nix
@@ -22,7 +22,7 @@ ];
postPatch = ''
substituteInPlace gpxtrackposter/poster.py \
--replace "self.translate(\"ATHLETE\")" "\"\""
--replace-fail "self.translate(\"ATHLETE\")" "\"\""
substituteInPlace gpxtrackposter/cli.py \
--subst-var out
sed -i 's/~=.*//' requirements.txt
diff --git a/pkgs/linguistics/gdcv/default.nix b/pkgs/linguistics/gdcv/default.nix
index 597275920cc3b89209196a3cfc91fd246292f26d..c79ba0c95c1e6f00022f7c07a63519d8d0669c49 100644
--- a/pkgs/linguistics/gdcv/default.nix
+++ b/pkgs/linguistics/gdcv/default.nix
@@ -13,13 +13,13 @@ };
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace Makefile \
--replace "CC=gcc" ""
--replace-fail "CC=gcc" ""
substituteInPlace gdcv.c \
--replace "#include <error.h>" ""
--replace-fail "#include <error.h>" ""
substituteInPlace index.c \
--replace "|FNM_EXTMATCH" ""
--replace-fail "|FNM_EXTMATCH" ""
'';
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/linguistics/stardict-tools/default.nix b/pkgs/linguistics/stardict-tools/default.nix
index cb2535abeee9b8c3838431ab188a93efb07d9984..a16151bbdf7d8056bee632cf67416125f4092000 100644
--- a/pkgs/linguistics/stardict-tools/default.nix
+++ b/pkgs/linguistics/stardict-tools/default.nix
@@ -40,11 +40,13 @@ hardeningDisable = [ "format" ];
postPatch = ''
substituteInPlace tools/src/Makefile.am \
--replace "noinst_PROGRAMS =" "bin_PROGRAMS ="
--replace-fail "noinst_PROGRAMS =" "bin_PROGRAMS ="
'';
preConfigure = "./autogen.sh";
env.NIX_CFLAGS_COMPILE = "-std=c++14";
diff --git a/pkgs/linguistics/wiktextract/default.nix b/pkgs/linguistics/wiktextract/default.nix
index 3270523b26cf35e2de73aed491ffb092bb716b8d..33dbb3556f20c487e824f5d0089e3508fc8db79f 100644
--- a/pkgs/linguistics/wiktextract/default.nix
+++ b/pkgs/linguistics/wiktextract/default.nix
@@ -19,7 +19,7 @@ };
postPatch = ''
substituteInPlace setup.py \
--replace python-Levenshtein Levenshtein
--replace-fail python-Levenshtein Levenshtein
'';
propagatedBuildInputs = with python3Packages; [ levenshtein setuptools wikitextprocessor nltk ];
diff --git a/pkgs/misc/aamath/default.nix b/pkgs/misc/aamath/default.nix
index f4e5e286a7038ecb793054b8b20f524aa7a08e56..460d9a8f79e73f78f648726065237072726059aa 100644
--- a/pkgs/misc/aamath/default.nix
+++ b/pkgs/misc/aamath/default.nix
@@ -19,8 +19,8 @@ patchFlags = [ "-p0" ];
postPatch = ''
substituteInPlace Makefile \
--replace "lex " "flex " \
--replace "-ltermcap" "-lncurses"
--replace-fail "lex " "flex " \
--replace-fail "-ltermcap" "-lncurses"
'';
nativeBuildInputs = [ bison flex installShellFiles ];
diff --git a/pkgs/misc/ascii-dash/default.nix b/pkgs/misc/ascii-dash/default.nix
index 96e02a5b8ba15a8a5a1614474a71d2fe16d0d4d8..7a91c4ba9f3cac06cc8930ad85f5eba73b1274c7 100644
--- a/pkgs/misc/ascii-dash/default.nix
+++ b/pkgs/misc/ascii-dash/default.nix
@@ -11,13 +11,13 @@ };
postPatch = ''
substituteInPlace ascii-gfx/main.cpp \
--replace "boing.wav" "$out/share/ascii-dash/sounds/boing.wav"
--replace-fail "boing.wav" "$out/share/ascii-dash/sounds/boing.wav"
substituteInPlace dash/dash.cpp \
--replace "sounds/" "$out/share/ascii-dash/sounds/"
--replace-fail "sounds/" "$out/share/ascii-dash/sounds/"
substituteInPlace dash/dash_physics.cpp \
--replace "sounds/" "$out/share/ascii-dash/sounds/"
--replace-fail "sounds/" "$out/share/ascii-dash/sounds/"
substituteInPlace main.cpp \
--replace "data/" "$out/share/ascii-dash/data/"
--replace-fail "data/" "$out/share/ascii-dash/data/"
'';
nativeBuildInputs = [ cmake unzip ];
diff --git a/pkgs/misc/capture2text/default.nix b/pkgs/misc/capture2text/default.nix
index 1e83954983eef2deca06a44382b728540aee153d..c9d5ffc2ada82a8e0c9b889c2e42018730dbfcb2 100644
--- a/pkgs/misc/capture2text/default.nix
+++ b/pkgs/misc/capture2text/default.nix
@@ -11,26 +11,26 @@ };
postPatch = ''
substituteInPlace Capture2Text.pro \
--replace "QMAKE_CXXFLAGS" "#QMAKE_CXXFLAGS" \
--replace "-lpvt.cppan.demo.danbloomberg.leptonica-1.74.4" "-llept" \
--replace "-luser32" "-ltesseract"
--replace-fail "QMAKE_CXXFLAGS" "#QMAKE_CXXFLAGS" \
--replace-fail "-lpvt.cppan.demo.danbloomberg.leptonica-1.74.4" "-llept" \
--replace-fail "-luser32" "-ltesseract"
# Fix app description
substituteInPlace CommandLine.cpp \
--replace "Capture2Text_CLI.exe" "capture2text"
--replace-fail "Capture2Text_CLI.exe" "capture2text"
# Locate dictionaries in $XDG_DATA_DIR/Capture2Text/Capture2Text/tessdata
# Initialize tesseract without specifying tessdata path
sed -i '1 i #include <QStandardPaths>' OcrEngine.cpp
substituteInPlace OcrEngine.cpp \
--replace "QCoreApplication::applicationDirPath()" \
"QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)" \
--replace "exeDirpath.toLocal8Bit().constData()" "NULL"
--replace-fail "QCoreApplication::applicationDirPath()" \
"QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)" \
--replace-fail "exeDirpath.toLocal8Bit().constData()" "NULL"
# See https://github.com/DanBloomberg/leptonica/commit/990a76de210636dfc4c976c7d3c6d63500e363b9
substituteInPlace PreProcess.cpp \
--replace "pixAverageInRect(binarizeForNegPixs, &negRect, &pixelAvg)" \
"pixAverageInRect(binarizeForNegPixs, NULL, &negRect, 0, 255, 1, &pixelAvg)"
--replace-fail "pixAverageInRect(binarizeForNegPixs, &negRect, &pixelAvg)" \
"pixAverageInRect(binarizeForNegPixs, NULL, &negRect, 0, 255, 1, &pixelAvg)"
'';
buildInputs = [ leptonica tesseract4 ];
diff --git a/pkgs/misc/cfiles/default.nix b/pkgs/misc/cfiles/default.nix
index b602d206320524c0b6510441c9680a85914f5ed9..d059aacc2951955e51e8d83f45c419c12f88943d 100644
--- a/pkgs/misc/cfiles/default.nix
+++ b/pkgs/misc/cfiles/default.nix
@@ -13,11 +13,11 @@ };
postPatch = ''
substituteInPlace scripts/clearimg \
--replace "/usr/lib/w3m/w3mimgdisplay" "${w3m}/bin/w3mimgdisplay"
--replace-fail "/usr/lib/w3m/w3mimgdisplay" "${w3m}/bin/w3mimgdisplay"
substituteInPlace scripts/displayimg \
--replace "/usr/lib/w3m/w3mimgdisplay" "${w3m}/bin/w3mimgdisplay"
--replace-fail "/usr/lib/w3m/w3mimgdisplay" "${w3m}/bin/w3mimgdisplay"
substituteInPlace scripts/displayimg_uberzug \
--replace "ueberzug" "${ueberzug}/bin/ueberzug"
--replace-fail "ueberzug" "${ueberzug}/bin/ueberzug"
'';
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/misc/dns-filter/default.nix b/pkgs/misc/dns-filter/default.nix
index 9ed6d4f1ef615a3c92390e208505b120256ce9d7..463b60a1d3ca5ac58221eca7a8ee90a997001a7c 100644
--- a/pkgs/misc/dns-filter/default.nix
+++ b/pkgs/misc/dns-filter/default.nix
@@ -12,7 +12,7 @@ hash = "sha256-WK3xlJFlYc6u03+6HSoyBaoC9VtD/i7cP1+oqpH/sfE=";
};
postPatch = ''
'';
buildPhase = ''
diff --git a/pkgs/misc/ish/default.nix b/pkgs/misc/ish/default.nix
index 111fbe6b420b96f698d89a4c22545b5f03016540..08c8b56058494ff1ddace0fecf60a3ed806295d0 100644
--- a/pkgs/misc/ish/default.nix
+++ b/pkgs/misc/ish/default.nix
@@ -10,7 +10,7 @@ hash = "sha256-C4vE8pWBay9RdL+q0PwzjaNMgqrTD8TyLTYkGwE9V4I=";
};
postPatch = ''
'';
makeFlags = [ "linux" ];
diff --git a/pkgs/misc/mitzasql/default.nix b/pkgs/misc/mitzasql/default.nix
index 7b539ce6c74052af8e244a7da5e71813b917c15b..37bacfa13c31a4bbc504021157b75e7fc3451775 100644
--- a/pkgs/misc/mitzasql/default.nix
+++ b/pkgs/misc/mitzasql/default.nix
@@ -13,10 +13,10 @@ };
postPatch = ''
substituteInPlace setup.py \
--replace "pygments ==2.7.4" "pygments" \
--replace "mysql-connector-python ==8.0.22" "mysql-connector-python" \
--replace "urwid ==2.1.2" "urwid" \
--replace "appdirs ==1.4.4" "appdirs"
--replace-fail "pygments ==2.7.4" "pygments" \
--replace-fail "mysql-connector-python ==8.0.22" "mysql-connector-python" \
--replace-fail "urwid ==2.1.2" "urwid" \
--replace-fail "appdirs ==1.4.4" "appdirs"
'';
propagatedBuildInputs = with python3Packages; [ appdirs pygments mysql-connector urwid ];
diff --git a/pkgs/misc/modbus_sim_cli/default.nix b/pkgs/misc/modbus_sim_cli/default.nix
index 2687d026f0901ddb80fc8b050fb81e36ba152191..bb6af5abe63a2ff41650aa9ada32471726ad77a0 100644
--- a/pkgs/misc/modbus_sim_cli/default.nix
+++ b/pkgs/misc/modbus_sim_cli/default.nix
@@ -14,7 +14,7 @@
postPatch = ''
sed -i 's/==.*//;/trollius/d' requirements
substituteInPlace modbus_sim/utils/config_parser.py \
--replace "yaml.load(conffile.read())" "yaml.safe_load(conffile)"
--replace-fail "yaml.load(conffile.read())" "yaml.safe_load(conffile)"
'';
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/misc/objlab/default.nix b/pkgs/misc/objlab/default.nix
index 6b8cc990e5ba914ad8968f5dc19fe0b93634e29f..b605e1abac6dc183d27a5bd62e346baa9c3005d9 100644
--- a/pkgs/misc/objlab/default.nix
+++ b/pkgs/misc/objlab/default.nix
@@ -13,7 +13,7 @@ };
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace "add_subdirectory" "#add_subdirectory"
--replace-fail "add_subdirectory" "#add_subdirectory"
'';
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/misc/opcua-stack/default.nix b/pkgs/misc/opcua-stack/default.nix
index cab50a05cb28baca230d31b618b834a783c2734f..e50debbdbeadc05bd727e9275876fdf480d3c6cf 100644
--- a/pkgs/misc/opcua-stack/default.nix
+++ b/pkgs/misc/opcua-stack/default.nix
@@ -14,7 +14,7 @@
sourceRoot = "${src.name}/src";
postPatch = ''
'';
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/misc/plotjuggler/default.nix b/pkgs/misc/plotjuggler/default.nix
index 1df3888813a94bfabc34f911be1120a3dabf8fd1..5e7e752f1b24539c1306f78910af75174d55aaf6 100644
--- a/pkgs/misc/plotjuggler/default.nix
+++ b/pkgs/misc/plotjuggler/default.nix
@@ -27,9 +27,9 @@ };
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace "set(PJ_PLUGIN_INSTALL_DIRECTORY bin)" "set(PJ_PLUGIN_INSTALL_DIRECTORY lib/plugins)"
--replace-fail "set(PJ_PLUGIN_INSTALL_DIRECTORY bin)" "set(PJ_PLUGIN_INSTALL_DIRECTORY lib/plugins)"
substituteInPlace plotjuggler_app/mainwindow.cpp \
--replace "QCoreApplication::applicationDirPath()" "\"$out/lib/plugins\""
--replace-fail "QCoreApplication::applicationDirPath()" "\"$out/lib/plugins\""
'';
nativeBuildInputs = [ cmake wrapQtAppsHook ]
diff --git a/pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix b/pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix
index 5b0361b90315a13b4a85f0e55e585c6a219622e8..4982dd0c1fe7b8a669113c14cb5de0adb45d67f5 100644
--- a/pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix
+++ b/pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix
@@ -21,7 +21,7 @@
postPatch = ''
sed -i '10i #include <cstdint>' comments.h
substituteInPlace CMakeLists.txt \
--replace "set(CMAKE_INSTALL_PREFIX \"/usr\")" ""
--replace-fail "set(CMAKE_INSTALL_PREFIX \"/usr\")" ""
'';
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/misc/telegram-send/default.nix b/pkgs/misc/telegram-send/default.nix
index 55b006aab9440b78cd0ec8a6ecd81baf8e335080..711a164253f1b25c75b4e9d95452cb82947c1086 100644
--- a/pkgs/misc/telegram-send/default.nix
+++ b/pkgs/misc/telegram-send/default.nix
@@ -13,7 +13,7 @@ };
postPatch = ''
substituteInPlace setup.py \
--replace "python-telegram-bot==20.6" "python-telegram-bot"
--replace-fail "python-telegram-bot==20.6" "python-telegram-bot"
'';
nativeBuildInputs = with python3Packages; [ pip ];
diff --git a/pkgs/misc/xfractint/default.nix b/pkgs/misc/xfractint/default.nix
index 7f70ef4c01d565957ab7c504a31a36c8f45a0f0c..8748c6fbf25c11d308d07774df3de41e17b27c41 100644
--- a/pkgs/misc/xfractint/default.nix
+++ b/pkgs/misc/xfractint/default.nix
@@ -15,8 +15,8 @@ makeFlags = [ "PREFIX=$(out)" ];
postPatch = ''
substituteInPlace Makefile \
--replace "/usr/bin/gcc" "gcc" \
--replace "/usr/bin/install" "install"
--replace-fail "/usr/bin/gcc" "gcc" \
--replace-fail "/usr/bin/install" "install"
'';
meta = with lib; {
diff --git a/pkgs/mqtt/libumqtt/default.nix b/pkgs/mqtt/libumqtt/default.nix
index 48abcdedd9fcda96e00d97b9af481f184661ea75..8365b56793019a6bc9018bc70e3c736b2bd513bb 100644
--- a/pkgs/mqtt/libumqtt/default.nix
+++ b/pkgs/mqtt/libumqtt/default.nix
@@ -14,7 +14,7 @@ };
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace src/buffer/buffer.h \
--replace "<endian.h>" "<machine/endian.h>"
--replace-fail "<endian.h>" "<machine/endian.h>"
'';
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/mqtt/mqtt-explorer/default.nix b/pkgs/mqtt/mqtt-explorer/default.nix
index a542822186d112ff0b63f0ebfcefdee1a2958551..c9a7dd90f24e1fe90c977b88345e4ef139b8edb6 100644
--- a/pkgs/mqtt/mqtt-explorer/default.nix
+++ b/pkgs/mqtt/mqtt-explorer/default.nix
@@ -26,7 +26,7 @@ mv $out/bin/${pname}-${version} $out/bin/${pname}
install -Dm444 ${appimageContents}/mqtt-explorer.desktop -t $out/share/applications
substituteInPlace $out/share/applications/mqtt-explorer.desktop \
--replace "Exec=AppRun" "Exec=$out/bin/mqtt-explorer"
--replace-fail "Exec=AppRun" "Exec=$out/bin/mqtt-explorer"
install -Dm444 ${appimageContents}/mqtt-explorer.png -t $out/share/icons/hicolor/512x512/apps
'';
diff --git a/pkgs/mqtt/mqtt-to-influxdb-forwarder/default.nix b/pkgs/mqtt/mqtt-to-influxdb-forwarder/default.nix
index be68dbb8f34ad64e034821118743b5b152c5d9d1..542c5f28d5895b333c22a7c06614bfda3f810ce3 100644
--- a/pkgs/mqtt/mqtt-to-influxdb-forwarder/default.nix
+++ b/pkgs/mqtt/mqtt-to-influxdb-forwarder/default.nix
@@ -13,7 +13,7 @@ hash = "sha256-2n5YF5aLaUzHmxgPhnRXXyhoXV0nJ21aa7g+NBTYvBk=";
};
postPatch = ''
'';
dontUseSetuptoolsBuild = true;
diff --git a/pkgs/mqtt/mqtt-to-influxdb/default.nix b/pkgs/mqtt/mqtt-to-influxdb/default.nix
index adeedc038a92a5a924bf6bd7503fdf59e67025ad..8b96a64a8c5580cc82dc626e6e14fd826b6fbf97 100644
--- a/pkgs/mqtt/mqtt-to-influxdb/default.nix
+++ b/pkgs/mqtt/mqtt-to-influxdb/default.nix
@@ -31,15 +31,15 @@ };
postPatch = ''
substituteInPlace src/app/CMakeLists.txt \
--replace "/usr" "$out"
--replace-fail "/usr" "$out"
sed -i '1i #include <iostream>' src/app-validate/main.cpp
substituteInPlace src/app-validate/main.cpp \
--replace "OptionParseException" "exceptions::parsing"
--replace-fail "OptionParseException" "exceptions::parsing"
substituteInPlace src/app/main.cpp \
--replace "OptionParseException" "exceptions::parsing"
--replace-fail "OptionParseException" "exceptions::parsing"
'' + lib.optionalString stdenv.cc.isClang ''
substituteInPlace src/libmqtt-to-influxdb/CMakeLists.txt \
--replace "stdc++fs" ""
--replace-fail "stdc++fs" ""
'';
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/nakarte/map-tiler/default.nix b/pkgs/nakarte/map-tiler/default.nix
index b87a831438ff2df4b5d1504aa429c884739df1ad..22f8e23f77032fc55424d9ca90127a424762a1b4 100644
--- a/pkgs/nakarte/map-tiler/default.nix
+++ b/pkgs/nakarte/map-tiler/default.nix
@@ -24,10 +24,10 @@ };
postPatch = ''
substituteInPlace setup.cfg \
--replace " @ git+https://github.com/wladich/thinplatespline.git" "" \
--replace " @ git+https://github.com/wladich/maprec.git" "" \
--replace " @ git+https://github.com/wladich/ozi_map.git" "" \
--replace " @ git+https://github.com/wladich/pyimagequant.git" ""
--replace-fail " @ git+https://github.com/wladich/thinplatespline.git" "" \
--replace-fail " @ git+https://github.com/wladich/maprec.git" "" \
--replace-fail " @ git+https://github.com/wladich/ozi_map.git" "" \
--replace-fail " @ git+https://github.com/wladich/pyimagequant.git" ""
'';
nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
diff --git a/pkgs/nakarte/maprec/default.nix b/pkgs/nakarte/maprec/default.nix
index 4ccf0b2394ec70c53d2a9c468ba2e9d64c28d85b..ce51d5c699a57f14a804f36ad2874aa5d62da263 100644
--- a/pkgs/nakarte/maprec/default.nix
+++ b/pkgs/nakarte/maprec/default.nix
@@ -13,7 +13,7 @@ };
postPatch = ''
substituteInPlace setup.py \
--replace " @ git+https://github.com/wladich/thinplatespline.git" ""
--replace-fail " @ git+https://github.com/wladich/thinplatespline.git" ""
'';
propagatedBuildInputs = with python3Packages; [ pyyaml pyproj thinplatespline ];
diff --git a/pkgs/nakarte/ozi_map/default.nix b/pkgs/nakarte/ozi_map/default.nix
index 1aeb429213e57b9baf70aed565be7732a0588463..6eaabeab387972c9ca38dd839cef11ff0600a6bf 100644
--- a/pkgs/nakarte/ozi_map/default.nix
+++ b/pkgs/nakarte/ozi_map/default.nix
@@ -13,7 +13,7 @@ };
postPatch = ''
substituteInPlace setup.py \
--replace " @ git+https://github.com/wladich/maprec.git" ""
--replace-fail " @ git+https://github.com/wladich/maprec.git" ""
'';
propagatedBuildInputs = with python3Packages; [ maprec pyproj ];
diff --git a/pkgs/nakarte/tracks_storage_server/default.nix b/pkgs/nakarte/tracks_storage_server/default.nix
index 6ac0a2b2fdea146550153795a18ec8a24e72d061..8b108ebde6956e289251965fedc516ae678c300a 100644
--- a/pkgs/nakarte/tracks_storage_server/default.nix
+++ b/pkgs/nakarte/tracks_storage_server/default.nix
@@ -56,7 +56,7 @@ mkdir -p $site_packages
cp *.py *.sql $site_packages
substitute config.py.example $site_packages/config.py \
--replace "'password" "#'password"
--replace-fail "'password" "#'password"
makeWrapper ${pythonEnv.interpreter} $out/bin/tracks_storage_server \
--add-flags "$site_packages/server.py"
diff --git a/pkgs/osm/map-stylizer/default.nix b/pkgs/osm/map-stylizer/default.nix
index def9b2fe95de4ffc3d73023df08e81410c995b6b..899585a428e041d157a3a947a05e3cdc910cd4e2 100644
--- a/pkgs/osm/map-stylizer/default.nix
+++ b/pkgs/osm/map-stylizer/default.nix
@@ -23,10 +23,10 @@ mkdir -p $site_packages
cp -r src main.py $site_packages
substituteInPlace $site_packages/main.py \
--replace "'src'" "'$site_packages/src'"
--replace-fail "'src'" "'$site_packages/src'"
substituteInPlace $site_packages/src/core/constants.py \
--replace "src/resources" "$site_packages/src/resources"
--replace-fail "src/resources" "$site_packages/src/resources"
makeWrapper ${(python3Packages.python.withPackages (ps: [ ps.pyqt5 ])).interpreter} $out/bin/map-stylizer \
--set QT_QPA_PLATFORM_PLUGIN_PATH ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms \
diff --git a/pkgs/osm/osm-3s/default.nix b/pkgs/osm/osm-3s/default.nix
index a3e4e520e147ad639b9fe7884b0d167badf5ddb0..c6ded4c50e94b77dcc969d7f5b3e75af0570818c 100644
--- a/pkgs/osm/osm-3s/default.nix
+++ b/pkgs/osm/osm-3s/default.nix
@@ -11,7 +11,9 @@ };
buildInputs = [ expat lz4 zlib ];
meta = with lib; {
description = "A database engine to query the OpenStreetMap data";
diff --git a/pkgs/osm/osm-python-tools/default.nix b/pkgs/osm/osm-python-tools/default.nix
index d2ac7e914e00e20833e141ed9df0a68e41cb2e50..e79c1472f9ffab47b64205b809444ae69b8b7d16 100644
--- a/pkgs/osm/osm-python-tools/default.nix
+++ b/pkgs/osm/osm-python-tools/default.nix
@@ -13,7 +13,7 @@ };
postPatch = ''
substituteInPlace setup.py \
--replace "'pytest" "#'pytest" \
--replace-fail "'pytest" "#'pytest" \
'';
propagatedBuildInputs = with python3Packages; [
diff --git a/pkgs/osm/osmosis/default.nix b/pkgs/osm/osmosis/default.nix
index 09355ff5704e638bf24a3dee95dc556cd7e0c948..3c82cf62a853f2683bbacc331c006582685881e4 100644
--- a/pkgs/osm/osmosis/default.nix
+++ b/pkgs/osm/osmosis/default.nix
@@ -19,7 +19,7 @@ mkdir -p $out
cp -r . $out
rm $out/bin/*.bat
substituteInPlace $out/bin/osmosis \
--replace "JAVACMD=java" "JAVACMD=${jre}/bin/java"
--replace-fail "JAVACMD=java" "JAVACMD=${jre}/bin/java"
'';
meta = with lib; {
diff --git a/pkgs/osm/phyghtmap/default.nix b/pkgs/osm/phyghtmap/default.nix
index 6a8c42479b365adf97e64b476c29c58168853b12..f0b12b20736e9a18907882eccbdea31d07a84566 100644
--- a/pkgs/osm/phyghtmap/default.nix
+++ b/pkgs/osm/phyghtmap/default.nix
@@ -10,7 +10,7 @@ hash = "sha256-jA6uc/HVdrDQF3NX0Cbu4wMl4SSd7cA/VOvtRRzDsBM=";
};
postPatch = ''
'';
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/osm/tirex/default.nix b/pkgs/osm/tirex/default.nix
index 150f9a2e10501040f2379803e6f9cf7084e99e05..d6a9eb41496a4e52af626e7710c05fb21028082b 100644
--- a/pkgs/osm/tirex/default.nix
+++ b/pkgs/osm/tirex/default.nix
@@ -35,9 +35,9 @@ })
];
postPatch = ''
'';
preConfigure = ''
diff --git a/pkgs/radio/aprsc/default.nix b/pkgs/radio/aprsc/default.nix
index 02ffdd326a6a89b7e59766377dc56c9112975233..225a0dbda883289ea64bb0cabf49e73d26ba31a5 100644
--- a/pkgs/radio/aprsc/default.nix
+++ b/pkgs/radio/aprsc/default.nix
@@ -27,7 +27,7 @@ buildInputs = [ libevent openssl ];
preConfigure = "LD=$CC";
configureFlags = [
"--mandir=$(out)/share/man"
];
diff --git a/pkgs/radio/fmreceiver/default.nix b/pkgs/radio/fmreceiver/default.nix
index 721a16e020458c3b56631e86863578cbe354a331..5d9ef7c839c0267e485500693925aaacf15870ac 100644
--- a/pkgs/radio/fmreceiver/default.nix
+++ b/pkgs/radio/fmreceiver/default.nix
@@ -34,12 +34,12 @@ ];
postPatch = ''
substituteInPlace fmreceiver.pro \
--replace "-lqwt-qt5" "-lqwt" \
--replace "CONFIG" "#CONFIG"
--replace-fail "-lqwt-qt5" "-lqwt" \
--replace-fail "CONFIG" "#CONFIG"
'' + lib.optionalString stdenv.isDarwin ''
'';
nativeBuildInputs = [ qmake wrapQtAppsHook ];
diff --git a/pkgs/radio/smallrx/default.nix b/pkgs/radio/smallrx/default.nix
index ffc0371c8a636c4d5e4506f079fc3d26342db17b..4f4e6d92d9bbbd83b2f6c97adaf4a562edc69eba 100644
--- a/pkgs/radio/smallrx/default.nix
+++ b/pkgs/radio/smallrx/default.nix
@@ -13,7 +13,7 @@ };
postPatch = ''
substituteInPlace Makefile \
--replace "CC=gcc" ""
--replace-fail "CC=gcc" ""
'';
installPhase = "install -Dm755 rx -t $out/bin";
diff --git a/pkgs/suckless/edit/default.nix b/pkgs/suckless/edit/default.nix
index 93ba44726f1af3547fe22a625076225b981fff91..2e08b55275672d1ca4c289b8d91c71a5795984bf 100644
--- a/pkgs/suckless/edit/default.nix
+++ b/pkgs/suckless/edit/default.nix
@@ -13,7 +13,7 @@ };
postPatch = ''
substituteInPlace config.mk \
--replace "LDFLAGS" "#LDFLAGS"
--replace-fail "LDFLAGS" "#LDFLAGS"
'';
makeFlags = [ "CC:=$(CC)" "PREFIX=$(out)" ];
diff --git a/pkgs/suckless/lel/default.nix b/pkgs/suckless/lel/default.nix
index 386b09137441249e030dcdecd35688fc862f04f0..3f3734355c32083609f420c141e0667383063010 100644
--- a/pkgs/suckless/lel/default.nix
+++ b/pkgs/suckless/lel/default.nix
@@ -12,10 +12,10 @@ };
postPatch = ''
substituteInPlace lel-open \
--replace "jpg2ff" "${farbfeld}/bin/jpg2ff" \
--replace "png2ff" "${farbfeld}/bin/png2ff" \
--replace "gif2ff" "${farbfeld-utils}/bin/gif2ff" \
--replace "lel" "$out/bin/lel"
--replace-fail "jpg2ff" "${farbfeld}/bin/jpg2ff" \
--replace-fail "png2ff" "${farbfeld}/bin/png2ff" \
--replace-fail "gif2ff" "${farbfeld-utils}/bin/gif2ff" \
--replace-fail "lel" "$out/bin/lel"
'';
buildInputs = [ libX11 ];
diff --git a/pkgs/suckless/libst/default.nix b/pkgs/suckless/libst/default.nix
index 73fabcdbeb639cc7cb0eb3df9de864b70d363c72..cb29d367defecb7c664c6db3c94358e909b05120 100644
--- a/pkgs/suckless/libst/default.nix
+++ b/pkgs/suckless/libst/default.nix
@@ -13,7 +13,7 @@ };
postPatch = ''
substituteInPlace Makefile \
--replace "ar rcs" "\$(AR) rcs"
--replace-fail "ar rcs" "\$(AR) rcs"
'';
nativeBuildInputs = [ ncurses ];
diff --git a/pkgs/suckless/scc/default.nix b/pkgs/suckless/scc/default.nix
index f01fa8a2cd20d495b951584148bd976cc785e55b..8cc9bd4ce0aa9add7b8285f7eed1fb222c3eedeb 100644
--- a/pkgs/suckless/scc/default.nix
+++ b/pkgs/suckless/scc/default.nix
@@ -13,7 +13,7 @@ };
postPatch = ''
substituteInPlace src/cmd/Makefile \
--replace "git submodule" "#git submodule"
--replace-fail "git submodule" "#git submodule"
'';
#buildInputs = [ qbe ];
diff --git a/pkgs/suckless/sdhcp/default.nix b/pkgs/suckless/sdhcp/default.nix
index 7542704e0a39193a4552221037332e4d36351546..453c73b657ad73632dc593d23de9ee063a86a33f 100644
--- a/pkgs/suckless/sdhcp/default.nix
+++ b/pkgs/suckless/sdhcp/default.nix
@@ -11,7 +11,7 @@ hash = "sha256-bN2jFO+cp1Vck0RvB8q2qwMYpUARH2mjZuWs3FkhxR0=";
};
postPatch = ''
'';
makeFlags = [ "AR:=$(AR)" "CC:=$(CC)" "PREFIX=$(out)" "RANLIB:=$(RANLIB)" ];
application/octet-streamThis content has been proxied by September (3851b).