diff options
| author | Henri Menke <henri@henrimenke.de> | 2021-02-12 16:21:43 +0100 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-02-14 19:41:22 -0800 |
| commit | 3f0e6e1daaa071b38121029c12de7c260286d719 (patch) | |
| tree | ab26986ec510bd6809bc7471e373d87502cfe238 /pkgs/os-specific/linux/zfs | |
| parent | 6ffbd1ea07265d4aa5c63175ca1fed344fc97baa (diff) | |
| download | nixpkgs-3f0e6e1daaa071b38121029c12de7c260286d719.tar nixpkgs-3f0e6e1daaa071b38121029c12de7c260286d719.tar.gz nixpkgs-3f0e6e1daaa071b38121029c12de7c260286d719.tar.bz2 nixpkgs-3f0e6e1daaa071b38121029c12de7c260286d719.tar.lz nixpkgs-3f0e6e1daaa071b38121029c12de7c260286d719.tar.xz nixpkgs-3f0e6e1daaa071b38121029c12de7c260286d719.tar.zst nixpkgs-3f0e6e1daaa071b38121029c12de7c260286d719.zip | |
zfs: 2.0.2 -> 2.0.3
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 202dc9091fd..7300ae32546 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -28,7 +28,7 @@ let , extraPatches ? [] , rev ? "zfs-${version}" , isUnstable ? false - , incompatibleKernelVersion ? null }: + , kernelCompatible ? null }: stdenv.mkDerivation { name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; @@ -183,7 +183,7 @@ let platforms = platforms.linux; maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ]; broken = if - buildKernel && (incompatibleKernelVersion != null) && versionAtLeast kernel.version incompatibleKernelVersion + buildKernel && (kernelCompatible != null) && !kernelCompatible then builtins.trace '' Linux v${kernel.version} is not yet supported by zfsonlinux v${version}. ${lib.optionalString (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."} @@ -196,22 +196,22 @@ in { # ./nixos/modules/tasks/filesystems/zfs.nix needs # to be adapted zfsStable = common { - # comment/uncomment if breaking kernel versions are known - # incompatibleKernelVersion = "4.20"; + # check the release notes for compatible kernels + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.11"; # this package should point to the latest release. - version = "2.0.2"; + version = "2.0.3"; - sha256 = "sha256-KzrRQwfQRvIQkHG5mj6cGBdcv2VEhC5y7bi09DaKqhY="; + sha256 = "sha256-bai7SwJNOsrACcrUxZ4339REhbBPOWyYikHzgHfbONs="; }; zfsUnstable = common { - # comment/uncomment if breaking kernel versions are known - # incompatibleKernelVersion = "4.19"; + # check the release notes for compatible kernels + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.11"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.0.2"; + version = "2.0.3"; - sha256 = "sha256-KzrRQwfQRvIQkHG5mj6cGBdcv2VEhC5y7bi09DaKqhY="; + sha256 = "sha256-bai7SwJNOsrACcrUxZ4339REhbBPOWyYikHzgHfbONs="; }; } |