From 5f80692d2568cfaae1e147b6f0a2f02b67796a76 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 7 Sep 2021 12:26:22 -0400 Subject: [PATCH 01/15] linux_latest-libre: 18298 -> 18314 (cherry picked from commit 6a6ff4d0d8d04d1e4fac847fdf78071838143847) --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 3642dfe442d..d9f8912416a 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18298"; - sha256 = "027fp6h7295cc9m5g46phqd6hixcnvihpfsyrnzvsxz6pkvjzpw4"; + rev = "18314"; + sha256 = "0fic073zafwdsw7i0j4z57a4aknk8kpgnbrxpbi181n5axdlm99k"; } , ... }: From 1b86320ebbe0fbfd09204872861f47b84e2ae86b Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:04:35 +0000 Subject: [PATCH 02/15] linux: 4.14.249 -> 4.14.250 (cherry picked from commit ac66a2835c4d62a6a85aef9db9264fa0f328b757) --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 5ac9f9e664d..83952ef93c8 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.249"; + version = "4.14.250"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0wn4yw9fliw3a8knvj2hdprbyyx7akm9ycclr2y1whpa5gmrc3rj"; + sha256 = "0zbf6gxm8iwf7cra310gfd0zyj8l9ckdahky9w6wb9wlznwkvd54"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; From 90928280cf375805b791027b9a2550d73b1f64db Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:04:39 +0000 Subject: [PATCH 03/15] linux: 4.19.209 -> 4.19.210 (cherry picked from commit 4d1cd369c8483f1b2c20c461546e13e40427649a) --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 65d5db46f27..044b89f1485 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.209"; + version = "4.19.210"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "04z9hxgqw2p86xxi2667kaj2w99xxxiw9gn9i1217c305swxa9vk"; + sha256 = "0cv126j4sghwgzjm9p5l1brcnxkbgggja2ai37gl8m2s99cj59wv"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; From c52a6ac10926522e9cef8dbe2881a02a49052c8e Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:04:44 +0000 Subject: [PATCH 04/15] linux: 4.4.287 -> 4.4.288 (cherry picked from commit 97f30440d94dfa35521108e6fd263053b4710069) --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 32bf8aa0fa9..1d31d43458f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.287"; + version = "4.4.288"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0qraild006in01vsqbhx1lf585g34skzwi2m3hv3kal8s03q0gzw"; + sha256 = "028w3yzmzymy7l1nf3n1pfbg95hfi4ilphkyl00ddgj8sfm542c7"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; From c4e43b9b47cefba5185bbfe3e5cdb06dc3a2c6ba Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:04:50 +0000 Subject: [PATCH 05/15] linux: 4.9.285 -> 4.9.286 (cherry picked from commit 049968322bc63cccbbebe400dddfed022c103e28) --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 0955733520d..0ebcfe090f6 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.285"; + version = "4.9.286"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1hkkk4mhr5qnrhwqcz0b20rff6j8pnwd868a5hsq8s867pa24ajb"; + sha256 = "0id62p43dmkl9ir278p0dsfg3q7m1d8rlxv0c9qi1pzalkygv8p2"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; From 604d9d9d7a36303050a60507c6e14768069dd500 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:04:56 +0000 Subject: [PATCH 06/15] linux: 5.10.71 -> 5.10.72 (cherry picked from commit 2363ead00306ec8ff8e34ac8b855b4f81af00dfc) --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index eef7f3f9643..438e7b80086 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.71"; + version = "5.10.72"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "15x4jbwy6j78ss31avdl7nr0mw4w6a1y6c6dyljh6gwngp98irh2"; + sha256 = "0z2cp8gqnbv7iz8kb5ydfmk019m0gds8wwvwc6kccsk4wypkbmml"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From 7a53e53cd2bf89861f617418448e3c1b96d90e81 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:05:03 +0000 Subject: [PATCH 07/15] linux: 5.14.10 -> 5.14.11 (cherry picked from commit e2be686e0a24e791ceb9a3b806aa949102bb344e) --- pkgs/os-specific/linux/kernel/linux-5.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.14.nix b/pkgs/os-specific/linux/kernel/linux-5.14.nix index c0864239133..465a3f82d51 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.14.10"; + version = "5.14.11"; # 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 = "1n454038vp55wbi814fqpidjmk8k6p6h0jl07hknpd6imgh2bkj5"; + sha256 = "0capilz3wx29pw7n2m5cn229vy9psrccmdspp27znhjkvwj0m0wk"; }; } // (args.argsOverride or { })) From df541aa447e8df8b5440c1a231c6145a349750e0 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:05:11 +0000 Subject: [PATCH 08/15] linux: 5.4.151 -> 5.4.152 (cherry picked from commit 1d14ebf4140eebcb6a5c956b0a6fe6a513260c30) --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 6e3a51237b1..d8874307deb 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.151"; + version = "5.4.152"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "04rkymyg79mp1frdlkizc7k33palplmnnnz8klkag9ii7jw3zrxv"; + sha256 = "1may19d47d06mplpk29dpjsq31sxk8wwbwb2jspj3vay9h9wfi40"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From b522d3a1931bf25260ee32df945a65ead38cba40 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:07:49 +0000 Subject: [PATCH 09/15] linux_latest-libre: 18314 -> 18380 (cherry picked from commit 86589e8cd38e73ca655aef4f363cb06b946102bb) --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index d9f8912416a..d8d9edcf4af 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18314"; - sha256 = "0fic073zafwdsw7i0j4z57a4aknk8kpgnbrxpbi181n5axdlm99k"; + rev = "18380"; + sha256 = "0sg7mnxqzc5zdnl8l7gfy1kc52w7c85fdhywvdbjgs7inx2bb1qd"; } , ... }: From 2a46e86ddc5864e06add3349ad4652dcad1d1ad2 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:08:09 +0000 Subject: [PATCH 10/15] linux/hardened/patches/4.14: 4.14.248-hardened1 -> 4.14.250-hardened1 (cherry picked from commit 6e94404dc33f7ad6fc491ed6fe6fcc0e5f23611c) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 6b9aaccadd3..7b427f604f4 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,9 +1,9 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.248-hardened1.patch", - "sha256": "1lwqlpd21f8rwqfyz61083w0lg2bjzdjf7rzrqxsw1jz0l879035", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.248-hardened1/linux-hardened-4.14.248-hardened1.patch" + "name": "linux-hardened-4.14.250-hardened1.patch", + "sha256": "1jgqmrj5djapvk56jwlfq181knhywzrk9cswv1lp5y2jwnnvlj9x", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.250-hardened1/linux-hardened-4.14.250-hardened1.patch" }, "4.19": { "extra": "-hardened1", From 80f26c622dc19d3a3e27cd74ea679ba7683f5fbd Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:08:10 +0000 Subject: [PATCH 11/15] linux/hardened/patches/4.19: 4.19.208-hardened1 -> 4.19.210-hardened1 (cherry picked from commit 8df94e6d31232545ae83cc6cc44f210810234774) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 7b427f604f4..ef544669446 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -7,9 +7,9 @@ }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.208-hardened1.patch", - "sha256": "0bg45n1kgd628gwjkp1vxslxyci6589ygy9mmmhpl7kj3y7370ck", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.208-hardened1/linux-hardened-4.19.208-hardened1.patch" + "name": "linux-hardened-4.19.210-hardened1.patch", + "sha256": "0lnv0ym6jcf460hsn26lax65n2yb1vvzsfmckaz04jb2kdgm6hr5", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.210-hardened1/linux-hardened-4.19.210-hardened1.patch" }, "5.10": { "extra": "-hardened1", From c6b4f1cb247b05e8e7b143f3cf3e6358203f1150 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:08:11 +0000 Subject: [PATCH 12/15] linux/hardened/patches/5.10: 5.10.70-hardened1 -> 5.10.72-hardened1 (cherry picked from commit 42dd28857d8eaddaca3e36b23f6ee7e3d6f98181) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index ef544669446..55a2fce8244 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,9 +13,9 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.70-hardened1.patch", - "sha256": "12r6x7v7n3f7c7pn86ivykg6gqmqlzwrsncdkvj5qf7raw38ad5r", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.70-hardened1/linux-hardened-5.10.70-hardened1.patch" + "name": "linux-hardened-5.10.72-hardened1.patch", + "sha256": "14zchx1hc4jrq7prv4kkswjnmyqv74wfkjvky57scc8yl04yaqs6", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.72-hardened1/linux-hardened-5.10.72-hardened1.patch" }, "5.14": { "extra": "-hardened1", From f753f63fe6ff26715468ad76fa60240115189273 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:08:12 +0000 Subject: [PATCH 13/15] linux/hardened/patches/5.14: 5.14.9-hardened1 -> 5.14.11-hardened1 (cherry picked from commit 331bb5fcecd7397cbcc86b26b3f014c1294fa78e) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 55a2fce8244..bc6cb947891 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -19,9 +19,9 @@ }, "5.14": { "extra": "-hardened1", - "name": "linux-hardened-5.14.9-hardened1.patch", - "sha256": "190588p6xw65y1f106zgnv5s043yi633vg0zdbz85qjz27g49db8", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.9-hardened1/linux-hardened-5.14.9-hardened1.patch" + "name": "linux-hardened-5.14.11-hardened1.patch", + "sha256": "05n74rnq5c2jx7iynxwgj5wypb0i0p3dar0ri2zxmyssasmbkfa7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.11-hardened1/linux-hardened-5.14.11-hardened1.patch" }, "5.4": { "extra": "-hardened1", From 0bf9a9ec4f4cea22a8fccabba588939490c09529 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 12 Oct 2021 04:08:13 +0000 Subject: [PATCH 14/15] linux/hardened/patches/5.4: 5.4.150-hardened1 -> 5.4.152-hardened1 (cherry picked from commit c7b05f54dff6c0a5775523035d3ee4111050229d) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index bc6cb947891..8e1902b61dc 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -25,8 +25,8 @@ }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.150-hardened1.patch", - "sha256": "0vaxp5lfs7d5py0530sdhz8yzbzjxlwaam63mflwfd4mm8gf3ggc", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.150-hardened1/linux-hardened-5.4.150-hardened1.patch" + "name": "linux-hardened-5.4.152-hardened1.patch", + "sha256": "01rf9za9sv14pxpi0pj1izq4bihhldi2qnhaka5rxlw7nifzzsj2", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.152-hardened1/linux-hardened-5.4.152-hardened1.patch" } } From f1e8a51254b159d9edf07dacbe7e6388f08833d1 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 16 Oct 2021 02:39:33 +0200 Subject: [PATCH 15/15] linux-libre: unbreak (cherry picked from commit a8498f08bf29c129d91978aaedf60877f0047553) --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index d8d9edcf4af..8ee8c663b3b 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -16,7 +16,7 @@ let in linux.override { argsOverride = { - modDirVersion = "${linux.modDirVersion}-gnu"; + modDirVersion = "${linux.modDirVersion}-gnu1"; isLibre = true; src = stdenv.mkDerivation { @@ -35,8 +35,6 @@ in linux.override { ''; }; - extraMeta.broken = true; - passthru.updateScript = ./update-libre.sh; maintainers = [ lib.maintainers.qyliss ];