From 3f63c29812e0f1fd1c8763e746de79ae08da4c10 Mon Sep 17 00:00:00 2001 From: misuzu Date: Wed, 23 Jun 2021 17:41:35 +0300 Subject: linux: enable LIRC --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/os-specific/linux/kernel') diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 355e653c8ea..fce451ee889 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -846,6 +846,8 @@ let X86_AMD_PLATFORM_DEVICE = yes; X86_PLATFORM_DRIVERS_DELL = whenAtLeast "5.12" yes; + LIRC = mkMerge [ (whenOlder "4.16" module) (whenAtLeast "4.17" yes) ]; + } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Enable CPU/memory hotplug support # Allows you to dynamically add & remove CPUs/memory to a VM client running NixOS without requiring a reboot -- cgit 1.4.1 From caa1c955c94564f9bdafc23f6315f88da1e0da46 Mon Sep 17 00:00:00 2001 From: Atemu Date: Wed, 14 Jul 2021 19:59:37 +0200 Subject: linux_zen: 5.12.19 -> 5.13.5 --- pkgs/os-specific/linux/kernel/linux-zen.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific/linux/kernel') diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index caf65508210..3955b1851d3 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.12.19"; - suffix = "zen2"; + version = "5.13.5"; + suffix = "zen1"; in buildLinux (args // { @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-l+KIlaXoq/Nzf7mUom9DUjaAsn7UxeKGL6MbYN7mBZk="; + sha256 = "sha256-3guG482lsdcWqAJ1kY757D4EeOEpTDvy95de0bHif98="; }; extraMeta = { -- cgit 1.4.1 From b167e087810dce6f0298f078b0ad621e4bdaaf7f Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 28 Jul 2021 15:16:30 +0200 Subject: linux: 5.13.5 -> 5.13.6 --- pkgs/os-specific/linux/kernel/linux-5.13.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific/linux/kernel') diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix index dd97944de78..bece15821a8 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.13.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.13.5"; + version = "5.13.6"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,9 +13,8 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0lqh7krxxnbrvr3w1kag92z9r4n9436fr6answjkjfbvw0z7q74m"; + sha256 = "0xjjl8dmilp425b1cp977v26qxlg1147gh54kni949pzxwh1fb56"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; } // (args.argsOverride or { })) - -- cgit 1.4.1 From 5d0f0a980ae732184cbe387a48d660fed0b54578 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 30 Jul 2021 10:19:52 -0700 Subject: linux_xanmod: 5.13.5 -> 5.13.6 --- pkgs/os-specific/linux/kernel/linux-xanmod.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific/linux/kernel') diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 701f5d3b104..f86134264f3 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,8 +1,9 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.13.5"; - suffix = "xanmod1-cacule"; + version = "5.13.6"; + release = "2"; + suffix = "xanmod${release}-cacule"; in buildLinux (args // rec { inherit version; @@ -12,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-Vhshu3mNkQ58TEOUBOuF7jLBlablxg/BioUyd96lI5g="; + sha256 = "sha256-sSsCgDBDFiQADHE+ZRqrMKVyGDwynirPU3NA2Olgpko="; }; structuredExtraConfig = with lib.kernel; { -- cgit 1.4.1 From 988c12faed96159fd5902f3bc372739c111206ef Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 30 Jul 2021 15:12:46 -0400 Subject: linux/common-config.nix: disable LPAE on armv7l-linux LPAE was enabled to support native armv7l builders running in QEMU on aarch64, but this option disables support for processors which don't support LPAE, which are still relatively common. In particular, Beaglebones use the Cortex-A8, which doesn't support LPAE. Also, if you attempt to boot an LPAE kernel on a CPU that doesn't support it, it fails before even earlycon is initialized. This makes the problem difficult to debug without enabling CONFIG_DEBUG_LL or using a hardware debugger. --- pkgs/os-specific/linux/kernel/common-config.nix | 2 -- 1 file changed, 2 deletions(-) (limited to 'pkgs/os-specific/linux/kernel') diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index fce451ee889..3fec8d38ac9 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -880,8 +880,6 @@ let # Keeping it a built-in ensures it will be used if possible. FB_SIMPLE = yes; - } // optionalAttrs (stdenv.hostPlatform.system == "armv7l-linux") { - ARM_LPAE = yes; }; }; in -- cgit 1.4.1 From 6e9195f6687d05d4225521a34d1702dd9c0a4444 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sat, 31 Jul 2021 21:46:16 +0200 Subject: linux_zen: 5.13.5 -> 5.13.7 --- pkgs/os-specific/linux/kernel/linux-zen.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific/linux/kernel') diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 3955b1851d3..7cbeedda726 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.13.5"; + version = "5.13.7"; suffix = "zen1"; in @@ -14,11 +14,11 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-3guG482lsdcWqAJ1kY757D4EeOEpTDvy95de0bHif98="; + sha256 = "sha256-ZvB5Ejt9MXP4QK5cj9CGQgFJIfDV03IW5xcknCxDui0="; }; extraMeta = { - branch = "5.12/master"; + branch = "5.13"; maintainers = with lib.maintainers; [ atemu andresilva ]; description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads."; }; -- cgit 1.4.1 From 604d0dd0d68daf696a9ba5494b63500e9db36874 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sat, 31 Jul 2021 22:59:41 +0200 Subject: linux_zen: actually enable patchset --- pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/os-specific/linux/kernel') diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 7cbeedda726..2b91a259232 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -17,6 +17,10 @@ buildLinux (args // { sha256 = "sha256-ZvB5Ejt9MXP4QK5cj9CGQgFJIfDV03IW5xcknCxDui0="; }; + structuredExtraConfig = with lib.kernel; { + ZEN_INTERACTIVE = yes; + }; + extraMeta = { branch = "5.13"; maintainers = with lib.maintainers; [ atemu andresilva ]; -- cgit 1.4.1 From 6dd36f95f22836d6f5a1eb0b286a14f433413e2f Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 1 Aug 2021 15:06:50 -0700 Subject: linux_xanmod: 5.13.6 -> 5.13.7 --- pkgs/os-specific/linux/kernel/linux-xanmod.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific/linux/kernel') diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index f86134264f3..62e88d01853 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,8 +1,8 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.13.6"; - release = "2"; + version = "5.13.7"; + release = "1"; suffix = "xanmod${release}-cacule"; in buildLinux (args // rec { @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-sSsCgDBDFiQADHE+ZRqrMKVyGDwynirPU3NA2Olgpko="; + sha256 = "sha256-6SppDriZWzLu6Qye1e6ciiE+Ro63vDyabxfgWS/PTSo="; }; structuredExtraConfig = with lib.kernel; { -- cgit 1.4.1 From ced7721191dbc31b29f467a432a590e9df8385be Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 2 Aug 2021 20:50:35 +0200 Subject: linux: only configure IDE to "no" pre-5.14 When trying to build a 5.14 (rc-*), this fails to build otherwise: > error: unused option: IDE --- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/os-specific/linux/kernel') diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 3fec8d38ac9..2a23c8d3ea5 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -758,7 +758,7 @@ let POSIX_MQUEUE = yes; FRONTSWAP = yes; FUSION = yes; # Fusion MPT device support - IDE = no; # deprecated IDE support + IDE = whenOlder "5.14" no; # deprecated IDE support, removed in 5.14 IDLE_PAGE_TRACKING = yes; IRDA_ULTRA = whenOlder "4.17" yes; # Ultra (connectionless) protocol -- cgit 1.4.1