Use the declared original Nixpkgs input in compiler qualification (#931)

This commit is contained in:
Quixos Development Agent 01f26965-84fa-4a79-8069-725682c13065
2026-11-05 21:41:16 +00:00
parent 4f672d027d
commit 6a2dfa7b58
+6 -2
View File
@@ -1,8 +1,10 @@
{ {
pkgs, pkgs,
library, library,
nixpkgsSource,
nixpkgsNarHash, nixpkgsNarHash,
}: }:
assert builtins.isString nixpkgsSource;
let let
comparisonIdentity = import ../tools/local-first/derivation-identity.nix; comparisonIdentity = import ../tools/local-first/derivation-identity.nix;
inspect = import ./source-qualification-metadata.nix; inspect = import ./source-qualification-metadata.nix;
@@ -34,7 +36,9 @@ let
narHashContext = builtins.getContext nixpkgsNarHash; narHashContext = builtins.getContext nixpkgsNarHash;
evaluatorVersion = builtins.nixVersion; evaluatorVersion = builtins.nixVersion;
pinnedNixVersion = pkgs.nix.version; pinnedNixVersion = pkgs.nix.version;
nixpkgs = pkgs.path; # toJSON ingests path values. Keep the original flake input's outPath
# string, so importing it and interpolating pkgs.path does not copy twice.
nixpkgs = nixpkgsSource;
system = pkgs.stdenv.hostPlatform.system; system = pkgs.stdenv.hostPlatform.system;
expected = comparisonIdentity library; expected = comparisonIdentity library;
expectedMetadata = inspect library; expectedMetadata = inspect library;
@@ -42,7 +46,7 @@ let
yarn = comparisonIdentity library.yarn-freestanding; yarn = comparisonIdentity library.yarn-freestanding;
} }
); );
closure = pkgs.closureInfo { rootPaths = [ pkgs.path ]; }; closure = pkgs.closureInfo { rootPaths = [ nixpkgsSource ]; };
in in
pkgs.runCommand "quixos-protocol-source-check" pkgs.runCommand "quixos-protocol-source-check"
{ {