diff options
| author | Adam Stephens <adam@valkor.net> | 2023-11-30 19:26:44 -0500 |
|---|---|---|
| committer | Adam Stephens <adam@valkor.net> | 2023-11-30 19:35:04 -0500 |
| commit | d3b5271dc92f97a35c77d2caaedb61e38095da58 (patch) | |
| tree | 44570e5a7531f11ef693b2d12504f5f27e95ec34 /pkgs/os-specific/linux/zfs/2_1.nix | |
| parent | c3fa6659dd6a01c32f9a0c8430e9a6d1c316e9dd (diff) | |
zfs_2_1: 2.1.13 -> 2.1.14
Diffstat (limited to 'pkgs/os-specific/linux/zfs/2_1.nix')
| -rw-r--r-- | pkgs/os-specific/linux/zfs/2_1.nix | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/os-specific/linux/zfs/2_1.nix b/pkgs/os-specific/linux/zfs/2_1.nix index 737a52fcc4ff4..4642bc20f6fcc 100644 --- a/pkgs/os-specific/linux/zfs/2_1.nix +++ b/pkgs/os-specific/linux/zfs/2_1.nix @@ -5,7 +5,6 @@ , removeLinuxDRM ? false , lib , nixosTests -, fetchpatch , ... } @ args: @@ -28,18 +27,9 @@ callPackage ./generic.nix args { # This is a fixed version to the 2.1.x series, move only # if the 2.1.x series moves. - version = "2.1.13"; + version = "2.1.14"; - extraPatches = [ - (fetchpatch { - # https://github.com/openzfs/zfs/pull/15571 - # Remove when it's backported to 2.1.x. - url = "https://github.com/robn/zfs/commit/617c990a4cf1157b0f8332f35672846ad16ca70a.patch"; - hash = "sha256-j5YSrud7BaWk2npBl31qwFFLYltbut3CUjI1cjZOpag="; - }) - ]; - - hash = "sha256-tqUCn/Hf/eEmyWRQthWQdmTJK2sDspnHiiEfn9rz2Kc="; + hash = "sha256-RVAoZbV9yclGuN+D37SB6UCRFbbLEpBoyrQOQCVsQwE="; tests = [ nixosTests.zfs.series_2_1 |