From d71601e35916f388533eccff94d0b5e7d3121b48 Mon Sep 17 00:00:00 2001 From: Alex Lov Date: Mon, 6 Jul 2026 07:19:06 +0000 Subject: [PATCH 1/2] make-disk-image: Fix overriding kernel modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After [#530764](https://github.com/NixOS/nixpkgs/pull/530764) PR kernel modules should be passed as `kernelModules` instead of `kernel`. Fixes error: ``` … while evaluating definitions from `/nix/store/1c1jbpjisa2249vrffd97vmjdflbcprx-source/lib/make-disk-image.nix': (stack trace truncated; use '--show-trace' to show the full, detailed trace) error: vmTools: the `kernel` argument (kernel-modules) has no `target` attribute, so the kernel image filename cannot be determined. If you are passing a module tree (e.g. from `pkgs.aggregateModules`) to make extra modules available, pass it via `kernelModules` instead and keep `kernel` pointing at a real kernel derivation. Alternatively, pass `kernelImage` explicitly with the path of the bootable image relative to the `kernel` derivation output (e.g. "bzImage" or "Image"). ``` This should also fixes tests in [#1273](https://github.com/nix-community/disko/pull/1273) PR --- flake.lock | 6 +++--- lib/make-disk-image.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 76645580..d38172bc 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1780930886, - "narHash": "sha256-rppURzHviaQN131F+nLiLdGfcb0uCd9gGP0E5+iw9MI=", + "lastModified": 1783279667, + "narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8c3cede7ddc26bd659d2d383b5610efbd2c7a16e", + "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b", "type": "github" }, "original": { diff --git a/lib/make-disk-image.nix b/lib/make-disk-image.nix index 9849b687..8ff94f0b 100644 --- a/lib/make-disk-image.nix +++ b/lib/make-disk-image.nix @@ -41,7 +41,7 @@ let ] ++ (lib.optional configSupportsZfs "zfs") ++ cfg.extraRootModules; - kernel = pkgs.aggregateModules ( + kernelModules = pkgs.aggregateModules ( [ cfg.kernelPackages.kernel ] From 6747342da148f6cb28c8405a70fe00455a0ba027 Mon Sep 17 00:00:00 2001 From: Alex Lov Date: Thu, 9 Jul 2026 20:20:14 +0300 Subject: [PATCH 2/2] Update lib/make-disk-image.nix Co-authored-by: Diffumist --- lib/make-disk-image.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/make-disk-image.nix b/lib/make-disk-image.nix index 8ff94f0b..8a5c6ed7 100644 --- a/lib/make-disk-image.nix +++ b/lib/make-disk-image.nix @@ -41,6 +41,7 @@ let ] ++ (lib.optional configSupportsZfs "zfs") ++ cfg.extraRootModules; + kernel = cfg.kernelPackages.kernel; kernelModules = pkgs.aggregateModules ( [ cfg.kernelPackages.kernel