From b1c58b82b98ff287751c78ee2b96dc5c4384e3b3 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 18 Sep 2026 09:23:57 +1000 Subject: [PATCH] linux-rpi*: remove --- pkgs/os-specific/linux/kernel/linux-rpi.nix | 107 -------------------- pkgs/top-level/aliases.nix | 24 ++--- pkgs/top-level/linux-kernels.nix | 67 ++---------- 3 files changed, 21 insertions(+), 177 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-rpi.nix diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix deleted file mode 100644 index f66abe0c8582..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ /dev/null @@ -1,107 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - buildLinux, - rpiVersion, - ... -}@args: - -let - # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this - modDirVersion = "6.12.75"; - hash = "sha256-qrljd20n4tj/7C7gzNnxw7JIyEF2Ppf1PWm2a7vxh1w="; -in -lib.overrideDerivation - (buildLinux ( - args - // { - version = "${modDirVersion}-1+rpt1"; - inherit modDirVersion; - pname = "linux-rpi"; - - src = fetchFromGitHub { - owner = "raspberrypi"; - repo = "linux"; - # https://github.com/RPi-Distro/linux-packaging/raw/refs/tags/pios/1%256.12.75-1+rpt1/debian/changelog - rev = "89050b1059997d38d55462b323b099a6436dc10d"; - inherit hash; - }; - - defconfig = - { - "1" = "bcmrpi_defconfig"; - "2" = "bcm2709_defconfig"; - "3" = if stdenv.hostPlatform.isAarch64 then "bcm2711_defconfig" else "bcm2709_defconfig"; - "4" = "bcm2711_defconfig"; - } - .${toString rpiVersion}; - - features = { - efiBootStub = false; - } - // (args.features or { }); - - isLTS = true; - - extraMeta = - if (rpiVersion < 3) then - { - platforms = with lib.platforms; lib.intersectLists arm linux; - hydraPlatforms = [ ]; - } - else - { - platforms = with lib.platforms; lib.intersectLists (arm ++ aarch64) linux; - hydraPlatforms = [ "aarch64-linux" ]; - }; - ignoreConfigErrors = true; - } - // (args.argsOverride or { }) - )) - (oldAttrs: { - postConfigure = '' - # The v7 defconfig has this set to '-v7' which screws up our modDirVersion. - sed -i $buildRoot/.config -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/' - sed -i $buildRoot/include/config/auto.conf -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/' - ''; - - # Make copies of the DTBs named after the upstream names so that U-Boot finds them. - # This is ugly as heck, but I don't know a better solution so far. - postFixup = '' - dtbDir=${if stdenv.hostPlatform.isAarch64 then "$out/dtbs/broadcom" else "$out/dtbs"} - rm $dtbDir/bcm283*.dtb - copyDTB() { - cp -v "$dtbDir/$1" "$dtbDir/$2" - } - '' - + lib.optionalString (lib.elem stdenv.hostPlatform.system [ "armv6l-linux" ]) '' - copyDTB bcm2708-rpi-zero-w.dtb bcm2835-rpi-zero.dtb - copyDTB bcm2708-rpi-zero-w.dtb bcm2835-rpi-zero-w.dtb - copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-a.dtb - copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b.dtb - copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b-rev2.dtb - copyDTB bcm2708-rpi-b-plus.dtb bcm2835-rpi-a-plus.dtb - copyDTB bcm2708-rpi-b-plus.dtb bcm2835-rpi-b-plus.dtb - copyDTB bcm2708-rpi-b-plus.dtb bcm2835-rpi-zero.dtb - copyDTB bcm2708-rpi-cm.dtb bcm2835-rpi-cm.dtb - '' - + lib.optionalString (lib.elem stdenv.hostPlatform.system [ "armv7l-linux" ]) '' - copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb - '' - + - lib.optionalString - (lib.elem stdenv.hostPlatform.system [ - "armv7l-linux" - "aarch64-linux" - ]) - '' - copyDTB bcm2710-rpi-zero-2.dtb bcm2837-rpi-zero-2.dtb - copyDTB bcm2710-rpi-zero-2-w.dtb bcm2837-rpi-zero-2-w.dtb - copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb - copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-a-plus.dtb - copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb - copyDTB bcm2710-rpi-cm3.dtb bcm2837-rpi-cm3.dtb - copyDTB bcm2711-rpi-4-b.dtb bcm2838-rpi-4-b.dtb - ''; - }) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d17ec2a2ef79..9ed3edf45db6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1504,12 +1504,12 @@ mapAliases { linux_hardened = throw "linux_hardened has been removed due to lack of maintenance"; # Added 2026-03-18 linux_latest-libre = throw "linux_latest_libre has been removed due to lack of maintenance"; # Added 2025-10-01 linux_lqx = throw "linux_lqx has been removed due to lack of maintenance"; # Added 2026-03-13 - linux_rpi0 = linuxKernel.kernels.linux_rpi1; - linux_rpi1 = linuxKernel.kernels.linux_rpi1; - linux_rpi2 = linuxKernel.kernels.linux_rpi2; - linux_rpi02w = linuxKernel.kernels.linux_rpi3; - linux_rpi3 = linuxKernel.kernels.linux_rpi3; - linux_rpi4 = linuxKernel.kernels.linux_rpi4; + linux_rpi0 = throw "linux-rpi series has been removed, please change to use nixos-hardware"; # Added 2026-09-18 + linux_rpi1 = throw "linux-rpi series has been removed, please change to use nixos-hardware"; # Added 2026-09-18 + linux_rpi2 = throw "linux-rpi series has been removed, please change to use nixos-hardware"; # Added 2026-09-18 + linux_rpi02w = throw "linux-rpi series has been removed, please change to use nixos-hardware"; # Added 2026-09-18 + linux_rpi3 = throw "linux-rpi series has been removed, please change to use nixos-hardware"; # Added 2026-09-18 + linux_rpi4 = throw "linux-rpi series has been removed, please change to use nixos-hardware"; # Added 2026-09-18 linuxPackages-libre = throw "linux_libre has been removed due to lack of maintenance"; # Added 2025-10-01 linuxPackages-rt = throw "linuxPackages-rt has been removed due to lack of maintenance"; # Added 2026-03-24 linuxPackages-rt_latest = throw "linuxPackages-rt_latest has been removed due to lack of maintenance"; # Added 2026-03-24 @@ -1542,12 +1542,12 @@ mapAliases { linuxPackages_latest-libre = throw "linux_latest_libre has been removed due to lack of maintenance"; # Added 2025-10-01 linuxPackages_latest_xen_dom0 = throw "'linuxPackages_latest_xen_dom0' has been renamed to/replaced by 'linuxPackages_latest'"; # Converted to throw 2025-10-27 linuxPackages_lqx = throw "linuxPackages_lqx has been removed due to lack of maintenance"; # Added 2026-03-13 - linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; - linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1; - linuxPackages_rpi2 = linuxKernel.packages.linux_rpi2; - linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; - linuxPackages_rpi3 = linuxKernel.packages.linux_rpi3; - linuxPackages_rpi4 = linuxKernel.packages.linux_rpi4; + linuxPackages_rpi0 = throw "linux-rpi series has been removed, please change to use nixos-hardware"; # Added 2026-09-18 + linuxPackages_rpi1 = throw "linux-rpi series has been removed, please change to use nixos-hardware"; # Added 2026-09-18 + linuxPackages_rpi2 = throw "linux-rpi series has been removed, please change to use nixos-hardware"; # Added 2026-09-18 + linuxPackages_rpi02w = throw "linux-rpi series has been removed, please change to use nixos-hardware"; # Added 2026-09-18 + linuxPackages_rpi3 = throw "linux-rpi series has been removed, please change to use nixos-hardware"; # Added 2026-09-18 + linuxPackages_rpi4 = throw "linux-rpi series has been removed, please change to use nixos-hardware"; # Added 2026-09-18 linuxPackages_rt_5_4 = throw "linux_rt 5.4 has been removed because it will reach its end of life within 25.11"; # Added 2025-10-22 linuxPackages_rt_5_10 = throw "linuxPackages_rt_5_10 has been removed due to lack of maintenance"; # Added 2026-03-24 linuxPackages_rt_5_15 = throw "linuxPackages_rt_5_15 has been removed due to lack of maintenance"; # Added 2026-03-24 diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index d3fa965d9516..192829ad883e 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -25,7 +25,6 @@ let packagesFor packageAliases vanillaPackages - rpiPackages ; in { @@ -194,55 +193,10 @@ in linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; - # Remove warning added on 2026-04-01 - linux_rpi1 = - lib.warnOnInstantiate - "linux-rpi series will be removed in a future release. Please change to use nixos-hardware." - ( - callPackage ../os-specific/linux/kernel/linux-rpi.nix { - kernelPatches = with kernelPatches; [ - bridge_stp_helper - request_key_helper - ]; - rpiVersion = 1; - } - ); - linux_rpi2 = - lib.warnOnInstantiate - "linux-rpi series will be removed in a future release. Please change to use nixos-hardware." - ( - callPackage ../os-specific/linux/kernel/linux-rpi.nix { - kernelPatches = with kernelPatches; [ - bridge_stp_helper - request_key_helper - ]; - rpiVersion = 2; - } - ); - linux_rpi3 = - lib.warnOnInstantiate - "linux-rpi series will be removed in a future release. Please change to use nixos-hardware." - ( - callPackage ../os-specific/linux/kernel/linux-rpi.nix { - kernelPatches = with kernelPatches; [ - bridge_stp_helper - request_key_helper - ]; - rpiVersion = 3; - } - ); - linux_rpi4 = - lib.warnOnInstantiate - "linux-rpi series will be removed in a future release. Please change to use nixos-hardware." - ( - callPackage ../os-specific/linux/kernel/linux-rpi.nix { - kernelPatches = with kernelPatches; [ - bridge_stp_helper - request_key_helper - ]; - rpiVersion = 4; - } - ); + linux_rpi1 = throw "linux-rpi series has been removed, please change to use nixos-hardware."; + linux_rpi2 = throw "linux-rpi series has been removed, please change to use nixos-hardware."; + linux_rpi3 = throw "linux-rpi series has been removed, please change to use nixos-hardware."; + linux_rpi4 = throw "linux-rpi series has been removed, please change to use nixos-hardware."; } ) ); @@ -676,16 +630,8 @@ in linux_7_1 = throw "linux 7.1 was removed because it has reached its end of life upstream"; # Added 2026-09-02 }; - rpiPackages = { - linux_rpi1 = packagesFor kernels.linux_rpi1; - linux_rpi2 = packagesFor kernels.linux_rpi2; - linux_rpi3 = packagesFor kernels.linux_rpi3; - linux_rpi4 = packagesFor kernels.linux_rpi4; - }; - packages = recurseIntoAttrs ( vanillaPackages - // rpiPackages // { # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. @@ -718,6 +664,11 @@ in linux_hardened = throw "linux_hardened has been removed due to lack of maintenance"; linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; + linux_rpi1 = throw "linux-rpi series has been removed, please change to use nixos-hardware"; # Added 2026-09-18 + linux_rpi2 = throw "linux-rpi series has been removed, please change to use nixos-hardware"; # Added 2026-09-18 + linux_rpi3 = throw "linux-rpi series has been removed, please change to use nixos-hardware"; # Added 2026-09-18 + linux_rpi4 = throw "linux-rpi series has been removed, please change to use nixos-hardware"; # Added 2026-09-18 + linux_rt_5_4 = throw "linux_rt 5.4 was removed because it will reach its end of life within 25.11"; # Added 2025-10-22 linux_rt_5_10 = throw "linux_rt_5_10 has been removed due to lack of maintenance"; linux_rt_5_15 = throw "linux_rt_5_15 has been removed due to lack of maintenance";