From fe46a6842a33c216eba33b425ca638b6361f9046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 11 Dec 2024 18:11:50 +0100 Subject: [PATCH 01/11] thunderbird: 128.5.1esr -> 128.5.2esr https://www.thunderbird.net/en-US/thunderbird/128.5.2esr/releasenotes/ (cherry picked from commit 42d0f33125a4079d3290b953b7c8242be6c009e8) --- .../networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 1138f38f4b84..5d5768dcb55c 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -91,8 +91,8 @@ rec { }; thunderbird-128 = common { - version = "128.5.1esr"; - sha512 = "1dfa0752a1dbfc4d7516beab13e188aa40c145f2eb0554441ecc4dff739cc862c15fdfdd8c0cc026d010ba3caa57d6168da35e484c04989fb6c81f5c09215831"; + version = "128.5.2esr"; + sha512 = "cbfd4b1a7245c2a2f6ef9b2cf69d95a8095eba855755d00fd397351b21ad504733084d6f41801f4114be7015332b8db65e5290bec45f5321efc753412b9acecc"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-128"; From 6cc5d689086ffa2894153d2940e76bf6df3dba39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 11 Dec 2024 19:30:55 +0100 Subject: [PATCH 02/11] thunderbird-bin: 128.5.0esr -> 128.5.2esr https://www.thunderbird.net/en-US/thunderbird/128.5.1esr/releasenotes/ https://www.thunderbird.net/en-US/thunderbird/128.5.2esr/releasenotes/ (cherry picked from commit f29b68ce6a184ccdc6f25b95982c679436363425) --- .../browsers/firefox-bin/update.nix | 2 +- .../thunderbird-bin/release_sources.nix | 532 +++++++++--------- 2 files changed, 267 insertions(+), 267 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index 8d3ea28e46b3..3934fe5610ff 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -88,7 +88,7 @@ writeScript "update-${pname}" '' done done cat >> $tmpfile < Date: Thu, 12 Dec 2024 18:07:15 +0100 Subject: [PATCH 03/11] firefox-bin, thunderbird-bin: tweak updater's formatting This tiny change should make the result nixfmt-conformant. (cherry picked from commit 3067835b64aea64d029d989f9414141125d61f0c) --- pkgs/applications/networking/browsers/firefox-bin/update.nix | 3 ++- .../networking/mailreaders/thunderbird-bin/release_sources.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index 3934fe5610ff..6f8448a18a30 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -79,7 +79,8 @@ writeScript "update-${pname}" '' tr " " ":"`; do # create an entry for every locale cat >> $tmpfile < Date: Sun, 15 Dec 2024 10:41:28 +0300 Subject: [PATCH 04/11] linux_6_12: 6.12.4 -> 6.12.5 (cherry picked from commit c67ea06a6906a17e1f5c430bd1334402c260b15f) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index c9ccf5fb31ac..10baef63d5a5 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -32,7 +32,7 @@ "hash": "sha256:1z2913y38clnlmhvwj49h7p4pic24s4d8np7nmd4lk7m2xz8w532" }, "6.12": { - "version": "6.12.4", - "hash": "sha256:0lhisw9sy0b38j1nifcgjm8w9864qx3hg6b7f6z2311x8chzhdbg" + "version": "6.12.5", + "hash": "sha256:1k9bc0lpgg29bh7zqz3pm91hhjnfyl5aw6r6hph3ha743k77y81r" } } From 267281b79fcadb1f323420f44c8a78af3bb518ee Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 15 Dec 2024 10:43:15 +0300 Subject: [PATCH 05/11] linux_6_6: 6.6.64 -> 6.6.66 (cherry picked from commit 2a56fe1008377b77094dd11aef34ee8732942154) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 10baef63d5a5..863fc056f5cb 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -24,8 +24,8 @@ "hash": "sha256:0qj106lj554y1kdqj8kwyf7pk9bvrrpgz6s8zyh7d61mk7wws9sf" }, "6.6": { - "version": "6.6.64", - "hash": "sha256:1cbag4wzv5fpjdcl0rpp158ch1q17rfz2qxm1xjjyhnblqzxjpq6" + "version": "6.6.66", + "hash": "sha256:0lhy5waj330hmaxbqpfw2fxzkvvlxxs1nr325i8jy736qhvpjxcx" }, "6.11": { "version": "6.11.11", From 02003554cbd1c8c3a7c8ff6578b81d04ef24e445 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 15 Dec 2024 10:44:57 +0300 Subject: [PATCH 06/11] linux_6_1: 6.1.119 -> 6.1.120 (cherry picked from commit 784070fa3e133bbacbdb666e38b4c5a021b3bd8d) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 863fc056f5cb..c70beca29981 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:0ypnbp5k2xkfwk4xp5sfsgb3v29cjx278wwaa2csqpnki91hyhgp" }, "6.1": { - "version": "6.1.119", - "hash": "sha256:0y1j8bz99d5vkxklzpwhns5r77lpz2prszf6whfahi58s0wszkdf" + "version": "6.1.120", + "hash": "sha256:06gp5fdq0bc39hd8mf9mrdrygdybdr3nzsb58lcapf5vmjw9gjb1" }, "5.15": { "version": "5.15.173", From b1406ec21477eabf46e8efd140fcb48c6e24154d Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 15 Dec 2024 10:45:58 +0300 Subject: [PATCH 07/11] linux_5_15: 5.15.173 -> 5.15.174 (cherry picked from commit aa482da8e2b708821e9c4edfd48fb002baee35a4) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index c70beca29981..e32b05dd0d2e 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -8,8 +8,8 @@ "hash": "sha256:06gp5fdq0bc39hd8mf9mrdrygdybdr3nzsb58lcapf5vmjw9gjb1" }, "5.15": { - "version": "5.15.173", - "hash": "sha256:1a3x3ld6g7ny0hdfqfvj5j2i5sx5l5p236pdnsr0icn9ri3jljwa" + "version": "5.15.174", + "hash": "sha256:02kn9nvaa36s070k235lk9x6n40l2zlwj4v6i2y6nnx0cjw3rrn3" }, "5.10": { "version": "5.10.230", From 6b7ab2188cb5376e406ba3c612589c309c9f3d30 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 15 Dec 2024 10:47:33 +0300 Subject: [PATCH 08/11] linux_5_10: 5.10.230 -> 5.10.231 (cherry picked from commit f7a2da7fbf79ecf153ede4b0f52406bf88d318c6) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index e32b05dd0d2e..afddc32ace91 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -12,8 +12,8 @@ "hash": "sha256:02kn9nvaa36s070k235lk9x6n40l2zlwj4v6i2y6nnx0cjw3rrn3" }, "5.10": { - "version": "5.10.230", - "hash": "sha256:0isbb0ixqg4yzlh3lmdvnax4m1ikf2q4wk0b9vgqc63p7gpm066d" + "version": "5.10.231", + "hash": "sha256:0xcnlz5ib4b368z5cyp4qwys3jsbm18wlvwn73rzj2j6rj1lhnjn" }, "5.4": { "version": "5.4.286", From 56965d340adb63fc63f67a446140822785640ff1 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 15 Dec 2024 10:49:28 +0300 Subject: [PATCH 09/11] linux_5_4: 5.4.286 -> 5.4.287 (cherry picked from commit 29066c02380eaab007e501cfb36f03e1810e639d) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index afddc32ace91..444c60058681 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -16,8 +16,8 @@ "hash": "sha256:0xcnlz5ib4b368z5cyp4qwys3jsbm18wlvwn73rzj2j6rj1lhnjn" }, "5.4": { - "version": "5.4.286", - "hash": "sha256:0z48n7vahg318bgkccy8xqgl87vfb8zmn995cqh7z38fvzrm81qq" + "version": "5.4.287", + "hash": "sha256:082bq26bwi8jxfbk840wf9awm5l65aya4bg43im9qvqfpzjzl3qd" }, "4.19": { "version": "4.19.322", From e65a04903c7569881c340d22e1dc6a8096c6575a Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 14 Dec 2024 21:18:38 +0100 Subject: [PATCH 10/11] google-chrome: 131.0.6778.108/109 -> 131.0.6778.139/140 Fixes CVE-2024-12381 and CVE-2024-12382. https://chromereleases.googleblog.com/2024/12/stable-channel-update-for-desktop_10.html (cherry picked from commit 537c222c7eba8034416395086d4a080f009a9b25) --- pkgs/by-name/go/google-chrome/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 34d7fd8b856b..b5c6e4b952df 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -166,11 +166,11 @@ let linux = stdenv.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "131.0.6778.108"; + version = "131.0.6778.139"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-DU9qaMnn7gM/8VR4lsetWlkYu/Gs5+i/9JPYY2sbCi0="; + hash = "sha256-JEJnOawnz6BIXm+pbjz0u1BQOUwm+2hBCMh5NnN2aII="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -266,11 +266,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "131.0.6778.109"; + version = "131.0.6778.140"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/adhpt2otqvd2vrh5vbgwgtydt7gq_131.0.6778.109/GoogleChrome-131.0.6778.109.dmg"; - hash = "sha256-9pKGJa7UiDx1QPnWk0ONDQukUdRAPGz1PeYd7UoReoQ="; + url = "http://dl.google.com/release2/chrome/ijobeyqsjtnv35wplq3dh5ngae_131.0.6778.140/GoogleChrome-131.0.6778.140.dmg"; + hash = "sha256-LK5OSVxPtqgKMvg+AS2Q36RLBT8C3XRuPelCWTogXgY="; }; dontPatch = true; From d71f29292002cae25d3f3a5c8a93b7da226588a1 Mon Sep 17 00:00:00 2001 From: Antoine Cotten Date: Fri, 13 Dec 2024 18:22:09 +0100 Subject: [PATCH 11/11] awsume: propagate setuptools build input (cherry picked from commit 7a07cfb1f4ec979c6050d3c90f72a67947c87fd9) --- pkgs/tools/admin/awsume/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/admin/awsume/default.nix b/pkgs/tools/admin/awsume/default.nix index a317a24b7ec2..e443d1c3899f 100644 --- a/pkgs/tools/admin/awsume/default.nix +++ b/pkgs/tools/admin/awsume/default.nix @@ -9,6 +9,7 @@ psutil, pluggy, pyyaml, + setuptools, }: buildPythonApplication rec { @@ -32,6 +33,7 @@ buildPythonApplication rec { psutil pluggy pyyaml + setuptools ]; postPatch = ''