From 83451174b826146cedbc31d98f16c870a0dd0c45 Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 27 Jul 2020 18:31:44 +0200 Subject: [PATCH] linux_zen: init at 5.7.10 Fixes #74834 --- pkgs/os-specific/linux/kernel/linux-zen.nix | 23 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 11 ++++++++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/linux-zen.nix diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix new file mode 100644 index 000000000000..fcc74ecad2a6 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, buildLinux, ... } @ args: + +let + version = "5.7.10"; +in + +buildLinux (args // { + modDirVersion = "${version}-zen1"; + inherit version; + + src = fetchFromGitHub { + owner = "zen-kernel"; + repo = "zen-kernel"; + rev = "v${version}-zen1"; + sha256 = "0m9abjs7xv80zgk5qx7iimxaycif8dlr0g0kzkjyaw9mxji6gp37"; + }; + + extraMeta = { + branch = "5.7/master"; + maintainers = with stdenv.lib.maintainers; [ atemu ]; + }; + +} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad265ff2fd69..6b6d104dc7ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17268,6 +17268,14 @@ in ]; }; + linux_zen = callPackage ../os-specific/linux/kernel/linux-zen.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export_kernel_fpu_functions."5.3" + ]; + }; + /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -17549,6 +17557,9 @@ in linuxPackages_latest-libre = recurseIntoAttrs (linuxPackagesFor linux_latest-libre); linux_latest-libre = linux-libre.override { linux = linux_latest; }; + # zen-kernel + linuxPackages_zen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_zen); + # A function to build a manually-configured kernel linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {});