yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

checks/installation: don't require privateInputs for eval

Browse Source
This commit is contained in:
Michael Hoang
2025-10-05 22:53:42 +02:00
parent dc66321a72
commit 9d0cec1422
4 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
checks/flash/flake-module.nix
View File

@@ -2,7 +2,6 @@
config,
self,
lib,
privateInputs,
...
}:
{
@@ -14,8 +13,6 @@
fileSystems."/".device = lib.mkDefault "/dev/vda";
boot.loader.grub.device = lib.mkDefault "/dev/vda";
# We need to use `mkForce` because we inherit from `test-install-machine`
# which currently hardcodes `nixpkgs.hostPlatform`
nixpkgs.hostPlatform = lib.mkForce system;
imports = [ self.nixosModules.test-flash-machine ];
@@ -69,8 +66,7 @@
self.nixosConfigurations."test-flash-machine-${pkgs.hostPlatform.system}".config.system.build.diskoScript
self.nixosConfigurations."test-flash-machine-${pkgs.hostPlatform.system}".config.system.build.diskoScript.drvPath
]
++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs)
++ builtins.map (i: i.outPath) (builtins.attrValues privateInputs);
++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs);
closureInfo = pkgs.closureInfo { rootPaths = dependencies; };
in
{

18
checks/installation/flake-module.nix
View File

@@ -28,12 +28,20 @@
lib.map (
system:
lib.nameValuePair "test-install-machine-${system}" {
facter.reportPath = privateInputs.test-fixtures + /nixos-vm-facter-json/${system}.json;
imports = [
self.nixosModules.test-install-machine-without-system
(
if privateInputs ? test-fixtures then
{
facter.reportPath = privateInputs.test-fixtures + /nixos-vm-facter-json/${system}.json;
}
else
{ nixpkgs.hostPlatform = system; }
)
];
fileSystems."/".device = lib.mkDefault "/dev/vda";
boot.loader.grub.device = lib.mkDefault "/dev/vda";
imports = [ self.nixosModules.test-install-machine-without-system ];
}
) (lib.filter (lib.hasSuffix "linux") config.systems)
));
@@ -151,6 +159,7 @@
let
closureInfo = pkgs.closureInfo {
rootPaths = [
privateInputs.clan-core-for-checks
self.nixosConfigurations."test-install-machine-${pkgs.hostPlatform.system}".config.system.build.toplevel
self.nixosConfigurations."test-install-machine-${pkgs.hostPlatform.system}".config.system.build.initialRamdisk
self.nixosConfigurations."test-install-machine-${pkgs.hostPlatform.system}".config.system.build.diskoScript
@@ -158,8 +167,7 @@
pkgs.bash.drvPath
pkgs.buildPackages.xorg.lndir
]
++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs)
++ builtins.map (i: i.outPath) (builtins.attrValues privateInputs);
++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs);
};
in
pkgs.lib.mkIf (pkgs.stdenv.isLinux && !pkgs.stdenv.isAarch64) {

4
checks/morph/flake-module.nix
View File

@@ -1,6 +1,5 @@
{
self,
privateInputs,
...
}:
{
@@ -37,8 +36,7 @@
pkgs.stdenvNoCC
self.nixosConfigurations.test-morph-machine.config.system.build.toplevel
]
++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs)
++ builtins.map (i: i.outPath) (builtins.attrValues privateInputs);
++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs);
closureInfo = pkgs.closureInfo { rootPaths = dependencies; };
in

5
checks/update/flake-module.nix
View File

@@ -1,4 +1,4 @@
{ self, privateInputs, ... }:
{ self, ... }:
{
# Machine for update test
clan.machines.test-update-machine = {
@@ -123,8 +123,7 @@
pkgs.buildPackages.xorg.lndir
pkgs.bubblewrap
]
++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs)
++ builtins.map (i: i.outPath) (builtins.attrValues privateInputs);
++ builtins.map (i: i.outPath) (builtins.attrValues self.inputs);
};
in
self.clanLib.test.containerTest {