From 1395fb557301cf4b9bc0642c3ef8eea306c3af22 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 3 Sep 2021 06:52:50 -0400 Subject: [PATCH 01/10] linux: 4.14.245 -> 4.14.246 (cherry picked from commit b9c9f0a21176ea16301b96c07cd0418a0af6c64c) --- 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 0b44d039a81..260c0e8978f 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.245"; + version = "4.14.246"; # 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 = "085jls7b2rzxlmvp0zsp4l3wi5xdrqlv2qczzwvbhzna1f4n2x0d"; + sha256 = "0fpgig84shpas1jc0h4s3aw9brkcq1as84gjbk4bfhc48bpi4mlw"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; From 8155bbc8e64e712a3a661a2b0e4a470d432033df Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 3 Sep 2021 06:53:01 -0400 Subject: [PATCH 02/10] linux: 4.19.205 -> 4.19.206 (cherry picked from commit 84b31619da46908c6c8b2f5ca8a641edb101f037) --- 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 14712c47e83..b212cea7924 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.205"; + version = "4.19.206"; # 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 = "1ii9l44d6jxhyd5qkc5h83ixailma9v7hyl60wi3rskkafqnwv2m"; + sha256 = "1h44lvzxd0cngj71bk8qba9dz7jlqj68ir6xjwfafglb81ppgsxp"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; From 628efd91543704f1a604316026648f2512dcd1e1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 3 Sep 2021 06:53:07 -0400 Subject: [PATCH 03/10] linux: 4.4.282 -> 4.4.283 (cherry picked from commit adae328a3b8f95c7ca412ff454d5d9ccc99a79bd) --- 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 eafef9a7556..2d6143bdbb8 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.282"; + version = "4.4.283"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1rgxznjb6gsi64wk7x2rylyi64y2nx5yiah5gfm40c6l2f7lb9cc"; + sha256 = "1d9v4h4cbc4i371lhhwpxbmg88gna6xyi2ahfvv0clz60802y982"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; From 80fd0c5fb31052445c5c3cde2b739b9ba6ebd6e1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 3 Sep 2021 06:53:12 -0400 Subject: [PATCH 04/10] linux: 4.9.281 -> 4.9.282 (cherry picked from commit 59f9cc8f99acfa23479f146167b6005ef9e7229b) --- 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 71ea75253d6..2f36c1784e2 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.281"; + version = "4.9.282"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1dg70jv3bqanmjs31s0x2p7nd5g37bqzjn9rc1y6wvkgm4pwahi6"; + sha256 = "059fin4si93ya13xy831w84q496ksxidpd3kyw38918sfy4p6wk7"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; From 06bdbe3a2b259839d6c1d0f7bdd8b4cc383614cc Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 3 Sep 2021 06:53:20 -0400 Subject: [PATCH 05/10] linux: 5.10.61 -> 5.10.62 (cherry picked from commit 777135f8a00a1f2780cbb793335401cb24e0342c) --- 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 96b46750ac0..b72e2e2c66e 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.61"; + version = "5.10.62"; # 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 = "1lci78584c0rg5m5rkylssppnv001pzh4769m9mds4fdqn6f7sl2"; + sha256 = "1cc6z2xzi1s69805jk4f91iarx19v0yyqvssx1f1mc0l9l1db389"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; From ce9fcd89ab42332ccf0cb5e19a43240f1fbb2616 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 3 Sep 2021 06:53:27 -0400 Subject: [PATCH 06/10] linux: 5.13.13 -> 5.13.14 (cherry picked from commit ff64785c049beaaa8b1c16d5ffe322ea8d68bb62) --- pkgs/os-specific/linux/kernel/linux-5.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix index 8e651c0dc2c..d02a23c0c74 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.13"; + version = "5.13.14"; # 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 = "0d1lr3rivgf9j3bn2a9hpzdf74nq8kybf3rfxxvw68vr1hhd4cam"; + sha256 = "06lbjsbr86qa8yai5gfclbfxvcqsw33kxj9b4r93hh6z1wajmx82"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; From 7495560f0c91ac5b9eca947e1459115df6077e61 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 3 Sep 2021 06:53:35 -0400 Subject: [PATCH 07/10] linux: 5.14 -> 5.14.1 (cherry picked from commit a91cc86d2991e661e2c53a64389be540f9da7704) --- 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 e6a76146ce7..a16b35f55cb 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"; + version = "5.14.1"; # 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 = "1cki6af9r30k8820j73qdyycp23mwpf2a2rjwl82p9i61mg8n1ky"; + sha256 = "1iq8s031fviccc4710biwl7gxqdimm3nhlvxd0m3fykvhhmcanq0"; }; } // (args.argsOverride or { })) From 678b3c6bfcb1f677b33a80953db95610162cbd61 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 3 Sep 2021 06:53:41 -0400 Subject: [PATCH 08/10] linux: 5.4.143 -> 5.4.144 (cherry picked from commit c9a4ef4d58df21ae1690258d0ca14d46b8119617) --- 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 85db83189fd..6188ff2a382 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.143"; + version = "5.4.144"; # 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 = "090x087p8hxnc1daf2xwj7vg8hg1jhz5i4andkbhdy550l5nalq9"; + sha256 = "11aqp12xwbg7ysac3f9iaxwkhvasdg9bw4r43jj8af5bf61bjhxw"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; From de0bb1fd9df78b15c8a90b3324e49e01bad6fc53 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 3 Sep 2021 06:53:51 -0400 Subject: [PATCH 09/10] linux-rt_5_4: 5.4.138-rt62 -> 5.4.143-rt63 (cherry picked from commit 1ed0214d01662e2c8d22ef5bcc0fda1c7422e94c) --- pkgs/os-specific/linux/kernel/linux-rt-5.4.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index b1fcfd0da0a..7a1a4203cd8 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.138-rt62"; # updated by ./update-rt.sh + version = "5.4.143-rt63"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "0mw6k9zrcmv1j4b3han5c0q8xbh38bka2wkkbl1y3ralg9r5ffd4"; + sha256 = "090x087p8hxnc1daf2xwj7vg8hg1jhz5i4andkbhdy550l5nalq9"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1zw7806fxx9cai9n6siv534x5r52d8fc13r07ypgw461pijcy5p6"; + sha256 = "13d9sx6vw3hlh0cpccfsfqkjj6yfjmbh4wp4x6ry84i39lrfbwg3"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; From 36d8ad8d21f2864d5244c072e7878c2919016635 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 3 Sep 2021 06:54:11 -0400 Subject: [PATCH 10/10] linux_latest-libre: 18268 -> 18298 (cherry picked from commit 6dfc0ee85005e8160ad643f4e7da32ad052b9f92) --- 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 91134e18a8a..3642dfe442d 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 = "18268"; - sha256 = "050rk485csj41yfydr1cvn60vhb3lzbb3486sm832vp55d34i8fd"; + rev = "18298"; + sha256 = "027fp6h7295cc9m5g46phqd6hixcnvihpfsyrnzvsxz6pkvjzpw4"; } , ... }: