zfs_2_3: init at 2.3.0 (#373599)

NixOS · Jan 14, 2025 · c44bf8b · c44bf8b
2 parents 6ad7602 + 6477277
commit c44bf8b
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 2 deletions.
diff --git 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
@@ -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/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-<version>-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.

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -12556,12 +12556,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
@@ -591,6 +591,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;