From 0259a8b94d2ae450b59f3ef99151c1c25de81629 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 18 Jan 2024 18:39:39 +0100 Subject: [PATCH 1/2] nixpkgs-check-by-name/scripts: Use local Nixpkgs for dependencies Especially needed because NIX_PATH is set to something custom in the nix-shell of nixpkgs-check-by-name --- pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh | 2 +- pkgs/test/nixpkgs-check-by-name/scripts/update-pinned-tool.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 46cbd5e858e2..1dd52293cc7e 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 +#!nix-shell -i bash -p jq -I nixpkgs=../../../.. 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 dbc6e91df08a..b2bc629e8660 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 +#!nix-shell -i bash -p jq -I nixpkgs=../../../.. set -o pipefail -o errexit -o nounset From bfe48c9a44cbfe45b2ca6b6a448a4b5e13c6fa2d Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 18 Jan 2024 18:42:03 +0100 Subject: [PATCH 2/2] check-by-name: Update pinned tooling Includes https://github.com/NixOS/nixpkgs/pull/275539 --- pkgs/test/nixpkgs-check-by-name/scripts/pinned-tool.json | 4 ++-- 1 file changed, 2 insertions(+), 2 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 b703ce74771e..c4dff2c6554a 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": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", - "ci-path": "/nix/store/qlls5ca8q88qpyygg9ddi60gl1nmvpij-nixpkgs-check-by-name" + "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19", + "ci-path": "/nix/store/8habk3j25bs2a34zn5q5p17b9dl3fywg-nixpkgs-check-by-name" }