diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-01-30 00:12:10 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-30 00:12:10 +0000 |
commit | b0233d387cce36e7f5f9d94d86539972a5bbd2e3 (patch) | |
tree | 75aa1515923458281c2c3a623a234471fddef386 /pkgs/test | |
parent | c2791e85dedb9672f95e34dc1ec39d77b79c86c1 (diff) | |
parent | fb15daf152589b58ba1e1194968a545faa7fbe5a (diff) |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/test')
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/test/nixpkgs-check-by-name/scripts/pinned-tool.json b/pkgs/test/nixpkgs-check-by-name/scripts/pinned-tool.json index c4dff2c6554a5..5b8777ca94b67 100644 --- a/pkgs/test/nixpkgs-check-by-name/scripts/pinned-tool.json +++ b/pkgs/test/nixpkgs-check-by-name/scripts/pinned-tool.json @@ -1,4 +1,4 @@ { - "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19", - "ci-path": "/nix/store/8habk3j25bs2a34zn5q5p17b9dl3fywg-nixpkgs-check-by-name" + "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", + "ci-path": "/nix/store/ghfxriicygwcrxvm45r0cm9g0vshpw01-nixpkgs-check-by-name" } diff --git a/pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh b/pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh index 1dd52293cc7e6..46cbd5e858e29 100755 --- a/pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh +++ b/pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p jq -I nixpkgs=../../../.. +#!nix-shell -i bash -p jq set -o pipefail -o errexit -o nounset diff --git a/pkgs/test/nixpkgs-check-by-name/scripts/update-pinned-tool.sh b/pkgs/test/nixpkgs-check-by-name/scripts/update-pinned-tool.sh index b2bc629e86604..dbc6e91df08a6 100755 --- a/pkgs/test/nixpkgs-check-by-name/scripts/update-pinned-tool.sh +++ b/pkgs/test/nixpkgs-check-by-name/scripts/update-pinned-tool.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p jq -I nixpkgs=../../../.. +#!nix-shell -i bash -p jq set -o pipefail -o errexit -o nounset |