emily/nixos-images
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

upgrade zfs on aarch64

Browse source
This commit is contained in:
Jörg Thalheim 2023-12-12 11:10:33 +01:00
parent d655cc02fc
commit db63ed890f
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nix/installer.nix
View file

@ -3,7 +3,10 @@
system.stateVersion = config.system.nixos.version; system.stateVersion = config.system.nixos.version;
# use latest kernel we can support to get more hardware support # use latest kernel we can support to get more hardware support
boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; boot.kernelPackages = lib.mkDefault (pkgs.zfs.override {
removeLinuxDRM = pkgs.hostPlatform.isAarch64;
}).latestCompatibleLinuxPackages;
boot.zfs.removeLinuxDRM = lib.mkDefault pkgs.hostPlatform.isAarch64;
# IPMI SOL console redirection stuff # IPMI SOL console redirection stuff
boot.kernelParams = boot.kernelParams =

13
nix/noninteractive.nix
View file

@ -50,9 +50,20 @@
"dm-raid" "dm-raid"
]; ];
extraModulePackages = [ extraModulePackages = [
config.boot.kernelPackages.zfs (config.boot.kernelPackages.zfs.override {
inherit (config.boot.zfs) removeLinuxDRM;
})
]; ];
}; };
boot.kernelPatches = lib.optional (config.boot.zfs.removeLinuxDRM && pkgs.stdenv.hostPlatform.system == "aarch64-linux") {
name = "export-neon-symbols-as-gpl";
patch = pkgs.fetchpatch {
url = "https://github.com/torvalds/linux/commit/aaeca98456431a8d9382ecf48ac4843e252c07b3.patch";
hash = "sha256-L2g4G1tlWPIi/QRckMuHDcdWBcKpObSWSRTvbHRIwIk=";
revert = true;
};
};
networking.hostId = lib.mkDefault "8425e349"; networking.hostId = lib.mkDefault "8425e349";
} }