colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bats: 0.10.0 -> 0.11.0

Browse Source 
Also conditionally excludes pkill from resolution on macOS, since the
procps package should contain pkill on other platforms.
This commit is contained in:
Travis A. Everett 2024-04-13 13:09:17 -05:00
parent 7fb2aab015
commit 1f9a9252a7
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/interpreters/bats/default.nix
View File

@ -27,13 +27,13 @@
resholve.mkDerivation rec { resholve.mkDerivation rec {
pname = "bats"; pname = "bats";
version = "1.10.0"; version = "1.11.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bats-core"; owner = "bats-core";
repo = "bats-core"; repo = "bats-core";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-gy4dyoKRlf2WFmH1/mSNwhVR3df92BgpT4TjTpV4FyQ="; hash = "sha256-goHIhbBoCf1eb1N8xIHdVvAURofvLDgEDXofhDHrr7Y=";
}; };
patchPhase = '' patchPhase = ''
@ -69,11 +69,13 @@ resholve.mkDerivation rec {
external = [ external = [
"greadlink" "greadlink"
"shlock" "shlock"
] ++ lib.optionals stdenv.isDarwin [
"pkill" # procps doesn't supply this on darwin "pkill" # procps doesn't supply this on darwin
]; ];
}; };
fix = { fix = {
"$BATS_ROOT" = [ "${placeholder "out"}" ]; "$BATS_ROOT" = [ "${placeholder "out"}" ];
"$BATS_LIBDIR" = [ "lib" ];
"$BATS_LIBEXEC" = [ "${placeholder "out"}/libexec/bats-core" ]; "$BATS_LIBEXEC" = [ "${placeholder "out"}/libexec/bats-core" ];
}; };
keep = { keep = {
@ -99,6 +101,7 @@ resholve.mkDerivation rec {
"$BATS_LINE_REFERENCE_FORMAT" = "comma_line"; "$BATS_LINE_REFERENCE_FORMAT" = "comma_line";
"$BATS_LOCKING_IMPLEMENTATION" = "${flock}/bin/flock"; "$BATS_LOCKING_IMPLEMENTATION" = "${flock}/bin/flock";
"$parallel_binary_name" = "${parallel}/bin/parallel"; "$parallel_binary_name" = "${parallel}/bin/parallel";
"${placeholder "out"}/libexec/bats-core/bats-preprocess" = true;
}; };
execer = [ execer = [
/* /*
@ -115,6 +118,10 @@ resholve.mkDerivation rec {
# these do exec, but other internal files # these do exec, but other internal files
"cannot:libexec/bats-core/bats-exec-file" "cannot:libexec/bats-core/bats-exec-file"
"cannot:libexec/bats-core/bats-exec-suite" "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"
]; ];
}; };
}; };