From 44addcb5aae7e7b8494e843ba1d5b9bdbc33cc00 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Tue, 21 May 2024 12:41:15 +0200 Subject: [PATCH] treewide: use `substituteInPlace --replace-fail` Now substitution failures result in a script error. This has recently been backported to nixpkgs 23.11. --- pkgs/python-packages/python-bitcointx/default.nix | 2 +- test/tests.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/python-packages/python-bitcointx/default.nix b/pkgs/python-packages/python-bitcointx/default.nix index fd6b7fe..ddee304 100644 --- a/pkgs/python-packages/python-bitcointx/default.nix +++ b/pkgs/python-packages/python-bitcointx/default.nix @@ -14,7 +14,7 @@ buildPythonPackageWithDepsCheck rec { patchPhase = '' for path in core/secp256k1.py tests/test_load_secp256k1.py; do substituteInPlace "bitcointx/$path" \ - --replace "ctypes.util.find_library('secp256k1')" "'${secp256k1}/lib/libsecp256k1.so'" + --replace-fail "ctypes.util.find_library('secp256k1')" "'${secp256k1}/lib/libsecp256k1.so'" done ''; diff --git a/test/tests.nix b/test/tests.nix index 1d39d29..fb92119 100644 --- a/test/tests.nix +++ b/test/tests.nix @@ -271,7 +271,7 @@ let clightning = super.clightning.overrideAttrs (old: { postPatch = old.postPatch + '' substituteInPlace lightningd/plugin.c \ - --replace "#define PLUGIN_MANIFEST_TIMEOUT 60" "#define PLUGIN_MANIFEST_TIMEOUT 200" + --replace-fail "#define PLUGIN_MANIFEST_TIMEOUT 60" "#define PLUGIN_MANIFEST_TIMEOUT 200" ''; }); };