diff options
| author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2024-04-17 19:21:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-17 19:21:37 +0200 |
| commit | 7a445b472858ea80f9ceec59e25ba47039241361 (patch) | |
| tree | 3df575aff01b46037f9b21e68bd670f46e35c217 /pkgs/development/misc | |
| parent | d205596f17d89a7205af1c7a9cd419be382d7557 (diff) | |
| parent | 1f9a9252a7f268cc05066d5ee2e2793ecf2ebdb4 (diff) | |
Merge pull request #303883 from abathur/bats_1_11
bats: 1.10.0 -> 1.11.0, resholve: fix related test breakage
Diffstat (limited to 'pkgs/development/misc')
| -rw-r--r-- | pkgs/development/misc/resholve/test.nix | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/development/misc/resholve/test.nix b/pkgs/development/misc/resholve/test.nix index d9862bef7cf59..e9551b5be2a9b 100644 --- a/pkgs/development/misc/resholve/test.nix +++ b/pkgs/development/misc/resholve/test.nix @@ -18,6 +18,7 @@ , gettext , rSrc , runDemo ? false +, fetchpatch , binlore , sqlite , unixtools @@ -122,6 +123,21 @@ rec { name = "resholve-test"; src = rSrc; + # TODO: should be removable on next resholve update--just + # temporarily work around test breaks caused by changes in + # bats 1.10.0. Since this is just about fixing tests, I'm + # patching test source to avoid going through staging. + patches = [ + (fetchpatch { + url = "https://github.com/abathur/resholve/commit/e1d6ccbc9cd5ec26122997610954dcb7d826f652.patch"; + hash = "sha256-XA9KUc/OAD2S8Vpt+C7KcjTP44rnZ4FLdgnnRqVWdWY="; + }) + (fetchpatch { + url = "https://github.com/abathur/resholve/commit/50db1a6a97baa7d7543a8abe33dddda62b487c65.patch"; + hash = "sha256-m1dKaLI02Wag7uacG4BkcdCXw30Kn6J4ydTqPd7bsak="; + }) + ]; + dontBuild = true; installPhase = '' |