diff options
| author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2024-05-02 00:05:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-02 00:05:08 +0200 |
| commit | 11333528ce06b58b22fcc397c07f5488c83866ee (patch) | |
| tree | 5aabd0f15fc6aa4f11114941b9b13c232f09b2eb /pkgs/tools/misc | |
| parent | 523bb9dbdc3f1015a3650b3bef8af557ce0cf07f (diff) | |
| parent | 476b39eafa73d667283f3dc43cfdf4461f362bee (diff) | |
Merge pull request #308047 from pbsds/fix-replace-fail
treewide: fixes to packages i maintain
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/pokemonsay/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/tools/misc/remote-exec/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/rmate-sh/default.nix | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/tools/misc/pokemonsay/default.nix b/pkgs/tools/misc/pokemonsay/default.nix index 7053e4ba80733..669fa6a494134 100644 --- a/pkgs/tools/misc/pokemonsay/default.nix +++ b/pkgs/tools/misc/pokemonsay/default.nix @@ -28,27 +28,27 @@ stdenvNoCC.mkDerivation rec { postPatch = '' substituteInPlace pokemonsay.sh \ - --replace \ + --replace-fail \ 'INSTALL_PATH=''${HOME}/.bin/pokemonsay' \ "" \ - --replace \ + --replace-fail \ 'POKEMON_PATH=''${INSTALL_PATH}/pokemons' \ 'POKEMON_PATH=${placeholder "out"}/share/pokemonsay' \ - --replace \ + --replace-fail \ '$(find ' \ '$(${findutils}/bin/find ' \ - --replace \ + --replace-fail \ '$(basename ' \ '$(${coreutils}/bin/basename ' \ - --replace \ + --replace-fail \ 'cowsay -f ' \ '${cowsay}/bin/cowsay -f ' \ - --replace \ + --replace-fail \ 'cowthink -f ' \ '${cowsay}/bin/cowthink -f ' substituteInPlace pokemonthink.sh \ - --replace \ + --replace-fail \ './pokemonsay.sh' \ "${placeholder "out"}/bin/pokemonsay" ''; diff --git a/pkgs/tools/misc/remote-exec/default.nix b/pkgs/tools/misc/remote-exec/default.nix index 979f0f53bae0d..84b8026c0a073 100644 --- a/pkgs/tools/misc/remote-exec/default.nix +++ b/pkgs/tools/misc/remote-exec/default.nix @@ -34,10 +34,10 @@ buildPythonApplication rec { # remove legacy endpoints, we use --multi now postPatch = '' substituteInPlace setup.py \ - --replace '"mremote' '#"mremote' + --replace-fail '"mremote' '#"mremote' ''; - propagatedBuildInputs = [ + dependencies = [ click pydantic toml diff --git a/pkgs/tools/misc/rmate-sh/default.nix b/pkgs/tools/misc/rmate-sh/default.nix index bc93c6e437fe2..81189a1cd6c7c 100644 --- a/pkgs/tools/misc/rmate-sh/default.nix +++ b/pkgs/tools/misc/rmate-sh/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { runHook preBuild substituteInPlace rmate \ - --replace \ + --replace-fail \ 'echo "hostname"' \ 'echo "${hostname}/bin/hostname"' patsh -f rmate -s ${builtins.storeDir} |