Merge pull request #198818 from fortuneteller2k/xanmod (8fc819a6) · Commits · nix / nixpkgs

pkgs/os-specific/linux/kernel/xanmod-kernels.nix

+16 −28

Original line number	Diff line number	Diff line
		@@ -3,28 +3,15 @@
		let
		# These names are how they are designated in https://xanmod.org.
		ltsVariant = {
		version = "5.15.70";
		hash = "sha256-gMtGoj/HzMqd6Y3PSc6QTsu/PI7vfb+1pg4mt878cxs=";
		version = "5.15.75";
		hash = "sha256-tgm5nmguEfRFq3OhmZgRgFLIW7E798Rv1basxnfdqLI=";
		variant = "lts";
		};

		currentVariant = {
		version = "5.19.13";
		hash = "sha256-BzQH4c24CtE3R5HNe2sOc3McVkRmf/RKOOjuf1W4YfE=";
		variant = "current";
		};

		nextVariant = {
		version = "6.0.0";
		hash = "sha256-E7T8eHwMKYShv4KWdCbHQmpn+54edJoKdimZY3GFbPU=";
		variant = "next";
		};

		ttVariant = {
		version = "5.15.54";
		suffix = "xanmod1-tt";
		hash = "sha256-4ck9PAFuIt/TxA/U+moGlVfCudJnzSuAw7ooFG3OJis=";
		variant = "tt";
		mainVariant = {
		version = "6.0.6";
		hash = "sha256-JMfAtiPDgoVF+ypeFXev06PL39ZM2H7m07IxpasjAoM=";
		variant = "main";
		};

		xanmodKernelFor = { version, suffix ? "xanmod1", hash, variant }: buildLinux (args // rec {
		@@ -46,6 +33,10 @@ let
		TCP_CONG_BBR2 = yes;
		DEFAULT_BBR2 = yes;

		# Google's Multigenerational LRU framework
		LRU_GEN = yes;
		LRU_GEN_ENABLED = yes;

		# FQ-PIE Packet Scheduling
		NET_SCH_DEFAULT = yes;
		DEFAULT_FQ_PIE = yes;
		@@ -56,12 +47,11 @@ 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);

		# Preemptive Full Tickless Kernel at 500Hz
		HZ = freeform "500";
		HZ_500 = yes;
		HZ_1000 = no;
		};

		extraMeta = {
		@@ -74,7 +64,5 @@ let
		in
		{
		lts = xanmodKernelFor ltsVariant;
		current = xanmodKernelFor currentVariant;
		next = xanmodKernelFor nextVariant;
		tt = xanmodKernelFor ttVariant;
		main = xanmodKernelFor mainVariant;
		}

pkgs/top-level/aliases.nix

+2 −0

Original line number	Diff line number	Diff line
		@@ -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";

pkgs/top-level/all-packages.nix

+0 −2

Original line number	Diff line number	Diff line
		@@ -25155,8 +25155,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 { };

pkgs/top-level/linux-kernels.nix

+4 −4

Original line number	Diff line number	Diff line
		@@ -232,9 +232,9 @@ in {
		};

		linux_xanmod = xanmodKernels.lts;
		linux_xanmod_stable = xanmodKernels.current;
		linux_xanmod_latest = xanmodKernels.next;
		linux_xanmod_tt = xanmodKernels.tt;
		linux_xanmod_stable = xanmodKernels.main;
		linux_xanmod_latest = xanmodKernels.main;
		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);

Admin message