git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #127428 from TredwellGit/linux

Kernels 2021-06-18

commit6dac76d4e986dca103320707fc3a5ff3b8a82f22 authorMaximilian Bosch <maximilian@mbosch.me> dateTue 22 Jun 2021, 10:38 (5 years ago) parent243f95824a0844
7 files changed+30−17
compare with master
unifiedsplit
pkgs/os-specific/linux/kernel/hardened/patches.json+9−9 pkgs/os-specific/linux/kernel/linux-5.10.nix+2−2 pkgs/os-specific/linux/kernel/linux-5.12.nix+2−2 pkgs/os-specific/linux/kernel/linux-5.4.nix+2−2 pkgs/os-specific/linux/kernel/linux-libre.nix+2−2 pkgs/os-specific/linux/kernel/patches.nix+9 pkgs/top-level/all-packages.nix+4
pkgs/os-specific/linux/kernel/hardened/patches.json+9−9
@@ -13,20 +13,20 @@
1313 },
1414 "5.10": {
1515 "extra": "-hardened1",
16− "name": "linux-hardened-5.10.44-hardened1.patch",
17− "sha256": "12bxv87w74lj73vqflpfk022x2ig81lfn4pf1gfanw9zxjrapw4m",
18− "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.44-hardened1/linux-hardened-5.10.44-hardened1.patch"
16+ "name": "linux-hardened-5.10.45-hardened1.patch",
17+ "sha256": "1382dflkv31b9apf3l0b5wcq8hyi69jm03139z3m0vbxi93pk44z",
18+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.45-hardened1/linux-hardened-5.10.45-hardened1.patch"
1919 },
2020 "5.12": {
2121 "extra": "-hardened1",
22− "name": "linux-hardened-5.12.11-hardened1.patch",
23− "sha256": "15qi1znszdg6c0v077k1p4gs0kbpvp6hqjcyg262yqjlpn1c7hcb",
24− "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.11-hardened1/linux-hardened-5.12.11-hardened1.patch"
22+ "name": "linux-hardened-5.12.12-hardened1.patch",
23+ "sha256": "10923kjxhfphsh1wr0zjj3lk16bxkq9ana4hyy8af7cn2k30k4iw",
24+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.12-hardened1/linux-hardened-5.12.12-hardened1.patch"
2525 },
2626 "5.4": {
2727 "extra": "-hardened1",
28− "name": "linux-hardened-5.4.126-hardened1.patch",
29− "sha256": "05bjry8390iy01nfvkp12x78brgndwm5rsqhnl7yp6vwgdi0fyj1",
30− "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.126-hardened1/linux-hardened-5.4.126-hardened1.patch"
28+ "name": "linux-hardened-5.4.127-hardened1.patch",
29+ "sha256": "1qsz5cnm0ny138pbd9f7j5avvz69g51db7dgr1q4farrjml3nshy",
30+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.127-hardened1/linux-hardened-5.4.127-hardened1.patch"
3131 }
3232}
pkgs/os-specific/linux/kernel/linux-5.10.nix+2−2
@@ -3,7 +3,7 @@
33with lib;
44
55buildLinux (args // rec {
6− version = "5.10.44";
6+ version = "5.10.45";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,7 +13,7 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
16− sha256 = "0ry7hfcj07xc6l9mrm5f0ylz54ca3aklgf9x6plf2k45kjjyzgkp";
16+ sha256 = "01rmw5rnxyybr8sh0v9rgamrg71ign2nr7m0ilrq9704k6dj9dzj";
1717 };
1818
1919 kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ];
pkgs/os-specific/linux/kernel/linux-5.12.nix+2−2
@@ -3,7 +3,7 @@
33with lib;
44
55buildLinux (args // rec {
6− version = "5.12.11";
6+ version = "5.12.12";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,7 +13,7 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
16− sha256 = "0ykzyvb4c6mqcy0fl3wvpn4laj1cllsg80dxnv0gssjz6q836z5f";
16+ sha256 = "1a1ymbgkp8ngrkf7cfjrn56zb9qz1mm1j1pmd60g85ln7nyb4ai1";
1717 };
1818
1919 kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ];
pkgs/os-specific/linux/kernel/linux-5.4.nix+2−2
@@ -3,7 +3,7 @@
33with lib;
44
55buildLinux (args // rec {
6− version = "5.4.126";
6+ version = "5.4.127";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,7 +13,7 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
16− sha256 = "0xsjcdgiix8slykzi9c12pl5hk2fnz1bqrxxdcr79d9nmfc7kzf7";
16+ sha256 = "1gr89x1ymxaslp9fqcchaa7939yvhxy67z3pgskmx6z2vrd9pgd0";
1717 };
1818
1919 kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];
pkgs/os-specific/linux/kernel/linux-libre.nix+2−2
@@ -1,8 +1,8 @@
11{ stdenv, lib, fetchsvn, linux
22, scripts ? fetchsvn {
33 url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
4− rev = "18115";
5− sha256 = "00wsxlhz7lc4qk7jcgshb05hvv3mm4m8r3zalc9wvp4r1r6xbbjp";
4+ rev = "18132";
5+ sha256 = "01mgpfx5cddq4bgffydkxpm3xlgf7zfjr1c1icsyn7f2pibd114q";
66 }
77, ...
88}:
pkgs/os-specific/linux/kernel/patches.nix+9
@@ -102,4 +102,13 @@
102102 name = "mac_nvme_t2";
103103 patch = ./mac-nvme-t2.patch;
104104 };
105+
106+ rtnetlink_fix_regression_in_bridge_vlan_configuration = rec {
107+ name = "rtnetlink_fix_regression_in_bridge_vlan_configuration";
108+ patch = fetchpatch {
109+ name = name + ".patch";
110+ url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=d2e381c4963663bca6f30c3b996fa4dbafe8fcb5";
111+ sha256 = "0ragdi13yh5ypp9x49vrdjqx8ddh7sq7i1qjp8fyrbk3n0jdaac3";
112+ };
113+ };
105114}
pkgs/top-level/all-packages.nix+4
@@ -20681,6 +20681,7 @@ in
2068120681 kernelPatches.bridge_stp_helper
2068220682 kernelPatches.request_key_helper
2068320683 kernelPatches.rtl8761b_support
20684+ kernelPatches.rtnetlink_fix_regression_in_bridge_vlan_configuration
2068420685 ];
2068520686 };
2068620687
@@ -20695,6 +20696,7 @@ in
2069520696 kernelPatches = [
2069620697 kernelPatches.bridge_stp_helper
2069720698 kernelPatches.request_key_helper
20699+ kernelPatches.rtnetlink_fix_regression_in_bridge_vlan_configuration
2069820700 ];
2069920701 };
2070020702
@@ -20702,6 +20704,7 @@ in
2070220704 kernelPatches = [
2070320705 kernelPatches.bridge_stp_helper
2070420706 kernelPatches.request_key_helper
20707+ kernelPatches.rtnetlink_fix_regression_in_bridge_vlan_configuration
2070520708 ];
2070620709 };
2070720710
@@ -20761,6 +20764,7 @@ in
2076120764 kernelPatches = [
2076220765 kernelPatches.bridge_stp_helper
2076320766 kernelPatches.request_key_helper
20767+ kernelPatches.rtnetlink_fix_regression_in_bridge_vlan_configuration
2076420768 ];
2076520769 };
2076620770