Fix CI build. Ephemeral targets should not be in nixosConfigurations
All checks were successful
Check Flake / check-flake (push) Successful in 17m45s
All checks were successful
Check Flake / check-flake (push) Successful in 17m45s
This commit is contained in:
46
flake.nix
46
flake.nix
@@ -156,36 +156,30 @@
|
|||||||
nixpkgs.lib.mapAttrs
|
nixpkgs.lib.mapAttrs
|
||||||
(hostname: cfg:
|
(hostname: cfg:
|
||||||
mkSystem cfg.arch nixpkgs cfg.configurationPath hostname)
|
mkSystem cfg.arch nixpkgs cfg.configurationPath hostname)
|
||||||
machineHosts
|
machineHosts;
|
||||||
//
|
|
||||||
(
|
|
||||||
let
|
|
||||||
mkEphemeral = system: nixpkgs.lib.nixosSystem {
|
|
||||||
inherit system;
|
|
||||||
modules = [
|
|
||||||
./machines/ephemeral/minimal.nix
|
|
||||||
inputs.nix-index-database.nixosModules.default
|
|
||||||
];
|
|
||||||
};
|
|
||||||
in
|
|
||||||
{
|
|
||||||
ephemeral-x86_64 = mkEphemeral "x86_64-linux";
|
|
||||||
ephemeral-aarch64 = mkEphemeral "aarch64-linux";
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
# kexec produces a tarball; for a self-extracting bundle see:
|
# kexec produces a tarball; for a self-extracting bundle see:
|
||||||
# https://github.com/nix-community/nixos-generators/blob/master/formats/kexec.nix#L60
|
# https://github.com/nix-community/nixos-generators/blob/master/formats/kexec.nix#L60
|
||||||
packages = {
|
packages =
|
||||||
"x86_64-linux" = {
|
let
|
||||||
kexec = self.nixosConfigurations.ephemeral-x86_64.config.system.build.images.kexec;
|
mkEphemeral = system: nixpkgs.lib.nixosSystem {
|
||||||
iso = self.nixosConfigurations.ephemeral-x86_64.config.system.build.images.iso;
|
inherit system;
|
||||||
|
modules = [
|
||||||
|
./machines/ephemeral/minimal.nix
|
||||||
|
inputs.nix-index-database.nixosModules.default
|
||||||
|
];
|
||||||
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
"x86_64-linux" = {
|
||||||
|
kexec = (mkEphemeral "x86_64-linux").config.system.build.images.kexec;
|
||||||
|
iso = (mkEphemeral "x86_64-linux").config.system.build.images.iso;
|
||||||
|
};
|
||||||
|
"aarch64-linux" = {
|
||||||
|
kexec = (mkEphemeral "aarch64-linux").config.system.build.images.kexec;
|
||||||
|
iso = (mkEphemeral "aarch64-linux").config.system.build.images.iso;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
"aarch64-linux" = {
|
|
||||||
kexec = self.nixosConfigurations.ephemeral-aarch64.config.system.build.images.kexec;
|
|
||||||
iso = self.nixosConfigurations.ephemeral-aarch64.config.system.build.images.iso;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
overlays.default = import ./overlays { inherit inputs; };
|
overlays.default = import ./overlays { inherit inputs; };
|
||||||
nixosModules.kernel-modules = import ./overlays/kernel-modules;
|
nixosModules.kernel-modules = import ./overlays/kernel-modules;
|
||||||
|
|||||||
Reference in New Issue
Block a user