nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-30 03:39:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #220818 from NixOS/backport-220732-to-release-22.11

Browse Source 
[Backport release-22.11] Linux kernel updates 2023-03-11 + fix brcmfmac driver
This commit is contained in:
Maximilian Bosch
2023-03-12 16:19:12 +01:00
committed by GitHub
parent b628dd9754 12aebea71c
commit 3ad45d6556
10 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/kernel/linux-4.14.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.14.307";
version = "4.14.308";
# 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,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "00dp0vj9572ig4zsnmhl2a2v5vx40hnjibyifw24x1q6qdaia72f";
sha256 = "19lkw0izj0i63grzycvz6pdxvih0q7lml0h30zsxzb4vb7yj0v7i";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.19.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "4.19.275";
version = "4.19.276";
# 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,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "02l6f5y1cbjc9997lmcak5j8dllkzr8q47nqscqsyvz2c2hnzsdg";
sha256 = "1f8lcd47pba4jfycbbrd8vsqpf038x19rf80g3grzpvsgyaq1k1f";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.10.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.10.172";
version = "5.10.173";
# 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,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1c9757gma0dksd1ch8pljbsmf586bq66gxqpsv53676z8kivl3gj";
sha256 = "099w115m2b1l99r4pn7ifjg6aqb8rsn888102qj8iv97qxsb901l";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.15.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.15.99";
version = "5.15.100";
# 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,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0ih3pqxv8kwc8awkd7f5cib9zdnmz6hczqfcz62s7bppjchbicwr";
sha256 = "09qlihw3pmb52kdsrm9pd6vbvfkrxrvpyzw896dqgbf11y3wx97p";
};
} // (args.argsOverride or { }))

4
pkgs/os-specific/linux/kernel/linux-5.4.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "5.4.234";
version = "5.4.235";
# 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,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1489jnp4vb8p879hq1nx3xgyzjdwj1zalk3x4vcbnc9f7yrrrixc";
sha256 = "1yqlvfw15mvmn6fh7gpck799pw4a2sip52ar9ammi0qdp96x1gxq";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-6.1.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "6.1.16";
version = "6.1.18";
# 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,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "1id3dn0p724yp3n4wqk6bhs21yjhqihiilkagfh1am8bb1arr156";
sha256 = "07hlmv00wqi7497c3y6w7494qsxgd97kzy7xa30v0vqfzxgc2al4";
};
} // (args.argsOverride or { }))

4
pkgs/os-specific/linux/kernel/linux-6.2.nix
View File

@@ -3,7 +3,7 @@
with lib;
buildLinux (args // rec {
version = "6.2.3";
version = "6.2.5";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "091r0rjj5ba50kiq96099w79ayzcdy6qyzgkmw10hxqkzia0nvdk";
sha256 = "1fg5rq40fi7xkx3pw54538gydygbizg492aqfnh0hn3fry903av5";
};
} // (args.argsOverride or { }))

4
pkgs/os-specific/linux/kernel/linux-libre.nix
View File

@@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "19049";
sha256 = "0873qyk69p8hr91qjaq5rd9z2i6isd3yq3slh1my5y33gc7d3bj2";
rev = "19102";
sha256 = "1w9zl7grws1nzq4zp4mj1v5a6akqwkzy9lf0wwdar68jbxav3fvf";
}
, ...
}:

9
pkgs/os-specific/linux/kernel/patches.nix
View File

@@ -62,4 +62,13 @@
name = "fix-em-ice-bonding";
patch = ./fix-em-ice-bonding.patch;
};
# https://lore.kernel.org/linux-wireless/ZAx0TWRBlGfv7pNl@kroah.com/T/#m11e6e0915ab8fa19ce8bc9695ab288c0fe018edf
fix-brcmfmac = {
name = "fix-brcmfmac";
patch = fetchpatch {
url = "https://lore.kernel.org/linux-wireless/20230311141914.24444-1-marcan@marcan.st/raw";
sha256 = "sha256-Fjap48Lef8Mi1i0t13/rT2SoYcbO8HJuXhJMn7HK3Ds=";
};
};
}

11
pkgs/top-level/linux-kernels.nix
View File

@@ -34,6 +34,8 @@ let
major = lib.versions.major version;
sha256 = kernelPatches.hardened.${kernel.meta.branch}.sha256;
modDirVersion' = builtins.replaceStrings [ kernel.version ] [ version ] kernel.modDirVersion;
# FIXME remove as soon as the revert happened upstream!
basePatches = lib.filter ({ name, ... }: name != "fix-brcmfmac") kernel.kernelPatches;
in kernel.override {
structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {
inherit stdenv lib version;
@@ -45,7 +47,7 @@ let
inherit sha256;
};
};
kernelPatches = kernel.kernelPatches ++ [
kernelPatches = basePatches ++ [
kernelPatches.hardened.${kernel.meta.branch}
];
modDirVersionArg = modDirVersion' + (kernelPatches.hardened.${kernel.meta.branch}).extra;
@@ -103,6 +105,7 @@ in {
# when adding a new linux version
kernelPatches.cpu-cgroup-v2."4.11"
kernelPatches.modinst_arg_list_too_long
kernelPatches.fix-brcmfmac
];
};
@@ -111,6 +114,7 @@ in {
[ kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.modinst_arg_list_too_long
kernelPatches.fix-brcmfmac
];
};
@@ -119,6 +123,7 @@ in {
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.rtl8761b_support
kernelPatches.fix-brcmfmac
];
};
@@ -133,6 +138,7 @@ in {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.fix-brcmfmac
];
};
@@ -149,6 +155,7 @@ in {
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.fix-em-ice-bonding
kernelPatches.fix-brcmfmac
];
};
@@ -163,6 +170,7 @@ in {
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.fix-em-ice-bonding
kernelPatches.fix-brcmfmac
];
};
@@ -171,6 +179,7 @@ in {
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.fix-em-ice-bonding
kernelPatches.fix-brcmfmac
];
};