diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index 470d256ba515..0f0f40e00020 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -204,11 +204,6 @@ let in { - series_2_2 = makeZfsTest { - zfsPackage = pkgs.zfs_2_2; - kernelPackages = pkgs.linuxPackages; - }; - series_2_3 = makeZfsTest { zfsPackage = pkgs.zfs_2_3; kernelPackages = pkgs.linuxPackages; diff --git a/pkgs/os-specific/linux/zfs/2_2.nix b/pkgs/os-specific/linux/zfs/2_2.nix deleted file mode 100644 index 487435ca5f48..000000000000 --- a/pkgs/os-specific/linux/zfs/2_2.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - callPackage, - lib, - nixosTests, - stdenv, - ... -}@args: - -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_2"; - - kernelMinSupportedMajorMinor = "4.18"; - kernelMaxSupportedMajorMinor = "6.15"; - - # this package should point to the latest release. - version = "2.2.8"; - - tests = { - inherit (nixosTests.zfs) series_2_2; - } - // lib.optionalAttrs stdenv.isx86_64 { - inherit (nixosTests.zfs) installer; - }; - - maintainers = with lib.maintainers; [ - adamcstephens - amarshall - ]; - - hash = "sha256-ZYgC8L4iI9ewaC7rkMFSRAKeTWr72N5aRP98VLL4oqo="; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 61b6b6f12bdd..fd31fabdc97f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1651,6 +1651,7 @@ mapAliases { zeroadPackages.zeroad-data = throw "'zeroadPackages.zeroad-data' has been renamed to/replaced by 'zeroad-data'"; # Converted to throw 2025-10-27 zeroadPackages.zeroad-unwrapped = throw "'zeroadPackages.zeroad-unwrapped' has been renamed to/replaced by 'zeroad-unwrapped'"; # Converted to throw 2025-10-27 zeromq4 = throw "'zeromq4' has been renamed to/replaced by 'zeromq'"; # Converted to throw 2025-10-27 + zfs_2_2 = throw "'zfs_2_2' has been removed, upgrade to a newer version instead"; # Added 2025-11-08 zfsStable = throw "'zfsStable' has been renamed to/replaced by 'zfs'"; # Converted to throw 2025-10-27 zfsUnstable = throw "'zfsUnstable' has been renamed to/replaced by 'zfs_unstable'"; # Converted to throw 2025-10-27 zig_0_12 = throw "zig 0.12 has been removed, upgrade to a newer version instead"; # Added 2025-08-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e075871330c..6e60e4329f24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10342,9 +10342,6 @@ with pkgs; inherit ({ - 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"; }; @@ -10352,7 +10349,6 @@ with pkgs; configFile = "user"; }; }) - zfs_2_2 zfs_2_3 zfs_unstable ; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 5b649e3be8ae..121f344a22b1 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -656,10 +656,6 @@ in zenpower = callPackage ../os-specific/linux/zenpower { }; - zfs_2_2 = callPackage ../os-specific/linux/zfs/2_2.nix { - configFile = "kernel"; - inherit pkgs kernel; - }; zfs_2_3 = callPackage ../os-specific/linux/zfs/2_3.nix { configFile = "kernel"; inherit pkgs kernel;