diff options
author | Travis A. Everett <travis.a.everett@gmail.com> | 2024-04-13 13:09:17 -0500 |
---|---|---|
committer | Travis A. Everett <travis.a.everett@gmail.com> | 2024-04-16 15:58:16 -0500 |
commit | 1f9a9252a7f268cc05066d5ee2e2793ecf2ebdb4 (patch) | |
tree | a196dc3900301b22fb77d980803f59f0f3d0cd2e | |
parent | 7fb2aab0151067b4df1d374707d158254c63c6ec (diff) |
bats: 0.10.0 -> 0.11.0
Also conditionally excludes pkill from resolution on macOS, since the procps package should contain pkill on other platforms.
-rw-r--r-- | pkgs/development/interpreters/bats/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index 8591552d45dd4..cbb490615b7d1 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -27,13 +27,13 @@ resholve.mkDerivation rec { pname = "bats"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "bats-core"; repo = "bats-core"; rev = "v${version}"; - sha256 = "sha256-gy4dyoKRlf2WFmH1/mSNwhVR3df92BgpT4TjTpV4FyQ="; + hash = "sha256-goHIhbBoCf1eb1N8xIHdVvAURofvLDgEDXofhDHrr7Y="; }; patchPhase = '' @@ -69,11 +69,13 @@ resholve.mkDerivation rec { external = [ "greadlink" "shlock" + ] ++ lib.optionals stdenv.isDarwin [ "pkill" # procps doesn't supply this on darwin ]; }; fix = { "$BATS_ROOT" = [ "${placeholder "out"}" ]; + "$BATS_LIBDIR" = [ "lib" ]; "$BATS_LIBEXEC" = [ "${placeholder "out"}/libexec/bats-core" ]; }; keep = { @@ -99,6 +101,7 @@ resholve.mkDerivation rec { "$BATS_LINE_REFERENCE_FORMAT" = "comma_line"; "$BATS_LOCKING_IMPLEMENTATION" = "${flock}/bin/flock"; "$parallel_binary_name" = "${parallel}/bin/parallel"; + "${placeholder "out"}/libexec/bats-core/bats-preprocess" = true; }; execer = [ /* @@ -115,6 +118,10 @@ resholve.mkDerivation rec { # these do exec, but other internal files "cannot:libexec/bats-core/bats-exec-file" "cannot:libexec/bats-core/bats-exec-suite" + "cannot:libexec/bats-core/bats-gather-tests" + ] ++ lib.optionals (!stdenv.isDarwin) [ + # checked invocations for exec + "cannot:${procps}/bin/pkill" ]; }; }; |