Unverified Commit bb45501b authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

zfs_2_1: remove (#358811)

parents 856e0b5b cbc50da1

ci/OWNERS

+0 −6
Original line number Diff line number Diff line
@@ -395,12 +395,6 @@ pkgs/by-name/fo/forgejo/ @adamcstephens @bendlas @emilylange 
/pkgs/development/compilers/ocaml   @ulrikstrid

/pkgs/development/ocaml-modules     @ulrikstrid



# ZFS

pkgs/os-specific/linux/zfs/2_1.nix        @raitobezarius

pkgs/os-specific/linux/zfs/generic.nix    @raitobezarius

nixos/modules/tasks/filesystems/zfs.nix   @raitobezarius

nixos/tests/zfs.nix                       @raitobezarius



# Zig

/pkgs/development/compilers/zig @figsoda

/doc/hooks/zig.section.md       @figsoda

nixos/tests/zfs.nix

+0 −6
Original line number Diff line number Diff line
@@ -191,12 +191,6 @@ let 


in {



  # maintainer: @raitobezarius

  series_2_1 = makeZfsTest {

    zfsPackage = pkgs.zfs_2_1;

    kernelPackages = pkgs.linuxPackages;

  };



  series_2_2 = makeZfsTest {

    zfsPackage = pkgs.zfs_2_2;

    kernelPackages = pkgs.linuxPackages;

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

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
{ callPackage

, kernel ? null

, stdenv

, lib

, nixosTests

, ...

} @ args:



let

  stdenv' = if kernel == null then stdenv else kernel.stdenv;

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

  # check the release notes for compatible kernels

  kernelCompatible = kernel: kernel.kernelOlder "6.8";



  # This is a fixed version to the 2.1.x series, move only

  # if the 2.1.x series moves.

  version = "2.1.16";



  hash = "sha256-egs7paAOdbRAJH4QwIjlK3jAL/le51kDQrdW4deHfAI=";



  tests = {

    inherit (nixosTests.zfs) series_2_1;

  };



  maintainers = [ lib.maintainers.raitobezarius ];

}

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -1496,6 +1496,7 @@ mapAliases { 


  zfsStable = zfs; # Added 2024-02-26

  zfsUnstable = zfs_unstable; # Added 2024-02-26

  zfs_2_1 = throw "zfs 2.1 has been removed as it is EOL. Please upgrade to a newer version"; # Added 2024-12-25

  zinc = zincsearch; # Added 2023-05-28

  zk-shell = throw "zk-shell has been removed as it was broken and unmaintained"; # Added 2024-08-10

  zkg = throw "'zkg' has been replaced by 'zeek'";

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -12550,9 +12550,6 @@ with pkgs; 














  inherit















    ({













      zfs_2_1 = callPackage ../os-specific/linux/zfs/2_1.nix {













        configFile = "user";













      };















      zfs_2_2 = callPackage ../os-specific/linux/zfs/2_2.nix {















        configFile = "user";















      };









@@ -12563,7 +12560,6 @@ with pkgs;













        configFile = "user";















      };















    })













    zfs_2_1















    zfs_2_2















    zfs_2_3















    zfs_unstable;