From 753b1cd663a25145fd75aa1517059fafed0878ee Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Mon, 8 Jun 2026 06:05:54 +0100 Subject: [PATCH] tests/nixpkgs-fetch: cross-check with `version-info.toml` --- tests/nixpkgs-fetch.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/nixpkgs-fetch.nix b/tests/nixpkgs-fetch.nix index 3010b8b6..646b401b 100644 --- a/tests/nixpkgs-fetch.nix +++ b/tests/nixpkgs-fetch.nix @@ -35,6 +35,7 @@ # nix-instantiate --eval nixpkgs.nix --attr outPath --option experimental-features '' let + version-info = lib.importTOML ../version-info.toml; flake-input = self.inputs.nixpkgs.sourceInfo; pinned-input = import ../nixpkgs.nix; in @@ -47,6 +48,8 @@ linkFarmFromDrvs "nixpkgs-fetch-test" [ strictDeps = true; hasPrimop = builtins ? fetchTree; + versionInfo = version-info; + expected = flake-input; actual = pinned-input; @@ -73,6 +76,13 @@ linkFarmFromDrvs "nixpkgs-fetch-test" [ exit 1 fi + expectedRev=$(jq --raw-output .expectedAttrs.rev "$NIX_ATTRS_JSON_FILE") + versionInfoRev=$(jq --raw-output .versionInfo.nixpkgs_rev "$NIX_ATTRS_JSON_FILE") + [ "$expectedRev" = "$versionInfoRev" ] || { + echo "Expected version-info nixpkgs_rev '$versionInfoRev' to be '$expectedRev'" >&2 + exit 1 + } + mkdir "$out" jq --sort-keys .expectedAttrs "$NIX_ATTRS_JSON_FILE" > "$out/expected.json" jq --sort-keys .actualAttrs "$NIX_ATTRS_JSON_FILE" > "$out/actual.json"