From 0a242b15735b7375e9842d54545f3b8dd93c3ddf Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Mon, 31 Oct 2022 17:21:58 +0000 Subject: [PATCH] linux_xanmod_tt: remove --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 14 -------------- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/linux-kernels.nix | 4 ++-- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 8ec761a701a3..34bf83b9dc46 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -20,13 +20,6 @@ let variant = "next"; }; - ttVariant = { - version = "5.15.54"; - suffix = "xanmod1-tt"; - hash = "sha256-4ck9PAFuIt/TxA/U+moGlVfCudJnzSuAw7ooFG3OJis="; - variant = "tt"; - }; - xanmodKernelFor = { version, suffix ? "xanmod1", hash, variant }: buildLinux (args // rec { inherit version; modDirVersion = "${version}-${suffix}"; @@ -56,12 +49,6 @@ let # WineSync driver for fast kernel-backed Wine WINESYNC = module; - } // lib.optionalAttrs (variant == "tt") { - # removed options - CFS_BANDWIDTH = lib.mkForce (option no); - RT_GROUP_SCHED = lib.mkForce (option no); - SCHED_AUTOGROUP = lib.mkForce (option no); - SCHED_CORE = lib.mkForce (option no); }; extraMeta = { @@ -76,5 +63,4 @@ in lts = xanmodKernelFor ltsVariant; current = xanmodKernelFor currentVariant; next = xanmodKernelFor nextVariant; - tt = xanmodKernelFor ttVariant; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ac16901e15bd..81337dfb5784 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -836,6 +836,8 @@ mapAliases ({ linux_rpi2 = linuxKernel.kernels.linux_rpi2; linux_rpi3 = linuxKernel.kernels.linux_rpi3; linux_rpi4 = linuxKernel.kernels.linux_rpi4; + linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; # Added 2022-11-01 + linuxPackages_xanmod_tt = throw "linuxPackages_xanmod_tt was removed because upstream no longer offers this option"; # Added 2022-11-01 # Added 2020-04-04 linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ef2108e841f..e1c581e0ca10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25148,8 +25148,6 @@ with pkgs; linux_xanmod_stable = linuxKernel.kernels.linux_xanmod_stable; linuxPackages_xanmod_latest = linuxKernel.packages.linux_xanmod_latest; linux_xanmod_latest = linuxKernel.kernels.linux_xanmod_latest; - linuxPackages_xanmod_tt = linuxKernel.packages.linux_xanmod_tt; - linux_xanmod_tt = linuxKernel.kernels.linux_xanmod_tt; linux-doc = callPackage ../os-specific/linux/kernel/htmldocs.nix { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 766edb74b5e8..5faf6d0172a2 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -234,7 +234,7 @@ in { linux_xanmod = xanmodKernels.lts; linux_xanmod_stable = xanmodKernels.current; linux_xanmod_latest = xanmodKernels.next; - linux_xanmod_tt = xanmodKernels.tt; + linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; linux_libre = deblobKernel packageAliases.linux_default.kernel; @@ -583,7 +583,7 @@ in { linux_xanmod = recurseIntoAttrs (packagesFor kernels.linux_xanmod); linux_xanmod_stable = recurseIntoAttrs (packagesFor kernels.linux_xanmod_stable); linux_xanmod_latest = recurseIntoAttrs (packagesFor kernels.linux_xanmod_latest); - linux_xanmod_tt = recurseIntoAttrs (packagesFor kernels.linux_xanmod_tt); + linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; hardkernel_4_14 = recurseIntoAttrs (packagesFor kernels.linux_hardkernel_4_14);