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

Revert "zfs: 2.0.1 -> 2.0.2"

Browse Source 
This reverts commit e347e96601032ac64baf0bc7b482697ea9b5a119.
This commit is contained in:
Tim Steinbach 2021-02-01 20:23:03 -05:00
parent 459cbf1b30
commit b673417493
No known key found for this signature in database
GPG Key ID: 1B40229F19262402
1 changed files with 15 additions and 5 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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub, fetchpatch
, autoreconfHook269, util-linux, nukeReferences, coreutils , autoreconfHook269, util-linux, nukeReferences, coreutils
, perl, buildPackages , perl, buildPackages
, configFile ? "all" , configFile ? "all"
@ -21,6 +21,12 @@ let
buildKernel = any (n: n == configFile) [ "kernel" "all" ]; buildKernel = any (n: n == configFile) [ "kernel" "all" ];
buildUser = any (n: n == configFile) [ "user" "all" ]; buildUser = any (n: n == configFile) [ "user" "all" ];
# remove this patch at the next ZFS release (> 2.0.1)
reapplyPathSanitizerPatch = fetchpatch {
url = "https://github.com/openzfs/zfs/commit/03f036cbccdd8699f5fe8540ef317595a35bceb8.patch";
sha256 = "c157bbb6551a4e720c3faba005e1b72e4692d304c6ff5e0e685691bd47197dca";
};
common = { version common = { version
, sha256 , sha256
, extraPatches ? [] , extraPatches ? []
@ -186,9 +192,11 @@ in {
# incompatibleKernelVersion = "4.20"; # incompatibleKernelVersion = "4.20";
# this package should point to the latest release. # this package should point to the latest release.
version = "2.0.2"; version = "2.0.1";
sha256 = "sha256-KzrRQwfQRvIQkHG5mj6cGBdcv2VEhC5y7bi09DaKqhY="; sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d";
extraPatches = [ reapplyPathSanitizerPatch ];
}; };
zfsUnstable = common { zfsUnstable = common {
@ -196,8 +204,10 @@ in {
# incompatibleKernelVersion = "4.19"; # incompatibleKernelVersion = "4.19";
# 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.1";
sha256 = "sha256-KzrRQwfQRvIQkHG5mj6cGBdcv2VEhC5y7bi09DaKqhY="; sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d";
extraPatches = [ reapplyPathSanitizerPatch ];
}; };
} }