diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-07-28 18:01:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-28 18:01:52 +0000 |
| commit | 039200b6c4f97182b973c9b55cdded6df7c07661 (patch) | |
| tree | 9cf279c8a76bf6524a3012a04114541870f164df /pkgs/os-specific/linux/zfs/unstable.nix | |
| parent | 70b27286364d6f03f2e4bcb030e51e92676a9451 (diff) | |
| parent | 3460ec6a31b730cd630335a683790c93095962f8 (diff) | |
| download | nixpkgs-039200b6c4f97182b973c9b55cdded6df7c07661.tar nixpkgs-039200b6c4f97182b973c9b55cdded6df7c07661.tar.gz nixpkgs-039200b6c4f97182b973c9b55cdded6df7c07661.tar.bz2 nixpkgs-039200b6c4f97182b973c9b55cdded6df7c07661.tar.lz nixpkgs-039200b6c4f97182b973c9b55cdded6df7c07661.tar.xz nixpkgs-039200b6c4f97182b973c9b55cdded6df7c07661.tar.zst nixpkgs-039200b6c4f97182b973c9b55cdded6df7c07661.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific/linux/zfs/unstable.nix')
| -rw-r--r-- | pkgs/os-specific/linux/zfs/unstable.nix | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index f262f77970b..832eb66c02e 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -11,17 +11,11 @@ let in callPackage ./generic.nix args { # check the release notes for compatible kernels - # NOTE: - # zfs-2.1.9<=x<=2.1.10 is broken with aarch64-linux-6.2 - # for future releases, please delete this condition. kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM then kernel.kernelOlder "6.4" else kernel.kernelOlder "6.2"; - latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM then - linuxKernel.packages.linux_6_3 - 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 |