summary refs log tree commit diff
path: root/pkgs/os-specific/linux/zfs
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2023-10-02 11:37:32 +0000
committerAlyssa Ross <hi@alyssa.is>2023-10-02 17:27:32 +0000
commitae3682cb17b93d2d3bedf4be439c4a9688760881 (patch)
tree7a05ebd5481cbf413202f5bc443ff8575deb75c5 /pkgs/os-specific/linux/zfs
parent4c969d6925c720369fda56dbab14b708170dab73 (diff)
downloadnixpkgs-ae3682cb17b93d2d3bedf4be439c4a9688760881.tar
nixpkgs-ae3682cb17b93d2d3bedf4be439c4a9688760881.tar.gz
nixpkgs-ae3682cb17b93d2d3bedf4be439c4a9688760881.tar.bz2
nixpkgs-ae3682cb17b93d2d3bedf4be439c4a9688760881.tar.lz
nixpkgs-ae3682cb17b93d2d3bedf4be439c4a9688760881.tar.xz
nixpkgs-ae3682cb17b93d2d3bedf4be439c4a9688760881.tar.zst
nixpkgs-ae3682cb17b93d2d3bedf4be439c4a9688760881.zip
linux_6_4: drop (EOL)
It's still in kernels-org.json, because even if I remove it the update
script will keep putting it back, but nothing references it, and it'll
be removed from that file when kernels are next updated after it's
been delisted from kernel.org.

linux_testing_bcachefs still needs to be updated for >6.4, so for now
I've just inlined the Linux 6.4 definition in linux_testing_bcachefs's
definition.
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
-rw-r--r--pkgs/os-specific/linux/zfs/unstable.nix4
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix
index 592d94b0030..45b7dd6c747 100644
--- a/pkgs/os-specific/linux/zfs/unstable.nix
+++ b/pkgs/os-specific/linux/zfs/unstable.nix
@@ -15,9 +15,7 @@ callPackage ./generic.nix args {
     then kernel.kernelOlder "6.5"
     else kernel.kernelOlder "6.2";
 
-  latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM
-  then linuxKernel.packages.linux_6_4
-  else linuxKernel.packages.linux_6_1;
+  latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_1;
 
   # 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