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

Merge pull request #198056 from hercules-ci/nixos-fix-nixpkgs-assertion-when-pkgs-is-set

Browse Source
This commit is contained in:
Bernardo Meurer
2022-10-27 12:58:11 +01:00
committed by GitHub
parent 87f8bb7aad 5d663a9171
commit 948fd41c77
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/misc/nixpkgs.nix
+1 -1
View File
@@ -358,7 +358,7 @@ in
else "nixpkgs.localSystem";
pkgsSystem = finalPkgs.stdenv.targetPlatform.system;
in {
assertion = !hasPlatform -> nixosExpectedSystem == pkgsSystem;
assertion = constructedByMe -> !hasPlatform -> nixosExpectedSystem == pkgsSystem;
message = "The NixOS nixpkgs.pkgs option was set to a Nixpkgs invocation that compiles to target system ${pkgsSystem} but NixOS was configured for system ${nixosExpectedSystem} via NixOS option ${nixosOption}. The NixOS system settings must match the Nixpkgs target system.";
}
)