diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2021-02-01 20:23:03 -0500 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2021-02-01 20:23:03 -0500 |
| commit | b67341749300331f587ef72f8aacb1dba4380ef6 (patch) | |
| tree | 7489b454bbe7c62e5b59f7446439f3ebeb1f3447 /pkgs/os-specific/linux/zfs | |
| parent | 459cbf1b30eff85e2795a55106412082e3f72e09 (diff) | |
| download | nixpkgs-b67341749300331f587ef72f8aacb1dba4380ef6.tar nixpkgs-b67341749300331f587ef72f8aacb1dba4380ef6.tar.gz nixpkgs-b67341749300331f587ef72f8aacb1dba4380ef6.tar.bz2 nixpkgs-b67341749300331f587ef72f8aacb1dba4380ef6.tar.lz nixpkgs-b67341749300331f587ef72f8aacb1dba4380ef6.tar.xz nixpkgs-b67341749300331f587ef72f8aacb1dba4380ef6.tar.zst nixpkgs-b67341749300331f587ef72f8aacb1dba4380ef6.zip | |
Revert "zfs: 2.0.1 -> 2.0.2"
This reverts commit e347e96601032ac64baf0bc7b482697ea9b5a119.
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index d8729fbe165..d61c0931e20 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , autoreconfHook269, util-linux, nukeReferences, coreutils , perl, buildPackages , configFile ? "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 ? [] @@ -186,9 +192,11 @@ 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 { @@ -196,8 +204,10 @@ in { # 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 ]; }; } |