diff options
| author | Andrew Marshall <andrew@johnandrewmarshall.com> | 2024-05-02 17:53:18 -0400 |
|---|---|---|
| committer | Morgan Jones <me@numin.it> | 2024-05-12 18:00:19 -0700 |
| commit | 8bc38074951cfc642f4ff0b8b77998a5eb07bd8f (patch) | |
| tree | 89a314d2632a7689c4db8b3404afa9755b28f39a | |
| parent | 9231b3f2802d0f53eb2a8e805febb83053650c15 (diff) | |
zfs_2_2: 2.2.3 -> 2.2.4
Now compatible with Linux 6.8. https://github.com/openzfs/zfs/releases/tag/zfs-2.2.4 Need to patch py-libzfs to support incompatible API change. (cherry picked from commit a1dcb54257af49396329dc8467a465b21d7746b9)
| -rw-r--r-- | pkgs/development/python-modules/py-libzfs/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/zfs/stable.nix | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/py-libzfs/default.nix b/pkgs/development/python-modules/py-libzfs/default.nix index d148e539d3fff..941315f1c3543 100644 --- a/pkgs/development/python-modules/py-libzfs/default.nix +++ b/pkgs/development/python-modules/py-libzfs/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , cython +, fetchpatch2 , zfs }: @@ -17,6 +18,13 @@ buildPythonPackage rec { hash = "sha256-vBLbjP1gQEQNsTLc2W6uRzCFHQXZp+jGiwE0Pe8VTuw="; }; + patches = [ + (fetchpatch2 { + url = "https://github.com/truenas/py-libzfs/commit/b5ffe1f1d6097df6e2f5cc6dd3c968872ec60804.patch"; + hash = "sha256-6r5hQ/o7c4vq4Tfh0l1WbeK3AuPvi+1wzkwkIn1qEes="; + }) + ]; + nativeBuildInputs = [ cython ]; buildInputs = [ zfs ]; diff --git a/pkgs/os-specific/linux/zfs/stable.nix b/pkgs/os-specific/linux/zfs/stable.nix index 5b5084511a51a..171dceb459562 100644 --- a/pkgs/os-specific/linux/zfs/stable.nix +++ b/pkgs/os-specific/linux/zfs/stable.nix @@ -14,17 +14,17 @@ callPackage ./generic.nix args { # this attribute is the correct one for this package. kernelModuleAttribute = "zfs"; # check the release notes for compatible kernels - kernelCompatible = kernel.kernelOlder "6.8"; + kernelCompatible = kernel.kernelOlder "6.9"; - latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_6; + latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_8; # this package should point to the latest release. - version = "2.2.3"; + version = "2.2.4"; tests = [ nixosTests.zfs.installer nixosTests.zfs.stable ]; - hash = "sha256-Bzkow15OitUUQ+mTYhCXgTrQl+ao/B4feleHY/rSSjg="; + hash = "sha256-SSp/1Tu1iGx5UDcG4j0k2fnYxK05cdE8gzfSn8DU5Z4="; } |