From 6b3ebfbf99a42094494c50c718da89d765e316ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 2 Nov 2023 10:57:25 +0100 Subject: [PATCH 1/2] kexec-installer: disable channel in unstable --- flake.lock | 12 ++++++------ flake.nix | 10 +++++++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 6f5534e..3d02faf 100644 --- a/flake.lock +++ b/flake.lock @@ -18,16 +18,16 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1698800439, - "narHash": "sha256-SrAwRi266j7U9XqCl0qPwsvcFiQ55iPXEK36ZX6QPjE=", - "owner": "NixOS", + "lastModified": 1698919212, + "narHash": "sha256-Sd1h8Dj687VgSj+h4qP8hDcTAzzxJy/MWm+gulO14jA=", + "owner": "Mic92", "repo": "nixpkgs", - "rev": "0ac7840a74c53b62f124e86fcde8cdd45f2bc131", + "rev": "c7614b205e20752323019d07c65b87d571486ced", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", + "owner": "Mic92", + "ref": "smaller-installer", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index f002dc2..be76d57 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,8 @@ { description = "NixOS images"; - inputs.nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small"; + #inputs.nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small"; + inputs.nixos-unstable.url = "github:Mic92/nixpkgs/smaller-installer"; # https://github.com/NixOS/nixpkgs/pull/263974 inputs.nixos-2305.url = "github:NixOS/nixpkgs/release-23.05"; nixConfig.extra-substituters = [ @@ -26,8 +27,11 @@ kexec-installer-nixos-2305 = kexec-installer nixos-2305 []; kexec-installer-nixos-unstable-noninteractive = kexec-installer nixos-unstable [ - { system.kexec-installer.name = "nixos-kexec-installer-noninteractive"; } - self.nixosModules.noninteractive + { + system.kexec-installer.name = "nixos-kexec-installer-noninteractive"; + system.installer.channel.enable = false; # TODO: enable this also in the 23.11 edition, once we have it. + } + self.nixosModules.noninteractive ]; kexec-installer-nixos-2305-noninteractive = kexec-installer nixos-2305 [ { system.kexec-installer.name = "nixos-kexec-installer-noninteractive"; } From 913fba8fbe32ec3061eae6854d82d72405d48894 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 2 Nov 2023 11:09:47 +0100 Subject: [PATCH 2/2] netboot-installer: disable channel in unstable --- flake.nix | 105 +++++++++++++++++++++++++++++------------------------- 1 file changed, 57 insertions(+), 48 deletions(-) diff --git a/flake.nix b/flake.nix index be76d57..ec15542 100644 --- a/flake.nix +++ b/flake.nix @@ -12,56 +12,65 @@ "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" ]; - outputs = { self, nixos-unstable, nixos-2305 }: let - supportedSystems = [ "aarch64-linux" "x86_64-linux" ]; - forAllSystems = nixos-unstable.lib.genAttrs supportedSystems; - in { - packages = forAllSystems (system: 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: (nixpkgs.legacyPackages.${system}.nixos [self.nixosModules.netboot-installer]).config.system.build.netboot; - in { - netboot-nixos-unstable = netboot nixos-unstable; - netboot-nixos-2305 = netboot nixos-2305; - kexec-installer-nixos-unstable = kexec-installer nixos-unstable []; - kexec-installer-nixos-2305 = kexec-installer nixos-2305 []; - - kexec-installer-nixos-unstable-noninteractive = kexec-installer nixos-unstable [ + outputs = { self, nixos-unstable, nixos-2305 }: + let + supportedSystems = [ "aarch64-linux" "x86_64-linux" ]; + forAllSystems = nixos-unstable.lib.genAttrs supportedSystems; + in + { + packages = forAllSystems (system: + 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; + in { - system.kexec-installer.name = "nixos-kexec-installer-noninteractive"; - system.installer.channel.enable = false; # TODO: enable this also in the 23.11 edition, once we have it. - } - self.nixosModules.noninteractive - ]; - kexec-installer-nixos-2305-noninteractive = kexec-installer nixos-2305 [ - { system.kexec-installer.name = "nixos-kexec-installer-noninteractive"; } - self.nixosModules.noninteractive - ]; + netboot-nixos-unstable = netboot nixos-unstable; + netboot-nixos-2305 = netboot nixos-2305; + kexec-installer-nixos-unstable = kexec-installer nixos-unstable [ ]; + kexec-installer-nixos-2305 = kexec-installer nixos-2305 [ ]; - netboot-installer-nixos-unstable = netboot-installer nixos-unstable; - netboot-installer-nixos-2305 = netboot-installer nixos-2305; - }); - nixosModules = { - kexec-installer = ./nix/kexec-installer/module.nix; - noninteractive = ./nix/noninteractive.nix; - # TODO: also add a test here once we have https://github.com/NixOS/nixpkgs/pull/228346 merged - netboot-installer = ./nix/netboot-installer/module.nix; - }; - checks.x86_64-linux = let - pkgs = nixos-unstable.legacyPackages.x86_64-linux; - in { - kexec-installer-unstable = pkgs.callPackage ./nix/kexec-installer/test.nix { - kexecTarball = self.packages.x86_64-linux.kexec-installer-nixos-unstable-noninteractive; - }; - shellcheck = pkgs.runCommand "shellcheck" { - nativeBuildInputs = [ pkgs.shellcheck ]; - } '' - shellcheck ${(pkgs.nixos [self.nixosModules.kexec-installer]).config.system.build.kexecRun} - touch $out - ''; - kexec-installer-2305 = nixos-2305.legacyPackages.x86_64-linux.callPackage ./nix/kexec-installer/test.nix { - kexecTarball = self.packages.x86_64-linux.kexec-installer-nixos-2305-noninteractive; + kexec-installer-nixos-unstable-noninteractive = kexec-installer nixos-unstable [ + { + system.kexec-installer.name = "nixos-kexec-installer-noninteractive"; + system.installer.channel.enable = false; # TODO: enable this also in the 23.11 edition, once we have it. + } + self.nixosModules.noninteractive + ]; + kexec-installer-nixos-2305-noninteractive = kexec-installer nixos-2305 [ + { system.kexec-installer.name = "nixos-kexec-installer-noninteractive"; } + self.nixosModules.noninteractive + ]; + + netboot-installer-nixos-unstable = netboot-installer nixos-unstable [ + { system.installer.channel.enable = false; } # TODO: enable this also in the 23.11 edition, once we have it. + ]; + netboot-installer-nixos-2305 = netboot-installer nixos-2305 [ ]; + }); + nixosModules = { + kexec-installer = ./nix/kexec-installer/module.nix; + noninteractive = ./nix/noninteractive.nix; + # TODO: also add a test here once we have https://github.com/NixOS/nixpkgs/pull/228346 merged + netboot-installer = ./nix/netboot-installer/module.nix; }; + checks.x86_64-linux = + let + pkgs = nixos-unstable.legacyPackages.x86_64-linux; + in + { + kexec-installer-unstable = pkgs.callPackage ./nix/kexec-installer/test.nix { + kexecTarball = self.packages.x86_64-linux.kexec-installer-nixos-unstable-noninteractive; + }; + shellcheck = pkgs.runCommand "shellcheck" + { + nativeBuildInputs = [ pkgs.shellcheck ]; + } '' + shellcheck ${(pkgs.nixos [self.nixosModules.kexec-installer]).config.system.build.kexecRun} + touch $out + ''; + kexec-installer-2305 = nixos-2305.legacyPackages.x86_64-linux.callPackage ./nix/kexec-installer/test.nix { + kexecTarball = self.packages.x86_64-linux.kexec-installer-nixos-2305-noninteractive; + }; + }; }; - }; }