zfs_2_1: remove
With the release of 2.3.0-rc, we know that 2.3.0 will be coming sometime soon. Per the [ZFS release policy][1], only the current and previous releases are expected to be supported, so 2.1.x will become unsupported. Unfortunately upstream does not have any specific timelines, so we do not know when it will become unsupported, but when it does we will likely backport the removal. As such, begin warning of imminent removal. [1]: https://github.com/openzfs/zfs/blob/6187b194349c5a728c9df8c6842f1866d5c9782a/RELEASES.md
This commit is contained in:
committed by
Jörg Thalheim
parent
3423ad56d6
commit
cbc50da11c
@@ -391,12 +391,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
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
{ 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 ];
|
||||
}
|
||||
@@ -1458,6 +1458,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'";
|
||||
|
||||
@@ -12717,9 +12717,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";
|
||||
};
|
||||
@@ -12727,7 +12724,6 @@ with pkgs;
|
||||
configFile = "user";
|
||||
};
|
||||
})
|
||||
zfs_2_1
|
||||
zfs_2_2
|
||||
zfs_unstable;
|
||||
zfs = zfs_2_2;
|
||||
|
||||
@@ -583,10 +583,6 @@ in {
|
||||
|
||||
zenpower = callPackage ../os-specific/linux/zenpower { };
|
||||
|
||||
zfs_2_1 = callPackage ../os-specific/linux/zfs/2_1.nix {
|
||||
configFile = "kernel";
|
||||
inherit pkgs kernel;
|
||||
};
|
||||
zfs_2_2 = callPackage ../os-specific/linux/zfs/2_2.nix {
|
||||
configFile = "kernel";
|
||||
inherit pkgs kernel;
|
||||
@@ -616,6 +612,7 @@ in {
|
||||
msi-ec = callPackage ../os-specific/linux/msi-ec { };
|
||||
|
||||
} // lib.optionalAttrs config.allowAliases {
|
||||
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
|
||||
sch_cake = throw "sch_cake was added in mainline kernel version 4.19"; # Added 2023-06-14
|
||||
|
||||
Reference in New Issue
Block a user