Merge pull request #314 from nix-community/update_flake_lock_action

flake.lock: Update
nix-community · Jan 13, 2025 · 33b510d · 33b510d
2 parents 0a157d0 + ca591ed
commit 33b510d
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 29 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,8 +1,8 @@
 {
   description = "NixOS images";
 
-  inputs.nixos-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-  inputs.nixos-stable.url = "github:Mic92/nixpkgs/compression-24.11";
+  inputs.nixos-unstable.url = "git+https://github.com/NixOS/nixpkgs?shallow=1&ref=nixpkgs-unstable";
+  inputs.nixos-stable.url = "git+https://github.com/NixOS/nixpkgs?shallow=1&ref=nixos-24.11";
 
   nixConfig.extra-substituters = [ "https://nix-community.cachix.org" ];
   nixConfig.extra-trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ];
@@ -16,7 +16,7 @@
       packages = forAllSystems (system:
         let
           netboot = nixpkgs: (import (nixpkgs + "/nixos/release.nix") { }).netboot.${system};
-          kexec-installer = nixpkgs: module: (nixpkgs.legacyPackages.${system}.nixos [ module self.nixosModules.kexec-installer ]).config.system.build.kexecTarball;
+          kexec-installer = nixpkgs: module: (nixpkgs.legacyPackages.${system}.nixos [ module self.nixosModules.kexec-installer ]).config.system.build.kexecInstallerTarball;
           netboot-installer = nixpkgs: (nixpkgs.legacyPackages.${system}.nixos [ self.nixosModules.netboot-installer ]).config.system.build.netboot;
           image-installer = nixpkgs: (nixpkgs.legacyPackages.${system}.nixos [ self.nixosModules.image-installer ]).config.system.build.isoImage;
         in
@@ -70,11 +70,11 @@
             in
             {
               kexec-installer-unstable = pkgsUnstable.callPackage ./nix/kexec-installer/test.nix {
-                kexecTarball = self.packages.x86_64-linux.kexec-installer-nixos-unstable-noninteractive;
+                kexecInstallerTarball = self.packages.x86_64-linux.kexec-installer-nixos-unstable-noninteractive;
               };
 
               kexec-installer-stable = nixos-stable.legacyPackages.x86_64-linux.callPackage ./nix/kexec-installer/test.nix {
-                kexecTarball = self.packages.x86_64-linux.kexec-installer-nixos-stable-noninteractive;
+                kexecInstallerTarball = self.packages.x86_64-linux.kexec-installer-nixos-stable-noninteractive;
               };
               shellcheck = pkgsUnstable.runCommand "shellcheck"
                 {

diff --git a/nix/image-installer/module.nix b/nix/image-installer/module.nix
@@ -121,5 +121,8 @@ in
 
   # No one got time for xz compression.
   isoImage.squashfsCompression = "zstd";
+} // (if lib.versionAtLeast lib.version "25.03pre" then {
+  image.baseName = lib.mkForce "nixos-installer-${pkgs.system}";
+} else {
   isoImage.isoName = lib.mkForce "nixos-installer-${pkgs.system}.iso";
-}
+})
diff --git a/nix/kexec-installer/module.nix b/nix/kexec-installer/module.nix
@@ -47,7 +47,7 @@ in
       ${pkgs.shellcheck}/bin/shellcheck $out
     '';
 
-    system.build.kexecTarball = pkgs.runCommand "kexec-tarball" { } ''
+    system.build.kexecInstallerTarball = pkgs.runCommand "kexec-tarball" { } ''
       mkdir kexec $out
       cp "${config.system.build.netbootRamdisk}/initrd" kexec/initrd
       cp "${config.system.build.kernel}/${config.system.boot.loader.kernelFile}" kexec/bzImage

diff --git a/nix/kexec-installer/test.nix b/nix/kexec-installer/test.nix
@@ -1,6 +1,6 @@
 { pkgs
 , lib
-, kexecTarball
+, kexecInstallerTarball
 }:
 
 pkgs.testers.runNixOSTest {
@@ -16,7 +16,7 @@ pkgs.testers.runNixOSTest {
         (modulesPath + "/profiles/minimal.nix")
       ];
 
-      system.extraDependencies = [ kexecTarball ];
+      system.extraDependencies = [ kexecInstallerTarball ];
       virtualisation.memorySize = 1 * 1024;
       virtualisation.diskSize = 4 * 1024;
       virtualisation.forwardPorts = [{
@@ -134,7 +134,7 @@ pkgs.testers.runNixOSTest {
     node1.succeed('touch /run/foo')
     old_machine_id = node1.succeed("cat /etc/machine-id").strip()
     node1.fail('parted --version >&2')
-    node1.succeed('tar -xf ${kexecTarball}/nixos-kexec-installer-noninteractive-${pkgs.system}.tar.gz -C /root')
+    node1.succeed('tar -xf ${kexecInstallerTarball}/nixos-kexec-installer-noninteractive-${pkgs.system}.tar.gz -C /root')
     node1.succeed('/root/kexec/ip -V >&2')
     node1.succeed('/root/kexec/kexec --version >&2')
     # test with dash here to make sure we don't introduce bashisms