git.iko.soy/typeable/nixpkgs
on master help sign in
Revert "zfs: 2.0.1 -> 2.0.2"

This reverts commit e347e96601032ac64baf0bc7b482697ea9b5a119.

commitb67341749300331f587ef72f8aacb1dba4380ef6 authorTim Steinbach <tim@nequissimus.com> dateMon 1 Feb 2021, 20:23 (6 years ago) parent459cbf1
1 file changed+15−5
pkgs/os-specific/linux/zfs/default.nix+15−5
pkgs/os-specific/linux/zfs/default.nix+15−5
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub
1+{ lib, stdenv, fetchFromGitHub, fetchpatch
22, autoreconfHook269, util-linux, nukeReferences, coreutils
33, perl, buildPackages
44, configFile ? "all"
@@ -21,6 +21,12 @@ let
2121 buildKernel = any (n: n == configFile) [ "kernel" "all" ];
2222 buildUser = any (n: n == configFile) [ "user" "all" ];
2323
24+ # remove this patch at the next ZFS release (> 2.0.1)
25+ reapplyPathSanitizerPatch = fetchpatch {
26+ url = "https://github.com/openzfs/zfs/commit/03f036cbccdd8699f5fe8540ef317595a35bceb8.patch";
27+ sha256 = "c157bbb6551a4e720c3faba005e1b72e4692d304c6ff5e0e685691bd47197dca";
28+ };
29+
2430 common = { version
2531 , sha256
2632 , extraPatches ? []
@@ -186,9 +192,11 @@ in {
186192 # incompatibleKernelVersion = "4.20";
187193
188194 # this package should point to the latest release.
189− version = "2.0.2";
195+ version = "2.0.1";
190196
191− sha256 = "sha256-KzrRQwfQRvIQkHG5mj6cGBdcv2VEhC5y7bi09DaKqhY=";
197+ sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d";
198+
199+ extraPatches = [ reapplyPathSanitizerPatch ];
192200 };
193201
194202 zfsUnstable = common {
@@ -196,8 +204,10 @@ in {
196204 # incompatibleKernelVersion = "4.19";
197205
198206 # this package should point to a version / git revision compatible with the latest kernel release
199− version = "2.0.2";
207+ version = "2.0.1";
208+
209+ sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d";
200210
201− sha256 = "sha256-KzrRQwfQRvIQkHG5mj6cGBdcv2VEhC5y7bi09DaKqhY=";
211+ extraPatches = [ reapplyPathSanitizerPatch ];
202212 };
203213}