Skip to content

Commit

Permalink
Revert "zfs: 2.0.1 -> 2.0.2"
Browse files Browse the repository at this point in the history
This reverts commit 1739e92.
  • Loading branch information
NeQuissimus committed Feb 2, 2021
1 parent 7d0ff33 commit abe7f45
Showing 1 changed file with 15 additions and 5 deletions.
20 changes: 15 additions & 5 deletions pkgs/os-specific/linux/zfs/default.nix
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub
{ lib, stdenv, fetchFromGitHub, fetchpatch
, autoreconfHook, utillinux, nukeReferences, coreutils
, perl, buildPackages
, configFile ? "all"
Expand All @@ -21,6 +21,12 @@ let
buildKernel = any (n: n == configFile) [ "kernel" "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
, sha256
, extraPatches ? []
Expand Down Expand Up @@ -186,19 +192,23 @@ in {
# incompatibleKernelVersion = "4.20";

# 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 {
# comment/uncomment if breaking kernel versions are known
# incompatibleKernelVersion = "4.19";

# this package should point to a version / git revision compatible with the latest kernel release
version = "2.0.2";
version = "2.0.1";

sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d";

sha256 = "sha256-KzrRQwfQRvIQkHG5mj6cGBdcv2VEhC5y7bi09DaKqhY=";
extraPatches = [ reapplyPathSanitizerPatch ];
};
}

0 comments on commit abe7f45

Please sign in to comment.