From 8b3fa8fb1387a8b0d3c6fb15ec2bce80b290b724 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 7 Jan 2025 09:18:08 +1000 Subject: [PATCH 1/3] zfs_unstable: 2.3.0-rc4 -> 2.3.0-rc5 Diff: https://github.com/openzfs/zfs/compare/zfs-2.3.0-rc4...zfs-2.3.0-rc5 Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.3.0-rc5 (cherry picked from commit 6e2e92113bedd818892226e28b3548769712d780) --- pkgs/os-specific/linux/zfs/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index 849a2ee4473d2..967dcc54c6071 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -21,14 +21,14 @@ callPackage ./generic.nix args { # 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-rc4"; + version = "2.3.0-rc5"; # rev = ""; tests = { inherit (nixosTests.zfs) unstable; }; - hash = "sha256-6O+XQvggyVCZBYpx8/7jbq15tLZsvzmDqp+AtEb9qFU="; + hash = "sha256-gTpj1hYEkx+f/VvvfgeZeqwUhBVQyOIMKic8AaiwYzg="; extraLongDescription = '' This is "unstable" ZFS, and will usually be a pre-release version of ZFS. From a71486cb8e099f1fd341f8d8c28c6154b9f5e8fe Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 13 Jan 2025 20:16:55 -0500 Subject: [PATCH 2/3] zfs_unstable: 2.3.0-rc5 -> 2.3.0 Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.3.0 Diff: https://github.com/openzfs/zfs/compare/zfs-2.3.0-rc5...zfs-2.3.0 (cherry picked from commit 40e0f7233b33aabebc42167a5e16d386a45972c9) --- pkgs/os-specific/linux/zfs/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index 967dcc54c6071..92bec70aeb8a9 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -21,14 +21,14 @@ callPackage ./generic.nix args { # 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-rc5"; + version = "2.3.0"; # rev = ""; tests = { inherit (nixosTests.zfs) unstable; }; - hash = "sha256-gTpj1hYEkx+f/VvvfgeZeqwUhBVQyOIMKic8AaiwYzg="; + hash = "sha256-ZWWrVwMP/DSSIxuXp6GuHCD0wiRekHbRXFGaclqd/ns="; extraLongDescription = '' This is "unstable" ZFS, and will usually be a pre-release version of ZFS. From 1aa8c30db4aefbf51bac97445a04892bb92c9c46 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 13 Jan 2025 20:18:24 -0500 Subject: [PATCH 3/3] zfs_2_3: init at 2.3.0 Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.3.0 (cherry picked from commit 6477277a79d19ac852b79d000bb6ce02c6f4adbb) --- nixos/tests/zfs.nix | 5 +++++ pkgs/os-specific/linux/zfs/2_3.nix | 33 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ pkgs/top-level/linux-kernels.nix | 4 ++++ 4 files changed, 46 insertions(+) create mode 100644 pkgs/os-specific/linux/zfs/2_3.nix diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index 13db2c8e06be6..441b57689ef07 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -202,6 +202,11 @@ in { kernelPackages = pkgs.linuxPackages; }; + series_2_3 = makeZfsTest { + zfsPackage = pkgs.zfs_2_3; + kernelPackages = pkgs.linuxPackages; + }; + unstable = makeZfsTest rec { zfsPackage = pkgs.zfs_unstable; kernelPackages = pkgs.linuxPackages; diff --git a/pkgs/os-specific/linux/zfs/2_3.nix b/pkgs/os-specific/linux/zfs/2_3.nix new file mode 100644 index 0000000000000..b39ebc52b0d8e --- /dev/null +++ b/pkgs/os-specific/linux/zfs/2_3.nix @@ -0,0 +1,33 @@ +{ + callPackage, + kernel ? null, + stdenv, + lib, + nixosTests, + ... +}@args: + +let + stdenv' = if kernel == null then stdenv else kernel.stdenv; +in +callPackage ./generic.nix args { + # You have to ensure that in `pkgs/top-level/linux-kernels.nix` + # 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"; + + # this package should point to the latest release. + version = "2.3.0"; + + tests = { + inherit (nixosTests.zfs) installer series_2_3; + }; + + maintainers = with lib.maintainers; [ + adamcstephens + amarshall + ]; + + hash = "sha256-ZWWrVwMP/DSSIxuXp6GuHCD0wiRekHbRXFGaclqd/ns="; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83f338d0e972e..4629f66d8d02a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12937,12 +12937,16 @@ with pkgs; zfs_2_2 = callPackage ../os-specific/linux/zfs/2_2.nix { configFile = "user"; }; + zfs_2_3 = callPackage ../os-specific/linux/zfs/2_3.nix { + configFile = "user"; + }; zfs_unstable = callPackage ../os-specific/linux/zfs/unstable.nix { configFile = "user"; }; }) zfs_2_1 zfs_2_2 + zfs_2_3 zfs_unstable; zfs = zfs_2_2; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 2f63c8e6e0efb..39240f698073d 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -587,6 +587,10 @@ in { configFile = "kernel"; inherit pkgs kernel; }; + zfs_2_3 = callPackage ../os-specific/linux/zfs/2_3.nix { + configFile = "kernel"; + inherit pkgs kernel; + }; zfs_unstable = callPackage ../os-specific/linux/zfs/unstable.nix { configFile = "kernel"; inherit pkgs kernel;