diff options
author | Andrew Marshall <andrew@johnandrewmarshall.com> | 2024-02-27 18:27:39 -0500 |
---|---|---|
committer | Andrew Marshall <andrew@johnandrewmarshall.com> | 2024-02-27 18:45:55 -0500 |
commit | 929fcf93358a833003435c0f74b9bd993f9546d0 (patch) | |
tree | 3a50972b3cacc22ec62efe2f6f9ebf7034739e78 /pkgs | |
parent | ce5b1e007e1eb96e5df296e33ed884b70dc19250 (diff) |
zfs_unstable: Rename from zfsUnstable
This matches the naming of other zfs_* pkgs.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/zfs/generic.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/zfs/unstable.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/linux-kernels.nix | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index 566af6950d483..e5a3a79eba3ab 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 2bd06e0d6b749..052dd0cd74c9a 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 ddfed4a09550c..fab717bc0d1d4 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 6d4f19c255e01..b292d5952e9dd 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 7df1bb0c0081b..f54280683b9c5 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; }; |