diff options
| author | Henri Menke <henri@henrimenke.de> | 2021-02-01 20:26:29 +0100 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-02-03 11:18:48 -0800 |
| commit | bde2fffbbe031c245000d33a8567ba6b90d17129 (patch) | |
| tree | d90934f8364d85f45df46dfbde592ad282fc8ad6 /pkgs/os-specific/linux/zfs | |
| parent | 519c4f172741d6fcdfc526edb0e70b2c9bb3ef61 (diff) | |
| download | nixpkgs-bde2fffbbe031c245000d33a8567ba6b90d17129.tar nixpkgs-bde2fffbbe031c245000d33a8567ba6b90d17129.tar.gz nixpkgs-bde2fffbbe031c245000d33a8567ba6b90d17129.tar.bz2 nixpkgs-bde2fffbbe031c245000d33a8567ba6b90d17129.tar.lz nixpkgs-bde2fffbbe031c245000d33a8567ba6b90d17129.tar.xz nixpkgs-bde2fffbbe031c245000d33a8567ba6b90d17129.tar.zst nixpkgs-bde2fffbbe031c245000d33a8567ba6b90d17129.zip | |
zfs: 2.0.1 -> 2.0.2
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index d61c0931e20..d8729fbe165 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchFromGitHub , autoreconfHook269, util-linux, nukeReferences, coreutils , perl, buildPackages , configFile ? "all" @@ -21,12 +21,6 @@ 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 ? [] @@ -192,11 +186,9 @@ in { # incompatibleKernelVersion = "4.20"; # this package should point to the latest release. - version = "2.0.1"; + version = "2.0.2"; - sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d"; - - extraPatches = [ reapplyPathSanitizerPatch ]; + sha256 = "sha256-KzrRQwfQRvIQkHG5mj6cGBdcv2VEhC5y7bi09DaKqhY="; }; zfsUnstable = common { @@ -204,10 +196,8 @@ in { # incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.0.1"; - - sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d"; + version = "2.0.2"; - extraPatches = [ reapplyPathSanitizerPatch ]; + sha256 = "sha256-KzrRQwfQRvIQkHG5mj6cGBdcv2VEhC5y7bi09DaKqhY="; }; } |