Unverified Commit f2f501c5 authored by Adam C. Stephens's avatar Adam C. Stephens
Browse files

zfs_2_2: remove 

Will likely go out of support during 25.11 as zfs-2.4.0-rc3 is already out
parent 219ce4ce

nixos/tests/zfs.nix

+0 −5
Original line number Diff line number Diff line
@@ -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;

pkgs/os-specific/linux/zfs/2_2.nix

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
{

  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=";

}

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -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

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -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

    ;

pkgs/top-level/linux-kernels.nix

+0 −4
Original line number Diff line number Diff line
@@ -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;