Switch to NixPkgs 24.05, eliminate separate OVMF NixPkgs input

AshleyYakeley · Sep 29, 2024 · 1d5c17c · 1d5c17c
1 parent 770edc5
commit 1d5c17c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## [UNRELEASED]
 
+* Switch to NixPkgs 24.05, eliminate separate OVMF NixPkgs input
 * Modules:
     * Improve change detection for domain restarts.
     * Add per-object "restart" option to control restarts.

diff --git a/checks/checks.nix b/checks/checks.nix
@@ -8,9 +8,6 @@ let
           writeTextFile = stuff.packages.writeTextFile;
           runCommand = name: args: script: "BUILD " + name;
           qemu = "QEMU_PATH";
-        };
-      packages-ovmf =
-        {
           OVMFFull.fd = "OVMFFull_FD_PATH";
         };
     };
@@ -47,8 +44,8 @@ in
   ovmf-secboot =
     stuff.packages.runCommand "ovmf-secboot" { }
       ''
-        test -f ${stuff.packages-ovmf.OVMFFull.fd}/FV/OVMF_CODE.ms.fd
-        test -f ${stuff.packages-ovmf.OVMFFull.fd}/FV/OVMF_VARS.ms.fd
+        test -f ${stuff.packages.OVMFFull.fd}/FV/OVMF_CODE.ms.fd
+        test -f ${stuff.packages.OVMFFull.fd}/FV/OVMF_VARS.ms.fd
         echo "pass" > $out
       '';
 }
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -8,22 +8,13 @@
           type = "github";
           owner = "NixOS";
           repo = "nixpkgs";
-          ref = "nixos-23.11";
-        };
-
-      nixpkgs-ovmf =
-        {
-          type = "github";
-          owner = "NixOS";
-          repo = "nixpkgs";
-          ref = "nixos-unstable";
+          ref = "nixos-24.05";
         };
     };
 
-  outputs = { self, nixpkgs, nixpkgs-ovmf }:
+  outputs = { self, nixpkgs }:
     let
       packages = import nixpkgs { system = "x86_64-linux"; };
-      packages-ovmf = import nixpkgs-ovmf { system = "x86_64-linux"; };
 
       nixvirtPythonModulePackage = packages.runCommand "nixvirtPythonModulePackage" { }
         ''
@@ -52,7 +43,7 @@
 
       modules = import ./modules.nix { inherit packages moduleHelperFile; };
 
-      stuff = { inherit packages packages-ovmf; };
+      stuff = { inherit packages; };
     in
     {
       lib = mklib stuff;

diff --git a/templates/domain/windows.nix b/templates/domain/windows.nix
@@ -1,6 +1,6 @@
 # https://www.microsoft.com/en-us/windows/windows-11-specifications
 # https://sysguides.com/install-a-windows-11-virtual-machine-on-kvm
-stuff@{ packages, packages-ovmf, guest-install, ... }:
+stuff@{ packages, guest-install, ... }:
 { name
 , uuid
 , memory ? { count = 4; unit = "GiB"; }
@@ -29,11 +29,11 @@ base //
       {
         readonly = true;
         type = "pflash";
-        path = "${packages-ovmf.OVMFFull.fd}/FV/OVMF_CODE.ms.fd";
+        path = "${packages.OVMFFull.fd}/FV/OVMF_CODE.ms.fd";
       };
     nvram =
       {
-        template = "${packages-ovmf.OVMFFull.fd}/FV/OVMF_VARS.ms.fd";
+        template = "${packages.OVMFFull.fd}/FV/OVMF_VARS.ms.fd";
         path = nvram_path;
       };
   };