movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 19:13:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos/lib/make-*-disk-zfs-image: fix build

Browse source 
Those two helpers have not received the memo about a new requirement for
virtiofs and about changes regarding the zfs related attributes.

Can be tested with nix/release.nix' amazonImageZfs.
This commit is contained in:
Wolfgang Walther 2025-02-02 20:12:49 +01:00
parent a6dbc4b689
commit d16aa077d2
No known key found for this signature in database
GPG key ID: B39893FA5F65CAE1
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
nixos/lib/make-multi-disk-zfs-image.nix
View file

@ -123,10 +123,10 @@ let
}; };
modulesTree = pkgs.aggregateModules ( modulesTree = pkgs.aggregateModules (
with config.boot.kernelPackages; with config.boot;
[ [
kernel kernelPackages.kernel
zfs kernelPackages.${pkgs.zfs.kernelModuleAttribute}
] ]
); );
@ -254,11 +254,12 @@ let
image = image =
(pkgs.vmTools.override { (pkgs.vmTools.override {
rootModules = [ rootModules = [
"zfs"
"9p" "9p"
"9pnet_virtio" "9pnet_virtio"
"virtio_pci"
"virtio_blk" "virtio_blk"
"virtio_pci"
"virtiofs"
"zfs"
]; ];
kernel = modulesTree; kernel = modulesTree;
}).runInLinuxVM }).runInLinuxVM

11
nixos/lib/make-single-disk-zfs-image.nix
View file

@ -111,10 +111,10 @@ let
}; };
modulesTree = pkgs.aggregateModules ( modulesTree = pkgs.aggregateModules (
with config.boot.kernelPackages; with config.boot;
[ [
kernel kernelPackages.kernel
zfs kernelPackages.${pkgs.zfs.kernelModuleAttribute}
] ]
); );
@ -242,11 +242,12 @@ let
image = image =
(pkgs.vmTools.override { (pkgs.vmTools.override {
rootModules = [ rootModules = [
"zfs"
"9p" "9p"
"9pnet_virtio" "9pnet_virtio"
"virtio_pci"
"virtio_blk" "virtio_blk"
"virtio_pci"
"virtiofs"
"zfs"
]; ];
kernel = modulesTree; kernel = modulesTree;
}).runInLinuxVM }).runInLinuxVM