From dcc754b57cd434ba9769d878cabdcaa1320a1041 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Thu, 23 Jan 2025 07:35:10 -0500 Subject: [PATCH] linux: remove linuxPackages.zfs alias This is not needed for any regular usage, as folks will almost always consume `linuxPackages.zfs*` via `boot.zfs.package = pkgs.zfs*`, where that is the top-level package that has a reference to the appropriate Kernel package via its `kernelModuleAttribute`. As such, this alias provides little usefulness, so remove it to avoid having to maintain it in-sync with the top-level alias. --- pkgs/top-level/linux-kernels.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index a63c22a7a8c9..966106374799 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -605,7 +605,6 @@ in { configFile = "kernel"; inherit pkgs kernel; }; - zfs = zfs_2_2; can-isotp = callPackage ../os-specific/linux/can-isotp { }; @@ -628,6 +627,7 @@ in { tsme-test = callPackage ../os-specific/linux/tsme-test { }; } // lib.optionalAttrs config.allowAliases { + zfs = throw "linuxPackages.zfs has been removed, use zfs_* instead, or linuxPackages.\${pkgs.zfs.kernelModuleAttribute}"; # added 2025-01-23 zfs_2_1 = throw "zfs_2_1 has been removed"; # added 2024-12-25; ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18; hid-nintendo = throw "hid-nintendo was added in mainline kernel version 5.16"; # Added 2023-07-30