colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #150923 from amarshall/zfs-2.1.2

Browse Source 
zfs: 2.1.1 → 2.1.2
This commit is contained in:
Franz Pletz 2021-12-17 13:23:14 +01:00 committed by GitHub
commit 318c9f8860
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -16,7 +16,7 @@
, enablePython ? true
# for determining the latest compatible linuxPackages
, linuxPackages_5_10 ? pkgs.linuxKernel.packages.linux_5_10
, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15
}:
with lib;
@ -46,7 +46,7 @@ let
name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
src = fetchFromGitHub {
owner = "zfsonlinux";
owner = "openzfs";
repo = "zfs";
inherit rev sha256;
};
@ -215,28 +215,28 @@ in {
# to be adapted
zfsStable = common {
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15";
latestCompatibleLinuxPackages = linuxPackages_5_10;
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.16";
latestCompatibleLinuxPackages = linuxPackages_5_15;
# this package should point to the latest release.
version = "2.1.1";
version = "2.1.2";
sha256 = "sha256-UUuJa5w/GsEvsgH/BnXFsP/dsOt9wwmPqKzDxLPrhiY=";
sha256 = "sha256-7oSFZlmjCr+egImIVf429GrFOKn3L3r4SMnK3LHHmL8=";
};
zfsUnstable = common {
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15";
latestCompatibleLinuxPackages = linuxPackages_5_10;
kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.16";
latestCompatibleLinuxPackages = linuxPackages_5_15;
# 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
# zfs-<version>-staging branch, because this is tested by the OpenZFS
# maintainers.
version = "2.1.1";
version = "2.1.2";
# rev = "0000000000000000000000000000000000000000";
sha256 = "sha256-UUuJa5w/GsEvsgH/BnXFsP/dsOt9wwmPqKzDxLPrhiY=";
sha256 = "sha256-7oSFZlmjCr+egImIVf429GrFOKn3L3r4SMnK3LHHmL8=";
isUnstable = true;
};