From 929fcf93358a833003435c0f74b9bd993f9546d0 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Tue, 27 Feb 2024 18:27:39 -0500
Subject: [PATCH] zfs_unstable: Rename from zfsUnstable

This matches the naming of other zfs_* pkgs.
---
 nixos/modules/tasks/filesystems/zfs.nix | 6 +++---
 nixos/tests/zfs.nix                     | 4 ++--
 pkgs/os-specific/linux/zfs/generic.nix  | 2 +-
 pkgs/os-specific/linux/zfs/unstable.nix | 2 +-
 pkgs/top-level/aliases.nix              | 1 +
 pkgs/top-level/all-packages.nix         | 2 +-
 pkgs/top-level/linux-kernels.nix        | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 6939a01d6589..b5caa4d29fa9 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -219,9 +219,9 @@ in
     boot.zfs = {
       package = mkOption {
         type = types.package;
-        default = if cfgZfs.enableUnstable then pkgs.zfsUnstable else pkgs.zfs;
-        defaultText = literalExpression "if enableUnstable is enabled then pkgs.zfsUnstable else pkgs.zfs";
-        description = lib.mdDoc "Configured ZFS userland tools package, use `pkgs.zfsUnstable` if you want to track the latest staging ZFS branch.";
+        default = if cfgZfs.enableUnstable then pkgs.zfs_unstable else pkgs.zfs;
+        defaultText = literalExpression "if enableUnstable is enabled then pkgs.zfs_unstable else pkgs.zfs";
+        description = lib.mdDoc "Configured ZFS userland tools package, use `pkgs.zfs_unstable` if you want to track the latest staging ZFS branch.";
       };
 
       modulePackage = mkOption {
diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix
index 4bc608ac75e5..851fced2c5e1 100644
--- a/nixos/tests/zfs.nix
+++ b/nixos/tests/zfs.nix
@@ -203,12 +203,12 @@ in {
   };
 
   unstable = makeZfsTest rec {
-    zfsPackage = pkgs.zfsUnstable;
+    zfsPackage = pkgs.zfs_unstable;
     kernelPackages = zfsPackage.latestCompatibleLinuxPackages;
   };
 
   unstableWithSystemdStage1 = makeZfsTest rec {
-    zfsPackage = pkgs.zfsUnstable;
+    zfsPackage = pkgs.zfs_unstable;
     kernelPackages = zfsPackage.latestCompatibleLinuxPackages;
     enableSystemdStage1 = true;
   };
diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix
index 566af6950d48..e5a3a79eba3a 100644
--- a/pkgs/os-specific/linux/zfs/generic.nix
+++ b/pkgs/os-specific/linux/zfs/generic.nix
@@ -234,7 +234,7 @@ let
 
       inherit maintainers;
       mainProgram = "zfs";
-      # If your Linux kernel version is not yet supported by zfs, try zfsUnstable.
+      # If your Linux kernel version is not yet supported by zfs, try zfs_unstable.
       # On NixOS set the option boot.zfs.enableUnstable.
       broken = buildKernel && (kernelCompatible != null) && !kernelCompatible;
     };
diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix
index 2bd06e0d6b74..052dd0cd74c9 100644
--- a/pkgs/os-specific/linux/zfs/unstable.nix
+++ b/pkgs/os-specific/linux/zfs/unstable.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 = "zfsUnstable";
+  kernelModuleAttribute = "zfs_unstable";
   # check the release notes for compatible kernels
   kernelCompatible = kernel.kernelOlder "6.9";
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ddfed4a09550..fab717bc0d1d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1212,6 +1212,7 @@ mapAliases ({
 
   zabbix40 = throw "'zabbix40' has been removed as it has reached end of life"; # Added 2024-01-07
   zfsStable = zfs; # Added 2024-02-26
+  zfsUnstable = zfs_unstable; # 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 6d4f19c255e0..b292d5952e9d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28732,7 +28732,7 @@ with pkgs;
   zfs_2_2 = callPackage ../os-specific/linux/zfs/2_2.nix {
     configFile = "user";
   };
-  zfsUnstable = callPackage ../os-specific/linux/zfs/unstable.nix {
+  zfs_unstable = callPackage ../os-specific/linux/zfs/unstable.nix {
     configFile = "user";
   };
   zfs = zfs_2_2;
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 7df1bb0c0081..f54280683b9c 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -569,7 +569,7 @@ in {
       configFile = "kernel";
       inherit pkgs kernel;
     };
-    zfsUnstable = callPackage ../os-specific/linux/zfs/unstable.nix {
+    zfs_unstable = callPackage ../os-specific/linux/zfs/unstable.nix {
       configFile = "kernel";
       inherit pkgs kernel;
     };