This commit is contained in:
Shelvacu
2025-04-27 17:09:20 -07:00
committed by Shelvacu on fw
parent 3d58466456
commit 1f4821073f

View File

@@ -332,8 +332,10 @@
tt = toptop;
prophecy = toplevelOf "prophecy";
prop = prophecy;
iso = self.nixosConfigurations.shel-installer.config.system.build.isoImage;
iso = self.nixosConfigurations.shel-installer-iso.config.system.build.isoImage;
pxe-toplevel = toplevelOf "shel-installer-pxe";
pxe-kernel = self.nixosConfigurations.shel-installer-pxe.config.system.build.kernel;
pxe-initrd = self.nixosConfigurations.shel-installer-pxe.config.system.build.netbootRamdisk;
check-triple-dezert = self.checks.x86_64-linux.triple-dezert.driver;
check-trip = check-triple-dezert;
check-liam = self.checks.x86_64-linux.liam.driver;
@@ -398,6 +400,12 @@
archiveSmall =
let
ignoreList = [
"iso"
"host-pxe-installer"
"host-pxe-installer-aarch64"
"pxe-initrd"
];
# We don't want iso/img derivations here because they de-dupe terribly. Any change anywhere requires generating a new iso/img file.
isoContents = lib.concatStringsSep "\n" (
map (
@@ -405,9 +413,16 @@
) self.nixosConfigurations.shel-installer.config.isoImage.contents
);
isoContentsPkg = pkgs.writeText "iso-contents" isoContents;
pxeConfig = self.nixosConfigurations.shel-installer-pxe.config;
pxeContents = pkgs.linkFarm "pxe-initrd-contents" {
inherit (pxeConfig.boot.initrd) compressor;
inherit (pxeConfig.system.build) initialRamdisk;
storeContents = pkgs.linkFarmFromDrvs "store-contents" pxeConfig.netboot.storeContents;
};
allButImgs = self.all.overrideAttrs (prev: {
links = (removeAttrs prev.links [ "iso" ]) // {
links = (removeAttrs prev.links ignoreList) // {
iso-contents = isoContentsPkg;
pxe-contents = pxeContents;
};
});
in