From f08d64bbd94431d2e79cca74ed31728b95bb53cb Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 10 Mar 2025 17:33:18 -0400 Subject: [PATCH] zfs_{2_3,unstable}: 2.3.0 -> 2.3.1 Diff: https://github.com/openzfs/zfs/compare/zfs-2.3.0...zfs-2.3.1 Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.3.1 --- pkgs/os-specific/linux/zfs/2_3.nix | 6 +++--- pkgs/os-specific/linux/zfs/unstable.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/2_3.nix b/pkgs/os-specific/linux/zfs/2_3.nix index b39ebc52b0d8..a3d90d68aff7 100644 --- a/pkgs/os-specific/linux/zfs/2_3.nix +++ b/pkgs/os-specific/linux/zfs/2_3.nix @@ -15,10 +15,10 @@ callPackage ./generic.nix args { # this attribute is the correct one for this package. kernelModuleAttribute = "zfs_2_3"; # check the release notes for compatible kernels - kernelCompatible = kernel: kernel.kernelOlder "6.13"; + kernelCompatible = kernel: kernel.kernelOlder "6.14"; # this package should point to the latest release. - version = "2.3.0"; + version = "2.3.1"; tests = { inherit (nixosTests.zfs) installer series_2_3; @@ -29,5 +29,5 @@ callPackage ./generic.nix args { amarshall ]; - hash = "sha256-ZWWrVwMP/DSSIxuXp6GuHCD0wiRekHbRXFGaclqd/ns="; + hash = "sha256-3WrxjIMuPiqBcVX4UZHpcMWNqxBE2NS810SRmvi05ZQ="; } diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index 92bec70aeb8a..ee920dedf580 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -15,20 +15,20 @@ callPackage ./generic.nix args { # this attribute is the correct one for this package. kernelModuleAttribute = "zfs_unstable"; # check the release notes for compatible kernels - kernelCompatible = kernel: kernel.kernelOlder "6.13"; + kernelCompatible = kernel: kernel.kernelOlder "6.14"; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.3.0"; + version = "2.3.1"; # rev = ""; tests = { inherit (nixosTests.zfs) unstable; }; - hash = "sha256-ZWWrVwMP/DSSIxuXp6GuHCD0wiRekHbRXFGaclqd/ns="; + hash = "sha256-3WrxjIMuPiqBcVX4UZHpcMWNqxBE2NS810SRmvi05ZQ="; extraLongDescription = '' This is "unstable" ZFS, and will usually be a pre-release version of ZFS.