From aa4ed96e5414f241875c16080ea3bd86ae68f6e4 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 12 Jul 2023 08:57:40 +1000 Subject: [PATCH 01/18] go_1_19: 1.19.10 -> 1.19.11 Changelog: https://go.dev/doc/devel/release#go1.19 (cherry picked from commit 1b1738d30abfa815598389f4f0591a7b8507a293) --- pkgs/development/compilers/go/1.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.19.nix b/pkgs/development/compilers/go/1.19.nix index 3e25ed128619..53da9af55357 100644 --- a/pkgs/development/compilers/go/1.19.nix +++ b/pkgs/development/compilers/go/1.19.nix @@ -47,11 +47,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.19.10"; + version = "1.19.11"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - hash = "sha256-E3VbzOUpdH1fKTDe4DRzDIbQK9PlIas+K77eVI07lT8="; + hash = "sha256-4lyaty2BEUK39B/22lFl/sLRvl/uw+8sZrwL3stDFIk="; }; strictDeps = true; From dc969314d833554b870ee822c5cae8d54870cccd Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 2 Aug 2023 09:17:02 +1000 Subject: [PATCH 02/18] go_1_19: 1.19.11 -> 1.19.12 Changelog: https://go.dev/doc/devel/release#go1.19 (cherry picked from commit fa88f4a8be9f07dba272894a2ddbdd57e9f5b204) --- pkgs/development/compilers/go/1.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.19.nix b/pkgs/development/compilers/go/1.19.nix index 53da9af55357..0ce8fcc659a8 100644 --- a/pkgs/development/compilers/go/1.19.nix +++ b/pkgs/development/compilers/go/1.19.nix @@ -47,11 +47,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.19.11"; + version = "1.19.12"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - hash = "sha256-4lyaty2BEUK39B/22lFl/sLRvl/uw+8sZrwL3stDFIk="; + hash = "sha256-7l1Q4Kf9dLobE3y4eWCaqu+YgL9ytdF0IQDjiucrtVc="; }; strictDeps = true; From ae4d1b5ed21a6e806b343289cf1829950b81d299 Mon Sep 17 00:00:00 2001 From: Sergei Lukianov Date: Thu, 20 Jul 2023 13:59:59 -0700 Subject: [PATCH 03/18] unpoller: 2.7.14 -> 2.7.20 (cherry picked from commit f8b4de3f94e1bbdc2162318de9f9481ca1918221) --- pkgs/servers/monitoring/unpoller/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/unpoller/default.nix b/pkgs/servers/monitoring/unpoller/default.nix index 65d8b960781b..973ed9535cd8 100644 --- a/pkgs/servers/monitoring/unpoller/default.nix +++ b/pkgs/servers/monitoring/unpoller/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "unpoller"; - version = "2.7.14"; + version = "2.7.20"; src = fetchFromGitHub { owner = "unpoller"; repo = "unpoller"; rev = "v${version}"; - hash = "sha256-rIAqR13TKHv4i7n8s7QehFlU4C3z/Cgw8lQaKFZcCt0="; + hash = "sha256-6uH437q3a77c+7tH7VdYmdON+M7z4gqY/Wvj1XyT9c8="; }; - vendorHash = "sha256-fPUwMQQK8D0FA/X4E0yFEIP2ZO0iwyVapYctGCKyMjk="; + vendorHash = "sha256-XclpyB1IBKD/ALn0nbmTugiVlf5GCca+NF2/7uVTHKs="; ldflags = [ "-w" "-s" From bb37e12b564e32a9ce0d0241eb5e718bdb95b625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 6 Aug 2023 11:39:16 -0700 Subject: [PATCH 04/18] bzip3: 1.3.1 -> 1.3.2 Diff: https://github.com/kspalaiologos/bzip3/compare/1.3.1...1.3.2 Changelog: https://github.com/kspalaiologos/bzip3/blob/1.3.2/NEWS (cherry picked from commit 45d23095bbe50d201cc0220ea36107d001ea2f23) --- pkgs/tools/compression/bzip3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/bzip3/default.nix b/pkgs/tools/compression/bzip3/default.nix index 07f738ba6d90..6e21a352d06f 100644 --- a/pkgs/tools/compression/bzip3/default.nix +++ b/pkgs/tools/compression/bzip3/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "bzip3"; - version = "1.3.1"; + version = "1.3.2"; outputs = [ "bin" "dev" "out" ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "kspalaiologos"; repo = "bzip3"; rev = finalAttrs.version; - hash = "sha256-9yUd6FnobJEH/L5X4WMJFb9yLkJH9b8MAyhU2Wdtfig="; + hash = "sha256-nSmKpOwlbxbUN2TJwsS2CFP5UV2ODOKXFHAUsCje7mc="; }; postPatch = '' From 8fa39adf946a4470610b38fd7aff0a73ad4356c3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 7 Aug 2023 20:59:05 +0000 Subject: [PATCH 05/18] weston: 11.0.2 -> 11.0.3 --- pkgs/applications/window-managers/weston/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 13dd27e93865..e1b604f4a895 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "weston"; - version = "11.0.2"; + version = "11.0.3"; src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz"; - hash = "sha256-ckB1LO8LfeYiuvi9U0jmP8axnwLvgklhsq3Rd9llKVI="; + hash = "sha256-1VNLxwPy96aVuRSPvaqevFm1VAXVsD0ya4063frK5wc="; }; depsBuildBuild = [ pkg-config ]; From e2573c86d838ee20535c121353092facd87b941a Mon Sep 17 00:00:00 2001 From: r-vdp Date: Sun, 23 Jul 2023 15:32:15 +0200 Subject: [PATCH 06/18] nixos/nix-channel: fix editorconfig warnings and apply nixpkgs-fmt (cherry picked from commit 668e2dafb6b1aa2d57cd438979ad25b98d5e5764) --- nixos/modules/config/nix-channel.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/config/nix-channel.nix b/nixos/modules/config/nix-channel.nix index 5eb6e6883968..bac3969bcc03 100644 --- a/nixos/modules/config/nix-channel.nix +++ b/nixos/modules/config/nix-channel.nix @@ -3,8 +3,8 @@ configuration to work. See also - - ./nix.nix - - ./nix-flakes.nix + - ./nix.nix + - ./nix-flakes.nix */ { config, lib, ... }: let @@ -28,9 +28,9 @@ in Whether the `nix-channel` command and state files are made available on the machine. The following files are initialized when enabled: - - `/nix/var/nix/profiles/per-user/root/channels` - - `/root/.nix-channels` - - `$HOME/.nix-defexpr/channels` (on login) + - `/nix/var/nix/profiles/per-user/root/channels` + - `/root/.nix-channels` + - `$HOME/.nix-defexpr/channels` (on login) Disabling this option will not remove the state files from the system. ''; @@ -48,7 +48,7 @@ in "nixos-config=/etc/nixos/configuration.nix" "/nix/var/nix/profiles/per-user/root/channels" ] - else []; + else [ ]; defaultText = '' if nix.channel.enable then [ From 5b9258b84dda6db8eff1510b85fa16813116c7aa Mon Sep 17 00:00:00 2001 From: r-vdp Date: Sun, 23 Jul 2023 15:33:50 +0200 Subject: [PATCH 07/18] nixos/nix-channel: only try to remove the nix-channel binary if it exists It may not be there if `system.disableInstallerTools = true`. (cherry picked from commit b825f65c90107d5ae49cb5fdcd0c52532f60fc42) --- nixos/modules/config/nix-channel.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/nix-channel.nix b/nixos/modules/config/nix-channel.nix index bac3969bcc03..fead36e3f43d 100644 --- a/nixos/modules/config/nix-channel.nix +++ b/nixos/modules/config/nix-channel.nix @@ -86,7 +86,7 @@ in ''; environment.extraSetup = mkIf (!cfg.channel.enable) '' - rm $out/bin/nix-channel + rm --force $out/bin/nix-channel ''; # NIX_PATH has a non-empty default according to Nix docs, so we don't unset From 13079f1cf1af0b173196837766ab5e3d61716293 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 31 Jul 2023 23:50:32 +0100 Subject: [PATCH 08/18] wolfssl: add patch for CVE-2023-3724 --- .../wolfssl/5.5.4-CVE-2023-3724.patch | 40 +++++++++++++++++++ .../development/libraries/wolfssl/default.nix | 4 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/libraries/wolfssl/5.5.4-CVE-2023-3724.patch diff --git a/pkgs/development/libraries/wolfssl/5.5.4-CVE-2023-3724.patch b/pkgs/development/libraries/wolfssl/5.5.4-CVE-2023-3724.patch new file mode 100644 index 000000000000..dc057a5b5deb --- /dev/null +++ b/pkgs/development/libraries/wolfssl/5.5.4-CVE-2023-3724.patch @@ -0,0 +1,40 @@ +based on upstream 00f1eddee429ff51390b20caadd2eb6afe51e1aa with +minor adjustments to apply to 5.5.4 + +diff --git a/src/tls.c b/src/tls.c +index 27c1002b2..f8a9aaa48 100644 +--- a/src/tls.c ++++ b/src/tls.c +@@ -8346,6 +8346,9 @@ static int TLSX_KeyShare_Parse(WOLFSSL* ssl, const byte* input, word16 length, + if (!WOLFSSL_NAMED_GROUP_IS_PQC(group)) + #endif + ret = TLSX_KeyShare_Use(ssl, group, 0, NULL, NULL); ++ ++ if (ret == 0) ++ ssl->session->namedGroup = ssl->namedGroup = group; + } + else { + /* Not a message type that is allowed to have this extension. */ +diff --git a/src/tls13.c b/src/tls13.c +index 42eb7ffce..194870a69 100644 +--- a/src/tls13.c ++++ b/src/tls13.c +@@ -4725,8 +4725,18 @@ int DoTls13ServerHello(WOLFSSL* ssl, const byte* input, word32* inOutIdx, + } + #endif + ++ /* sanity check on PSK / KSE */ ++ if ( ++ #if defined(HAVE_SESSION_TICKET) || !defined(NO_PSK) ++ ssl->options.pskNegotiated == 0 && ++ #endif ++ ssl->session->namedGroup == 0) { ++ return EXT_MISSING; ++ } ++ + ssl->keys.encryptionOn = 1; + ssl->options.serverState = SERVER_HELLO_COMPLETE; ++ + } + else { + ssl->options.tls1_3 = 1; diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index b77ec4d3c4a8..314a5a01a50b 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { hash = "sha256-sR/Gjk50kLej5oJzDH1I6/V+7OIRiwtyeg5tEE3fmHk="; }; + patches = [ + ./5.5.4-CVE-2023-3724.patch + ]; + postPatch = '' patchShebangs ./scripts # ocsp tests require network access From 9f1b26bbce4e7224b9a79ed39278c3601137adfe Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 7 Aug 2023 21:45:54 +0200 Subject: [PATCH 09/18] nixVersions.nix_2_13: 2.13.3 -> 2.13.5 (cherry picked from commit 94f1579e7a92ff7f1fdfcb887d94597cbe97f509) --- pkgs/tools/package-management/nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 5b147799089e..6c77ec5bcd5e 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -168,8 +168,8 @@ in lib.makeExtensible (self: { }; nix_2_13 = common { - version = "2.13.3"; - hash = "sha256-jUc2ccTR8f6MGY2pUKgujm+lxSPNGm/ZAP+toX+nMNc="; + version = "2.13.5"; + hash = "sha256-yHZMgMs/6/aQUwfMwmPUQov17JMGS7squLJsjmucnLc="; }; nix_2_14 = common { From 9552f50977c6256b916df5f64a1d0b061fedb43d Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 9 Aug 2023 00:14:44 +0300 Subject: [PATCH 10/18] linux: 4.14.320 -> 4.14.321 (cherry picked from commit a830274227831bbfd30bff721f9afdb00d36e23e) --- 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 5d759c36acfe..b285ab30f342 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.320"; + version = "4.14.321"; # 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/v4.x/linux-${version}.tar.xz"; - sha256 = "09bn18jvazkc55bqdjbxy8fbca7vjhi9xl2h02w0sq3f1jf6g0pd"; + sha256 = "058p6ba24gx0q1fxyf5gnbnl49r82iaz97z01h7c4z2lgba2pqyh"; }; } // (args.argsOverride or {})) From 26f610c3c692f70c987bf6d6161bbccb1c14441d Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 9 Aug 2023 00:14:50 +0300 Subject: [PATCH 11/18] linux: 4.19.289 -> 4.19.290 (cherry picked from commit 95d474560de9e6a93c9a80b4a57bbddb5c90ae18) --- 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 e71cdee98da8..938a790abaeb 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.289"; + version = "4.19.290"; # 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/v4.x/linux-${version}.tar.xz"; - sha256 = "1cx33aa9v2071gixvp68pqpp4vxcx61dqg04rf6xns1qg48p93qi"; + sha256 = "1kqflbf78aamnbdc2v973qk9ymignl1cy6q0rpw865brgm5y59cz"; }; } // (args.argsOverride or {})) From b93c2424c3eedb473dd4c935eef0420d76dacee0 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 9 Aug 2023 00:14:55 +0300 Subject: [PATCH 12/18] linux: 5.10.188 -> 5.10.189 (cherry picked from commit 80497c6b01d50b05242ca755678bb5eb8dbfdef9) --- 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 a6baeaac8901..3ef8b3238ac0 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.188"; + version = "5.10.189"; # 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/v5.x/linux-${version}.tar.xz"; - sha256 = "04k1mc23vqv3mr4m80rab1w7z1cwc0n1kcxzc5vfcfp26nmqnmf9"; + sha256 = "1jcqj0yh8k81a02y8wq1psy109w9s0r5j5zgm8gmf5ylw5m520sc"; }; } // (args.argsOverride or {})) From fdc8c6e18c159c86068582d8d71a7b7b4b93a509 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 9 Aug 2023 00:14:59 +0300 Subject: [PATCH 13/18] linux: 5.15.124 -> 5.15.125 (cherry picked from commit ab4872bd8d6c8d72315b8edc97ff744d18b3624f) --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index f57635d8a2a0..ec49d21fab7f 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.124"; + version = "5.15.125"; # 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/v5.x/linux-${version}.tar.xz"; - sha256 = "1v927z1grqwcwj6769qm14828fzjzi58lsd86al2l0ddc016l0q0"; + sha256 = "1izyv1ibiy4dapwb8745dshfbb9b6xqyz77l6mhkmlkcnx33h3qm"; }; } // (args.argsOverride or { })) From 29deadcc068d7e15c6a14ba2966ee699310b1f80 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 9 Aug 2023 00:15:04 +0300 Subject: [PATCH 14/18] linux: 5.4.251 -> 5.4.252 (cherry picked from commit ffb73b8a9dcf9c6a89e1b2ba2ab50b7e806c8c32) --- 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 5f3afdab8c2e..eda901585455 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.251"; + version = "5.4.252"; # 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/v5.x/linux-${version}.tar.xz"; - sha256 = "1jhqnazgiyz1vvrhnq5byl3h1mxrr3555fpiz4byycc1sqz9bd5w"; + sha256 = "0rw2b1rr3rb5498rv1zmj0ml3p67awrvd2ch66kp80wl4dsmhy1s"; }; } // (args.argsOverride or {})) From 7e405b8e0de140c5726cf8ade86a8bc4643ef7c6 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 9 Aug 2023 00:15:09 +0300 Subject: [PATCH 15/18] linux: 6.1.43 -> 6.1.44 (cherry picked from commit 9eab5c9b9e9a2b107bb86e5bb835fef6b3caf9c2) --- pkgs/os-specific/linux/kernel/linux-6.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index a99218168a63..92692d57af03 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.43"; + version = "6.1.44"; # 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 = "02588pl1z8jxgxpa03rsdyg5pr0r3v0aylzp8r5ykm32193lhli4"; + sha256 = "19d1fdvdp8lc5mvlcawd8hcpzjh7pdr5gq6fczhjl20xw4gx8l9f"; }; } // (args.argsOverride or { })) From a57ffb92bea9dc441889d6d3467b43fe7630c107 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 9 Aug 2023 00:15:14 +0300 Subject: [PATCH 16/18] linux: 6.4.8 -> 6.4.9 (cherry picked from commit 59d581a608b2d930d241b0c93cc87013b47baaf5) --- pkgs/os-specific/linux/kernel/linux-6.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.4.nix b/pkgs/os-specific/linux/kernel/linux-6.4.nix index f7b043939d20..47e927fb39b1 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.4.8"; + version = "6.4.9"; # 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 = "1djqqhw542jphqsicpbn1259sgw9pwd08wwkdch31nw4kvhk97y5"; + sha256 = "17ycanx738bgxg5wn536kbad4zzvj5ngygp9qhvz76draaca5f5q"; }; } // (args.argsOverride or { })) From a670ba67a3d98e41332f2dd14b0e09d78dccb114 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 21 Jun 2023 14:04:56 +0200 Subject: [PATCH 17/18] microcodeIntel: 20230512 -> 20230613 (cherry picked from commit 8ceb0d1da30d6108473d194dce0eb296b54d31f2) --- pkgs/os-specific/linux/microcode/intel.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index cd11bcb9e210..03c8300dbfc8 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20230512"; + version = "20230613"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - hash = "sha256-Ay907cXbT+LlE4foK4TODcDB5Rx/Zo7HY17erem71rw="; + hash = "sha256-tP59wfZHCLwPb2FkHaa+0D4RW1Zmu9vKaIgbveP/nLI="; }; nativeBuildInputs = [ iucode-tool libarchive ]; From 075da329fb2f6b484ec2e2788c0b2e18a80ebee0 Mon Sep 17 00:00:00 2001 From: networkException Date: Tue, 8 Aug 2023 20:20:11 +0200 Subject: [PATCH 18/18] microcodeIntel: 20230613 -> 20230808 (cherry picked from commit 9454516b8ce9854db6b53809636db490b1f3ce5f) --- pkgs/os-specific/linux/microcode/intel.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index 03c8300dbfc8..b58d471680b5 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20230613"; + version = "20230808"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - hash = "sha256-tP59wfZHCLwPb2FkHaa+0D4RW1Zmu9vKaIgbveP/nLI="; + hash = "sha256-xyb4FUV7vG2YSuN4H6eBaf8c4At70NZiUuepbgg2HNg="; }; nativeBuildInputs = [ iucode-tool libarchive ];