nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-06-05 21:03:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

zfs_2_3: 2.3.6 -> 2.3.7

Browse Source 
The patch already applied on zfs_2_4 also needs to be applied here.
This commit is contained in:
Andrew Marshall
2026-05-13 22:25:37 +00:00
parent 3b30957189
commit 5a71c7cdef
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/zfs/2_3.nix
View File

@@ -13,10 +13,10 @@ callPackage ./generic.nix args {
kernelModuleAttribute = "zfs_2_3";
kernelMinSupportedMajorMinor = "4.18";
kernelMaxSupportedMajorMinor = "6.19";
kernelMaxSupportedMajorMinor = "7.0";
# this package should point to the latest release.
version = "2.3.6";
version = "2.3.7";
tests = {
inherit (nixosTests.zfs) series_2_3;
@@ -30,5 +30,5 @@ callPackage ./generic.nix args {
amarshall
];
hash = "sha256-5p9UbOQ0WY+XeAO+btDyJ04nRnOQuEuwszduEV7cbso=";
hash = "sha256-67Yo5bAJP3dXC94xybrC4xhwz7pGtrp0MUT9P6OInog=";
}

11
pkgs/os-specific/linux/zfs/generic.nix
View File

@@ -102,13 +102,10 @@ let
patches =
extraPatches
++
lib.optional
(kernel != null && lib.versionAtLeast version "2.4" && lib.versionOlder kernel.version "5.14")
(fetchpatch2 {
url = "https://github.com/openzfs/zfs/commit/58c8dc5f6926eb96903a3f38b141e8998ef9261b.patch?full_index=1";
hash = "sha256-eYkMhHsHBA9MKXnB/GuHpuv44g1SCGV5Or0InPBeNkU=";
});
++ lib.optional (kernel != null && lib.versionOlder kernel.version "5.14") (fetchpatch2 {
url = "https://github.com/openzfs/zfs/commit/58c8dc5f6926eb96903a3f38b141e8998ef9261b.patch?full_index=1";
hash = "sha256-eYkMhHsHBA9MKXnB/GuHpuv44g1SCGV5Or0InPBeNkU=";
});
postPatch =
optionalString buildKernel ''