b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

zfs: 2.0.2 -> 2.0.3

Browse source
This commit is contained in:
Henri Menke 2021-02-12 16:21:43 +01:00 committed by Jonathan Ringer
parent 6ffbd1ea07
commit 3f0e6e1daa
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/os-specific/linux/zfs/default.nix
View file

@ -28,7 +28,7 @@ let
, extraPatches ? [] , extraPatches ? []
, rev ? "zfs-${version}" , rev ? "zfs-${version}"
, isUnstable ? false , isUnstable ? false
, incompatibleKernelVersion ? null }: , kernelCompatible ? null }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
@ -183,7 +183,7 @@ let
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ]; maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ];
broken = if broken = if
buildKernel && (incompatibleKernelVersion != null) && versionAtLeast kernel.version incompatibleKernelVersion buildKernel && (kernelCompatible != null) && !kernelCompatible
then builtins.trace '' then builtins.trace ''
Linux v${kernel.version} is not yet supported by zfsonlinux v${version}. 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."} ${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 # ./nixos/modules/tasks/filesystems/zfs.nix needs
# to be adapted # to be adapted
zfsStable = common { zfsStable = common {
# comment/uncomment if breaking kernel versions are known # check the release notes for compatible kernels
# incompatibleKernelVersion = "4.20"; kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.11";
# this package should point to the latest release. # this package should point to the latest release.
version = "2.0.2"; version = "2.0.3";
sha256 = "sha256-KzrRQwfQRvIQkHG5mj6cGBdcv2VEhC5y7bi09DaKqhY="; sha256 = "sha256-bai7SwJNOsrACcrUxZ4339REhbBPOWyYikHzgHfbONs=";
}; };
zfsUnstable = common { zfsUnstable = common {
# comment/uncomment if breaking kernel versions are known # check the release notes for compatible kernels
# incompatibleKernelVersion = "4.19"; kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.11";
# 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
version = "2.0.2"; version = "2.0.3";
sha256 = "sha256-KzrRQwfQRvIQkHG5mj6cGBdcv2VEhC5y7bi09DaKqhY="; sha256 = "sha256-bai7SwJNOsrACcrUxZ4339REhbBPOWyYikHzgHfbONs=";
}; };
} }