From e0f9929a6940eaaf9b30a2201c3c4afe7c6c50a8 Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Sat, 13 Apr 2024 12:34:27 -0500 Subject: resholve: patch test breaks coming in bats 1.11 I'm preparing to update bats to 1.11.0, but a change it includes will require updating 3 of resholve's tests. Since a full resholve source bump would need to go through staging now, I'm just patching the tests in the separate test derivation. --- pkgs/development/misc/resholve/test.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'pkgs/development/misc') 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 = '' -- cgit 1.4.1