zfs_2_1: remove (#358811)

authored by

Adam C. Stephens and committed by
GitHub
bb45501b 856e0b5b

+2 -50
-6
ci/OWNERS
··· 395 395 /pkgs/development/compilers/ocaml @ulrikstrid 396 396 /pkgs/development/ocaml-modules @ulrikstrid 397 397 398 - # ZFS 399 - pkgs/os-specific/linux/zfs/2_1.nix @raitobezarius 400 - pkgs/os-specific/linux/zfs/generic.nix @raitobezarius 401 - nixos/modules/tasks/filesystems/zfs.nix @raitobezarius 402 - nixos/tests/zfs.nix @raitobezarius 403 - 404 398 # Zig 405 399 /pkgs/development/compilers/zig @figsoda 406 400 /doc/hooks/zig.section.md @figsoda
-6
nixos/tests/zfs.nix
··· 191 191 192 192 in { 193 193 194 - # maintainer: @raitobezarius 195 - series_2_1 = makeZfsTest { 196 - zfsPackage = pkgs.zfs_2_1; 197 - kernelPackages = pkgs.linuxPackages; 198 - }; 199 - 200 194 series_2_2 = makeZfsTest { 201 195 zfsPackage = pkgs.zfs_2_2; 202 196 kernelPackages = pkgs.linuxPackages;
-30
pkgs/os-specific/linux/zfs/2_1.nix
··· 1 - { callPackage 2 - , kernel ? null 3 - , stdenv 4 - , lib 5 - , nixosTests 6 - , ... 7 - } @ args: 8 - 9 - let 10 - stdenv' = if kernel == null then stdenv else kernel.stdenv; 11 - in 12 - callPackage ./generic.nix args { 13 - # You have to ensure that in `pkgs/top-level/linux-kernels.nix` 14 - # this attribute is the correct one for this package. 15 - kernelModuleAttribute = "zfs_2_1"; 16 - # check the release notes for compatible kernels 17 - kernelCompatible = kernel: kernel.kernelOlder "6.8"; 18 - 19 - # This is a fixed version to the 2.1.x series, move only 20 - # if the 2.1.x series moves. 21 - version = "2.1.16"; 22 - 23 - hash = "sha256-egs7paAOdbRAJH4QwIjlK3jAL/le51kDQrdW4deHfAI="; 24 - 25 - tests = { 26 - inherit (nixosTests.zfs) series_2_1; 27 - }; 28 - 29 - maintainers = [ lib.maintainers.raitobezarius ]; 30 - }
+1
pkgs/top-level/aliases.nix
··· 1496 1496 1497 1497 zfsStable = zfs; # Added 2024-02-26 1498 1498 zfsUnstable = zfs_unstable; # Added 2024-02-26 1499 + zfs_2_1 = throw "zfs 2.1 has been removed as it is EOL. Please upgrade to a newer version"; # Added 2024-12-25 1499 1500 zinc = zincsearch; # Added 2023-05-28 1500 1501 zk-shell = throw "zk-shell has been removed as it was broken and unmaintained"; # Added 2024-08-10 1501 1502 zkg = throw "'zkg' has been replaced by 'zeek'";
-4
pkgs/top-level/all-packages.nix
··· 12550 12550 12551 12551 inherit 12552 12552 ({ 12553 - zfs_2_1 = callPackage ../os-specific/linux/zfs/2_1.nix { 12554 - configFile = "user"; 12555 - }; 12556 12553 zfs_2_2 = callPackage ../os-specific/linux/zfs/2_2.nix { 12557 12554 configFile = "user"; 12558 12555 }; ··· 12563 12560 configFile = "user"; 12564 12561 }; 12565 12562 }) 12566 - zfs_2_1 12567 12563 zfs_2_2 12568 12564 zfs_2_3 12569 12565 zfs_unstable;
+1 -4
pkgs/top-level/linux-kernels.nix
··· 583 583 584 584 zenpower = callPackage ../os-specific/linux/zenpower { }; 585 585 586 - zfs_2_1 = callPackage ../os-specific/linux/zfs/2_1.nix { 587 - configFile = "kernel"; 588 - inherit pkgs kernel; 589 - }; 590 586 zfs_2_2 = callPackage ../os-specific/linux/zfs/2_2.nix { 591 587 configFile = "kernel"; 592 588 inherit pkgs kernel; ··· 622 618 tsme-test = callPackage ../os-specific/linux/tsme-test { }; 623 619 624 620 } // lib.optionalAttrs config.allowAliases { 621 + zfs_2_1 = throw "zfs_2_1 has been removed"; # added 2024-12-25; 625 622 ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18; 626 623 hid-nintendo = throw "hid-nintendo was added in mainline kernel version 5.16"; # Added 2023-07-30 627 624 sch_cake = throw "sch_cake was added in mainline kernel version 4.19"; # Added 2023-06-14