commit 9297afe9799c81053cf6dd8ac25a3c8865a9df96 parent f50e19087c108464b1e29f88688a997e6ce3a4f4 Author: Nikolay Korotkiy <sikmir@disroot.org> Date: Sat, 24 Feb 2024 17:50:09 +0400 Up Diffstat:
69 files changed, 182 insertions(+), 178 deletions(-)
diff --git 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 @@ -27,17 +27,17 @@ let in buildGoModule rec { pname = "finch"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "runfinch"; repo = "finch"; rev = "v${version}"; - hash = "sha256-idZFqE99rT98okO4XPJcKCsn2TrdewEn1KeVtl6uLSE="; + hash = "sha256-Pjuzwzo+nihAJ8Z6d3nqg7V1PyS4n61L8MhXOUAkMNc="; fetchSubmodules = true; }; - vendorHash = "sha256-BxGaWDFnOjHFDTqpK8Q4FWiIwndWxqKxl0TuDyGJHpU="; + vendorHash = "sha256-AwTcjCTZZ9qF2yGmoBJrOiDUN0Gpw/fa2wGTiOZQAKc="; subPackages = [ "cmd/finch" ]; @@ -63,9 +63,9 @@ buildGoModule rec { 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 @@ -36,7 +36,7 @@ let in stdenvNoCC.mkDerivation rec { pname = "tatoeba"; - version = "2024-02-17"; + version = "2024-02-24"; srcs = lib.mapAttrsToList (name: spec: fetchurl spec) tatoeba; diff --git 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", - "hash": "sha256-at7NPRwVL/YR7wLhMQBpYErrLyDfj0X7qjnuHp6ax60=" + "hash": "sha256-bhQM1xjV0QVFEez1Idcqzbal3Umrdz85+hca/1vYW7c=" }, "deu_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/deu/deu_sentences_detailed.tsv.bz2", - "hash": "sha256-ucvuj2lUCA8dQ31wl2CqyjyJDkhpds4dsWe82vZaGv0=" + "hash": "sha256-Kjb6aQeD/8cu38mbDiIRL5HwwZpMBSbpk0iIoIaDRjg=" }, "eng_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng_sentences_detailed.tsv.bz2", - "hash": "sha256-y2p3QCdvGTOQBozmN6bUnqlW9UdZjh/Oo2V+dW/lv9Y=" + "hash": "sha256-sfXQNSiG7SK0Wq7zT/QABfs4EBSizaRdjPcXO+0Nfhw=" }, "epo_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/epo/epo_sentences_detailed.tsv.bz2", - "hash": "sha256-p+UK1ZS9EFm1zSw7bZ1Lj+qDO9/7FPsxfkIMcz06WTM=" + "hash": "sha256-7ZSQ+Tff+gfhnJ36plCAjMYvZvjckkU3eqrM31SCBhM=" }, "fin_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/fin/fin_sentences_detailed.tsv.bz2", - "hash": "sha256-4X55fvX8Smg3PUjQ7kaai84WjMpceMmevhL7CoLeLpk=" + "hash": "sha256-59daRW9ovbCERHN0h5cA4oS3GTnMj9w1YdCZW13vDt8=" }, "hye_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/hye/hye_sentences_detailed.tsv.bz2", @@ -25,47 +25,47 @@ }, "rus_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus_sentences_detailed.tsv.bz2", - "hash": "sha256-R6gTRX2QhKdtpHeU7NqMrs+nN1iHcGg3IGgLpOHwO9o=" + "hash": "sha256-92tucQCagGLDyvUpD16sBdYO/QQYQvNbAPofWgkBoOs=" }, "swe_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/swe/swe_sentences_detailed.tsv.bz2", - "hash": "sha256-gLSSq6wRVwCNeDGsJD+KGjccZxwKAIjaoMMrm7jCPO0=" + "hash": "sha256-ck+6NVsKNwtNHhXIaK18RwxNUUgKHAiBnERHyX6Zwjw=" }, "ukr_sentences_detailed": { "url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr_sentences_detailed.tsv.bz2", - "hash": "sha256-DxqMnoJUtIhHd8yg+dykg/nkvNWq+wbEtAlHFkyVeJQ=" + "hash": "sha256-vKy0pCcVrZlm8jIuj369DfgRxkRTpmcc75mHVii9ams=" }, "bel-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/bel/bel-eng_links.tsv.bz2", - "hash": "sha256-Ql/dAq/lgdOxpOFBYIiXmwccKGOUqNpqnMVvRWZ4yxw=" + "hash": "sha256-IsvQHMnhiMdJIUicARVUO+FjmNioKW8bPI1FgAsZwRU=" }, "bel-rus_links": { "url": "https://downloads.tatoeba.org/exports/per_language/bel/bel-rus_links.tsv.bz2", - "hash": "sha256-NCcGxgGhBRjHlS+MkCTCkUxfczgDs1+TmBeUrbDeFfw=" + "hash": "sha256-bi6VSY6udh4+iiXWmWl4TINokAl4litcr3wOYMs/dn4=" }, "deu-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-eng_links.tsv.bz2", - "hash": "sha256-x3fRBzXzxX1PluKGMv5zn0Yylm2MqooPaMy19nIXcc8=" + "hash": "sha256-ixQBaaYuc/sWcXE9NWnxCAIbFdsVtnkpXdFdc95lJeU=" }, "deu-rus_links": { "url": "https://downloads.tatoeba.org/exports/per_language/deu/deu-rus_links.tsv.bz2", - "hash": "sha256-Fce8TkDDBi1RMKUW2ygya1e5xUiYidl5yJhBAeK4swo=" + "hash": "sha256-vdobqdigHW6HDwHLhEuHW026bZrhQ5whKifcQZUFvIk=" }, "eng-epo_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-epo_links.tsv.bz2", - "hash": "sha256-Kg+dYE/Ld4QmM/V7+UhII3ZvM37E1Y4+J7b+i/zMueI=" + "hash": "sha256-GBFcGPrQvnp7SFoFTLtNwEtzuFNG8Y0jlplbBvs5BMs=" }, "eng-bel_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-bel_links.tsv.bz2", - "hash": "sha256-pIgo1HqzSatciwcypSxcAZU0gkERKT7QI67GQiDkvvQ=" + "hash": "sha256-j9xWoiO2gUA+m22B37TuIzlr/hTKZVfBdLUzJy4Jlhg=" }, "eng-deu_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-deu_links.tsv.bz2", - "hash": "sha256-SYAe7tNirpjT04TbO2C51BPBDnJs/HWcNsxxp2qkTOE=" + "hash": "sha256-GY4SFF4xH+4PqOFI+qetTtqwVj6XVIYWDDatLJzbYiY=" }, "eng-fin_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-fin_links.tsv.bz2", - "hash": "sha256-qRgqs3uEDmcWRRYXMW91ohpjfDNvgxqiMesv6aUaadw=" + "hash": "sha256-ll9JSsLeMDFpduXp3+pfTKY7zFGLOEBMjJ6Ug8KNVTk=" }, "eng-hye_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-hye_links.tsv.bz2", @@ -73,27 +73,27 @@ }, "eng-rus_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-rus_links.tsv.bz2", - "hash": "sha256-zlEG94V8b/0o6R9kFeHP3Ao0crczA8/zkbpi87xrUgc=" + "hash": "sha256-GyQKfyaUOHsuSLljPr8GMCK2opS9d5XSdmL5dpY7FAE=" }, "eng-swe_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-swe_links.tsv.bz2", - "hash": "sha256-THvMu5nGAAQJLG8rGuB3Rrs/Vml3w39ZJhGkmhMni4o=" + "hash": "sha256-+8gRjJxk6nUzGtRxrxYolM3W0T6Cuf9ymDqoe5+GeXw=" }, "eng-ukr_links": { "url": "https://downloads.tatoeba.org/exports/per_language/eng/eng-ukr_links.tsv.bz2", - "hash": "sha256-utoN5c+kq0j28Xm2zsBvZFWEWdRsPuvSgsrKSoJEw8g=" + "hash": "sha256-NGIE62d6MZIQ9n0xWPRiJ4i0FB1s+PwaVa9JOTPdp2o=" }, "epo-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-eng_links.tsv.bz2", - "hash": "sha256-SN/BuqtOAATa6/gm8K5m/r1K4bWiXrYMCTz9HSl2cTs=" + "hash": "sha256-uDeaGgQxssnnsqfjcHK1ArzqZ9KDjgNBrd+yLlZjZow=" }, "epo-rus_links": { "url": "https://downloads.tatoeba.org/exports/per_language/epo/epo-rus_links.tsv.bz2", - "hash": "sha256-hqF3tMTHTu009G+CRf6y1NxJELTWRfnB49vePt7ZGT4=" + "hash": "sha256-0qQff7tnE4ybTUUWnRuLdqJ1Uzf7l6n5u6E7h+O4SpA=" }, "fin-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-eng_links.tsv.bz2", - "hash": "sha256-YEwBbZ4flDHO9OBlEBnhMH92+bchvKOeC9GYKIQ7i4o=" + "hash": "sha256-ZUL4sV4Bv6jVGJ9EiQPgyY5JTN0Dh00oX3G1tzgXfhc=" }, "fin-rus_links": { "url": "https://downloads.tatoeba.org/exports/per_language/fin/fin-rus_links.tsv.bz2", @@ -109,19 +109,19 @@ }, "rus-bel_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-bel_links.tsv.bz2", - "hash": "sha256-ognkRXSO8jmpb8TmO5QHaoUC7PiC3nPCR6Mcz1g3wFI=" + "hash": "sha256-8jUcZyWrg8pDApz0skAsh/LPoYtJjghItwVgKbKpsfU=" }, "rus-deu_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-deu_links.tsv.bz2", - "hash": "sha256-EEEt/nhNvHly5KlmIMQRDzAc4BoB9iirmLIcXH/KM/A=" + "hash": "sha256-ycTD2gLrylOmgqpxfzAM3ld1+9f7bamSZH1317qhT9o=" }, "rus-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-eng_links.tsv.bz2", - "hash": "sha256-P+JvNNJzb82XgWkoxf1zY3Mb+PkPhKEWmhpKRaR8BwA=" + "hash": "sha256-0/bKzTZPmYyKserqAQmaramhZ/Yz7X1/Unwn1Rja4ag=" }, "rus-epo_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-epo_links.tsv.bz2", - "hash": "sha256-AI8CdKCE5NJ3TBu+f/yfYNnV4vRdDloVuVi6l4RFQG0=" + "hash": "sha256-43gDXq4ffYqvA/mNxGK7js+hPDO/gFWfRR6bMF3YCQ4=" }, "rus-fin_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-fin_links.tsv.bz2", @@ -133,26 +133,26 @@ }, "rus-swe_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-swe_links.tsv.bz2", - "hash": "sha256-QV4y3ORf0TyZfuuNWVUjB60s/JMnRTtFmXQQwIm1s2M=" + "hash": "sha256-XVgu74KtzG8T72jyHPDu8ljkLmTua5tzv7/f22biGdE=" }, "rus-ukr_links": { "url": "https://downloads.tatoeba.org/exports/per_language/rus/rus-ukr_links.tsv.bz2", - "hash": "sha256-IDr6kHBsWhukDOmPLiKLvDrQryt5KX5Xlo3c8HIAU9M=" + "hash": "sha256-g5WKOA0TBUBZ3WmyV58SqBR8yulKOlzfglbzO0MN1+g=" }, "swe-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-eng_links.tsv.bz2", - "hash": "sha256-fvXWdM//bG4wkS5vtIW9UekXRkl8pJax0m2gzSBIzOU=" + "hash": "sha256-437e5zSXXeWfhb6TDmlQatzjdJBiGk9I+f07BkmH7zc=" }, "swe-rus_links": { "url": "https://downloads.tatoeba.org/exports/per_language/swe/swe-rus_links.tsv.bz2", - "hash": "sha256-J+BBYUcSJ07yBlnqHyaG5QYsIUyl0V4YkgsPiFmWWyo=" + "hash": "sha256-M5g5FvwIPDdkxto/bfuxk77wBr0G0BYnS6CYdsWAd1w=" }, "ukr-eng_links": { "url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-eng_links.tsv.bz2", - "hash": "sha256-XaTuIyRPvqrAuaKmKKKawt5XPiywufl9UphIaPKtnyE=" + "hash": "sha256-34xBOXdJD8xa04gkanvoQOMQqEAkpYIr1H8eXm4kc14=" }, "ukr-rus_links": { "url": "https://downloads.tatoeba.org/exports/per_language/ukr/ukr-rus_links.tsv.bz2", - "hash": "sha256-Z9u54nN7HfM/50CXLMXjLp1KZnATj34a4HJKvQ0ixeU=" + "hash": "sha256-eqQKjf4pyVK0ZCF1oSELtR5hOMwNk9gBCzDrfalGcis=" } } diff --git a/pkgs/data/maps/gpxsee-maps/default.nix b/pkgs/data/maps/gpxsee-maps/default.nix @@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation { 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 @@ -29,7 +29,7 @@ lib.makeScope newScope ( 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 @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # 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 @@ -23,12 +23,12 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ help2man ]; postPatch = '' - substituteInPlace Makefile --replace "/usr" "" - substituteInPlace utils/Makefile --replace "/usr" "" - substituteInPlace utils/cgrep.in --replace "/bin/ash" "${dash}/bin/dash" - substituteInPlace shell-terminfo --replace "tput" "${ncurses}/bin/tput" + substituteInPlace Makefile --replace-fail "/usr" "" + substituteInPlace utils/Makefile --replace-fail "/usr" "" + substituteInPlace utils/cgrep.in --replace-fail "/bin/ash" "${dash}/bin/dash" + substituteInPlace shell-terminfo --replace-fail "tput" "${ncurses}/bin/tput" 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 @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { 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 @@ -12,10 +12,10 @@ python3Packages.buildPythonPackage rec { }; postPatch = '' - substituteInPlace setup.py --replace "'setuptools-markdown'" "" + substituteInPlace setup.py --replace-fail "'setuptools-markdown'" "" # https://github.com/ansible/pytest-mp/issues/8 - substituteInPlace pytest_mp/terminal.py --replace "reporter.writer" "reporter._tw" + substituteInPlace pytest_mp/terminal.py --replace-fail "reporter.writer" "reporter._tw" ''; nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/embedded/embox/default.nix b/pkgs/embedded/embox/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation (finalAttrs: { 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 @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { 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 @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { 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 @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { 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 @@ -20,11 +20,11 @@ buildPerlPackage { 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 @@ -12,9 +12,9 @@ stdenv.mkDerivation { 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 @@ -53,7 +53,7 @@ buildPerlPackage rec { 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 @@ -21,8 +21,8 @@ stdenv.mkDerivation (finalAttrs: { 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 @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { 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 @@ -33,13 +33,13 @@ python3Packages.buildPythonApplication rec { 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 @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { 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 @@ -50,16 +50,16 @@ stdenv.mkDerivation (finalAttrs: { 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 . - substituteInPlace vmap_data/scripts/vmaps_preview --replace "vmaps.sh" "$out/bin/vmaps.sh" - substituteInPlace vmap_data/scripts/vmaps_out --replace "vmaps.sh" "$out/bin/vmaps.sh" - substituteInPlace vmap_data/scripts/vmaps_get_fig --replace "vmaps.sh" "$out/bin/vmaps.sh" - substituteInPlace vmap_data/scripts/vmaps_in --replace "vmaps.sh" "$out/bin/vmaps.sh" - substituteInPlace vmap_data/scripts/vmaps.sh --replace "/usr" "$out" + substituteInPlace vmap_data/scripts/vmaps_preview --replace-fail "vmaps.sh" "$out/bin/vmaps.sh" + substituteInPlace vmap_data/scripts/vmaps_out --replace-fail "vmaps.sh" "$out/bin/vmaps.sh" + substituteInPlace vmap_data/scripts/vmaps_get_fig --replace-fail "vmaps.sh" "$out/bin/vmaps.sh" + substituteInPlace vmap_data/scripts/vmaps_in --replace-fail "vmaps.sh" "$out/bin/vmaps.sh" + substituteInPlace vmap_data/scripts/vmaps.sh --replace-fail "/usr" "$out" ''; desktopItems = [ diff --git a/pkgs/geospatial/mapsoft/default.nix b/pkgs/geospatial/mapsoft/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation (finalAttrs: { 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 @@ stdenv.mkDerivation (finalAttrs: { 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 @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { 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 @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { 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 @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { 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 @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { }; postPatch = '' - substituteInPlace setup.py --replace "\"setuptools_scm_git_archive\"," "" + substituteInPlace setup.py --replace-fail "\"setuptools_scm_git_archive\"," "" ''; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/gpx/garta/default.nix b/pkgs/gpx/garta/default.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { 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 @@ rustPlatform.buildRustPackage rec { ./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 @@ -15,7 +15,7 @@ stdenv.mkDerivation { 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 @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { 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 @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { 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 @@ -40,11 +40,13 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace tools/src/Makefile.am \ - --replace "noinst_PROGRAMS =" "bin_PROGRAMS =" + --replace-fail "noinst_PROGRAMS =" "bin_PROGRAMS =" ''; preConfigure = "./autogen.sh"; - configureFlags = [ "--disable-dict" ]; + configureFlags = [ + (lib.enableFeature false "dict") + ]; env.NIX_CFLAGS_COMPILE = "-std=c++14"; diff --git a/pkgs/linguistics/wiktextract/default.nix b/pkgs/linguistics/wiktextract/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { 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 @@ -19,8 +19,8 @@ stdenv.mkDerivation (finalAttrs: { 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 @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { 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 @@ -11,26 +11,26 @@ stdenv.mkDerivation rec { 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 @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { 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 @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { }; postPatch = '' - substituteInPlace build.sh --replace "gcc" "cc" + substituteInPlace build.sh --replace-fail "gcc" "cc" ''; buildPhase = '' diff --git a/pkgs/misc/ish/default.nix b/pkgs/misc/ish/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { }; postPatch = '' - substituteInPlace Makefile --replace "/bin/rm" "rm" + substituteInPlace Makefile --replace-fail "/bin/rm" "rm" ''; makeFlags = [ "linux" ]; diff --git a/pkgs/misc/mitzasql/default.nix b/pkgs/misc/mitzasql/default.nix @@ -13,10 +13,10 @@ python3Packages.buildPythonApplication rec { 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 @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { 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 @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { 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 @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/src"; postPatch = '' - substituteInPlace CMakeLists.txt --replace "/usr" "$out" + substituteInPlace CMakeLists.txt --replace-fail "/usr" "$out" ''; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/misc/plotjuggler/default.nix b/pkgs/misc/plotjuggler/default.nix @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { 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 @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { 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 @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { 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 @@ -15,8 +15,8 @@ stdenv.mkDerivation (finalAttrs: { 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 @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { 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 @@ -26,7 +26,7 @@ let 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 @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { }; postPatch = '' - substituteInPlace forwarder.py --replace "ur'" "r'" + substituteInPlace forwarder.py --replace-fail "ur'" "r'" ''; dontUseSetuptoolsBuild = true; diff --git a/pkgs/mqtt/mqtt-to-influxdb/default.nix b/pkgs/mqtt/mqtt-to-influxdb/default.nix @@ -31,15 +31,15 @@ stdenv.mkDerivation (finalAttrs: { 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 @@ -24,10 +24,10 @@ python3Packages.buildPythonApplication rec { 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 @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec { 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 @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec { 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 @@ -56,7 +56,7 @@ python2Packages.buildPythonApplication rec { 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 @@ -23,10 +23,10 @@ python3Packages.buildPythonApplication rec { 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 @@ -11,7 +11,9 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ expat lz4 zlib ]; - configureFlags = [ "--enable-lz4" ]; + configureFlags = [ + (lib.enableFeature true "lz4") + ]; 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 @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec { 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 @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { 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 @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { }; postPatch = '' - substituteInPlace phyghtmap/hgt.py --replace "_contour" "contour" + substituteInPlace phyghtmap/hgt.py --replace-fail "_contour" "contour" ''; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/osm/tirex/default.nix b/pkgs/osm/tirex/default.nix @@ -35,9 +35,9 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - substituteInPlace Makefile --replace "/usr" "" --replace ": Makefile.perl" ":" - substituteInPlace backend-mapnik/Makefile --replace "/usr" "" - substituteInPlace lib/Tirex.pm --replace "/etc" "$out/etc" + substituteInPlace Makefile --replace-fail "/usr" "" --replace-fail ": Makefile.perl" ":" + substituteInPlace backend-mapnik/Makefile --replace-fail "/usr" "" + substituteInPlace lib/Tirex.pm --replace-fail "/etc" "$out/etc" ''; preConfigure = '' diff --git a/pkgs/radio/aprsc/default.nix b/pkgs/radio/aprsc/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { preConfigure = "LD=$CC"; configureFlags = [ - "--with-openssl" + (lib.withFeature true "openssl") "--mandir=$(out)/share/man" ]; diff --git a/pkgs/radio/fmreceiver/default.nix b/pkgs/radio/fmreceiver/default.nix @@ -34,12 +34,12 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace fmreceiver.pro \ - --replace "-lqwt-qt5" "-lqwt" \ - --replace "CONFIG" "#CONFIG" + --replace-fail "-lqwt-qt5" "-lqwt" \ + --replace-fail "CONFIG" "#CONFIG" '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace fmreceiver.pro --replace "-lrt " "" - substituteInPlace includes/fm-constants.h --replace "<malloc.h>" "<stdlib.h>" - substituteInPlace devices/rtlsdr-handler/rtlsdr-handler.cpp --replace ".so" ".dylib" + substituteInPlace fmreceiver.pro --replace-fail "-lrt " "" + substituteInPlace includes/fm-constants.h --replace-fail "<malloc.h>" "<stdlib.h>" + substituteInPlace devices/rtlsdr-handler/rtlsdr-handler.cpp --replace-fail ".so" ".dylib" ''; nativeBuildInputs = [ qmake wrapQtAppsHook ]; diff --git a/pkgs/radio/smallrx/default.nix b/pkgs/radio/smallrx/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { 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 @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { 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 @@ -12,10 +12,10 @@ stdenv.mkDerivation (finalAttrs: { 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 @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { 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 @@ -13,7 +13,7 @@ stdenv.mkDerivation { 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 @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { }; postPatch = '' - substituteInPlace Makefile --replace "ranlib" "\$(RANLIB)" + substituteInPlace Makefile --replace-fail "ranlib" "\$(RANLIB)" ''; makeFlags = [ "AR:=$(AR)" "CC:=$(CC)" "PREFIX=$(out)" "RANLIB:=$(RANLIB)" ];