cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #291547 from alyssais/zfs-linux-6.6-aarch64

Browse source 
zfs: update latestCompatibleLinuxPackages
This commit is contained in:
Adam C. Stephens 2024-02-26 21:45:20 -05:00 committed by GitHub
commit 3a3f30d6b9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/tasks/filesystems/zfs.nix
View file

@ -588,7 +588,9 @@ in
kernelParams = lib.optionals (!config.boot.zfs.allowHibernation) [ "nohibernate" ]; kernelParams = lib.optionals (!config.boot.zfs.allowHibernation) [ "nohibernate" ];
extraModulePackages = [ extraModulePackages = [
(cfgZfs.modulePackage.override { inherit (cfgZfs) removeLinuxDRM; }) (cfgZfs.modulePackage.override
(lib.optionalAttrs (lib.versionOlder cfgZfs.package.version "2.2.3")
{ inherit (cfgZfs) removeLinuxDRM; }))
]; ];
}; };
@ -731,7 +733,7 @@ in
# this symbol. # this symbol.
# In the meantime, we restore what was once a working piece of code # In the meantime, we restore what was once a working piece of code
# in the kernel. # in the kernel.
boot.kernelPatches = lib.optional (cfgZfs.removeLinuxDRM && pkgs.stdenv.hostPlatform.system == "aarch64-linux") { boot.kernelPatches = lib.optional (lib.versionOlder cfgZfs.package.version "2.2.3" && cfgZfs.removeLinuxDRM && pkgs.stdenv.hostPlatform.system == "aarch64-linux") {
name = "export-neon-symbols-as-gpl"; name = "export-neon-symbols-as-gpl";
patch = pkgs.fetchpatch { patch = pkgs.fetchpatch {
url = "https://github.com/torvalds/linux/commit/aaeca98456431a8d9382ecf48ac4843e252c07b3.patch"; url = "https://github.com/torvalds/linux/commit/aaeca98456431a8d9382ecf48ac4843e252c07b3.patch";

10
pkgs/os-specific/linux/zfs/stable.nix
View file

@ -2,7 +2,6 @@
, kernel ? null , kernel ? null
, stdenv , stdenv
, linuxKernel , linuxKernel
, removeLinuxDRM ? false
, nixosTests , nixosTests
, ... , ...
} @ args: } @ args:
@ -15,14 +14,9 @@ callPackage ./generic.nix args {
# this attribute is the correct one for this package. # this attribute is the correct one for this package.
kernelModuleAttribute = "zfs"; kernelModuleAttribute = "zfs";
# check the release notes for compatible kernels # check the release notes for compatible kernels
kernelCompatible = kernelCompatible = kernel.kernelOlder "6.8";
if stdenv'.isx86_64 || removeLinuxDRM
then kernel.kernelOlder "6.8"
else kernel.kernelOlder "6.2";
latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_7;
then linuxKernel.packages.linux_6_7
else linuxKernel.packages.linux_6_1;
# this package should point to the latest release. # this package should point to the latest release.
version = "2.2.3"; version = "2.2.3";

10
pkgs/os-specific/linux/zfs/unstable.nix
View file

@ -2,7 +2,6 @@
, kernel ? null , kernel ? null
, stdenv , stdenv
, linuxKernel , linuxKernel
, removeLinuxDRM ? false
, nixosTests , nixosTests
, ... , ...
} @ args: } @ args:
@ -15,14 +14,9 @@ callPackage ./generic.nix args {
# this attribute is the correct one for this package. # this attribute is the correct one for this package.
kernelModuleAttribute = "zfsUnstable"; kernelModuleAttribute = "zfsUnstable";
# check the release notes for compatible kernels # check the release notes for compatible kernels
kernelCompatible = kernelCompatible = kernel.kernelOlder "6.9";
if stdenv'.isx86_64 || removeLinuxDRM
then kernel.kernelOlder "6.9"
else kernel.kernelOlder "6.2";
latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_7;
then linuxKernel.packages.linux_6_7
else linuxKernel.packages.linux_6_1;
# this package should point to a version / git revision compatible with the latest kernel release # this package should point to a version / git revision compatible with the latest kernel release
# IMPORTANT: Always use a tagged release candidate or commits from the # IMPORTANT: Always use a tagged release candidate or commits from the