Merge pull request #152 from nix-community/joerg-ci

disable installer channel in a single place
nix-community · Dec 12, 2023 · d655cc0 · d655cc0
2 parents b7719be + 73c9e5e
commit d655cc0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/flake.nix b/flake.nix
@@ -21,7 +21,7 @@
         let
           netboot = nixpkgs: (import (nixpkgs + "/nixos/release.nix") { }).netboot.${system};
           kexec-installer = nixpkgs: modules: (nixpkgs.legacyPackages.${system}.nixos (modules ++ [ self.nixosModules.kexec-installer ])).config.system.build.kexecTarball;
-          netboot-installer = nixpkgs: modules: (nixpkgs.legacyPackages.${system}.nixos (modules ++ [ self.nixosModules.netboot-installer ])).config.system.build.netboot;
+          netboot-installer = nixpkgs: (nixpkgs.legacyPackages.${system}.nixos [ self.nixosModules.netboot-installer ]).config.system.build.netboot;
         in
         {
           netboot-nixos-unstable = netboot nixos-unstable;
@@ -32,24 +32,18 @@
           kexec-installer-nixos-unstable-noninteractive = kexec-installer nixos-unstable [
             {
               system.kexec-installer.name = "nixos-kexec-installer-noninteractive";
-              system.installer.channel.enable = false;
             }
             self.nixosModules.noninteractive
           ];
           kexec-installer-nixos-2311-noninteractive = kexec-installer nixos-2311 [
             {
               system.kexec-installer.name = "nixos-kexec-installer-noninteractive";
-              system.installer.channel.enable = false;
             }
             self.nixosModules.noninteractive
           ];
 
-          netboot-installer-nixos-unstable = netboot-installer nixos-unstable [
-            { system.installer.channel.enable = false; }
-          ];
-          netboot-installer-nixos-2311 = netboot-installer nixos-2311 [
-            { system.installer.channel.enable = false; }
-          ];
+          netboot-installer-nixos-unstable = netboot-installer nixos-unstable;
+          netboot-installer-nixos-2311 = netboot-installer nixos-2311;
         });
       nixosModules = {
         kexec-installer = ./nix/kexec-installer/module.nix;

diff --git a/nix/installer.nix b/nix/installer.nix
@@ -27,6 +27,9 @@
     ./nix-settings.nix
   ];
 
+  # Don't add nixpkgs to the image to save space, for our intended use case we don't need it
+  system.installer.channel.enable = false;
+
   systemd.services.log-network-status = {
     wantedBy = [ "multi-user.target" ];
     # No point in restarting this. We just need this after boot