talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

zfs_2_1: remove (#358811)

Browse Source
This commit is contained in:
Adam C. Stephens 2025-01-14 14:37:08 -05:00 committed by GitHub
commit bb45501b6d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 2 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ci/OWNERS
View File

@ -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

6
nixos/tests/zfs.nix
View File

@ -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;

30
pkgs/os-specific/linux/zfs/2_1.nix
View File

@ -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 ];
}

1
pkgs/top-level/aliases.nix
View File

@ -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'";

4
pkgs/top-level/all-packages.nix
View File

@ -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;

5
pkgs/top-level/linux-kernels.nix
View File

@ -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;
@ -622,6 +618,7 @@ in {
tsme-test = callPackage ../os-specific/linux/tsme-test { };
} // 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