From dcff4f831836e249db5e808aeac6ca71d498cdc7 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Sat, 27 Jan 2024 11:15:29 -0500
Subject: [PATCH] zfs_2_2: Rename from zfsStable

The `zfs` alias already has equivalent semantics. Instead, make this
like zfs_2_1 so folks who want to pin a specific release series can do
so easily and clearly to have more control over when more substantial
updates occur.

Rename all tests to match the pkg attr they are testing.
---
 nixos/tests/zfs.nix                                | 10 +++++-----
 pkgs/os-specific/linux/zfs/{stable.nix => 2_2.nix} |  4 ++--
 pkgs/top-level/aliases.nix                         |  1 +
 pkgs/top-level/all-packages.nix                    |  4 ++--
 pkgs/top-level/linux-kernels.nix                   |  4 ++--
 5 files changed, 12 insertions(+), 11 deletions(-)
 rename pkgs/os-specific/linux/zfs/{stable.nix => 2_2.nix} (90%)

diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix
index 0b411b0b9d8a..a9bf66607574 100644
--- a/nixos/tests/zfs.nix
+++ b/nixos/tests/zfs.nix
@@ -192,22 +192,22 @@ let
 in {
 
   # maintainer: @raitobezarius
-  series_2_1 = makeZfsTest "2.1-series" {
+  series_2_1 = makeZfsTest "zfs_2_1" {
     zfsPackage = pkgs.zfs_2_1;
     kernelPackages = pkgs.linuxPackages;
   };
 
-  stable = makeZfsTest "stable" {
-    zfsPackage = pkgs.zfsStable;
+  series_2_2 = makeZfsTest "zfs_2_2" {
+    zfsPackage = pkgs.zfs_2_2;
     kernelPackages = pkgs.linuxPackages;
   };
 
-  unstable = makeZfsTest "unstable" rec {
+  unstable = makeZfsTest "zfsUnstable" rec {
     zfsPackage = pkgs.zfsUnstable;
     kernelPackages = zfsPackage.latestCompatibleLinuxPackages;
   };
 
-  unstableWithSystemdStage1 = makeZfsTest "unstable" rec {
+  unstableWithSystemdStage1 = makeZfsTest "zfsUnstable" rec {
     zfsPackage = pkgs.zfsUnstable;
     kernelPackages = zfsPackage.latestCompatibleLinuxPackages;
     enableSystemdStage1 = true;
diff --git a/pkgs/os-specific/linux/zfs/stable.nix b/pkgs/os-specific/linux/zfs/2_2.nix
similarity index 90%
rename from pkgs/os-specific/linux/zfs/stable.nix
rename to pkgs/os-specific/linux/zfs/2_2.nix
index 7ca1d5be3787..3e5d262f73d0 100644
--- a/pkgs/os-specific/linux/zfs/stable.nix
+++ b/pkgs/os-specific/linux/zfs/2_2.nix
@@ -12,7 +12,7 @@ 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";
+  kernelModuleAttribute = "zfs_2_2";
   # check the release notes for compatible kernels
   kernelCompatible = kernel.kernelOlder "6.8";
 
@@ -23,7 +23,7 @@ callPackage ./generic.nix args {
 
   tests = [
     nixosTests.zfs.installer
-    nixosTests.zfs.stable
+    nixosTests.zfs.series_2_2
   ];
 
   hash = "sha256-Bzkow15OitUUQ+mTYhCXgTrQl+ao/B4feleHY/rSSjg=";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5d0ef64bf9a6..ddfed4a09550 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1211,6 +1211,7 @@ mapAliases ({
   ### Z ###
 
   zabbix40 = throw "'zabbix40' has been removed as it has reached end of life"; # Added 2024-01-07
+  zfsStable = zfs; # Added 2024-02-26
   zinc = zincsearch; # Added 2023-05-28
   zkg = throw "'zkg' has been replaced by 'zeek'";
   zq = zed.overrideAttrs (old: { meta = old.meta // { mainProgram = "zq"; }; }); # Added 2023-02-06
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8a5bb73d67b..6d4f19c255e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28729,13 +28729,13 @@ with pkgs;
   zfs_2_1 = callPackage ../os-specific/linux/zfs/2_1.nix {
     configFile = "user";
   };
-  zfsStable = callPackage ../os-specific/linux/zfs/stable.nix {
+  zfs_2_2 = callPackage ../os-specific/linux/zfs/2_2.nix {
     configFile = "user";
   };
   zfsUnstable = callPackage ../os-specific/linux/zfs/unstable.nix {
     configFile = "user";
   };
-  zfs = zfsStable;
+  zfs = zfs_2_2;
 
   ### DATA
 
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 47838b60569f..7df1bb0c0081 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -565,7 +565,7 @@ in {
       configFile = "kernel";
       inherit pkgs kernel;
     };
-    zfsStable = callPackage ../os-specific/linux/zfs/stable.nix {
+    zfs_2_2 = callPackage ../os-specific/linux/zfs/2_2.nix {
       configFile = "kernel";
       inherit pkgs kernel;
     };
@@ -573,7 +573,7 @@ in {
       configFile = "kernel";
       inherit pkgs kernel;
     };
-    zfs = zfsStable;
+    zfs = zfs_2_2;
 
     can-isotp = callPackage ../os-specific/linux/can-isotp { };