From 806b01ad42c1e14c78ed32bea6305fcd54443528 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Aug 2024 01:41:04 +0000 Subject: [PATCH 01/28] metal-cli: 0.23.1 -> 0.24.0 (cherry picked from commit e388d5919218e91a623f8fbceca16820f56e6676) --- pkgs/development/tools/metal-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/metal-cli/default.nix b/pkgs/development/tools/metal-cli/default.nix index f395e177d0cc..42bf1ac0d5f7 100644 --- a/pkgs/development/tools/metal-cli/default.nix +++ b/pkgs/development/tools/metal-cli/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "metal-cli"; - version = "0.23.1"; + version = "0.24.0"; src = fetchFromGitHub { owner = "equinix"; repo = pname; rev = "v${version}"; - hash = "sha256-EuwLsrLwTM3FsUt1oa4N9y5Vq8TjTXQW+5UArXZHxuc="; + hash = "sha256-fHX0bQj065aPihd/4jPUWWSi5kAmHov8720KOjsFeFs="; }; vendorHash = "sha256-X+GfM73LAWk2pT4ZOPT2pg8YaKyT+SNjQ14LgB+C7Wo="; From 303aac7b8301a44e9f61f03bd758b2115bf0e36c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 1 Sep 2024 18:52:45 +0100 Subject: [PATCH 02/28] calibre: add patches for CVE-2024-6781, CVE-2024-6782, CVE-2024-7008, CVE-2024-7009 --- pkgs/applications/misc/calibre/default.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 013f41d35258..4f14907200aa 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -51,6 +51,26 @@ stdenv.mkDerivation (finalAttrs: { url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/hardening/0007-Hardening-Qt-code.patch"; hash = "sha256-a6yyG0RUsQJBBNxeJsTtQSBV2lxdzz1hnTob88O+SKg="; }) + (fetchpatch { + name = "CVE-2024-6781.patch"; + url = "https://github.com/kovidgoyal/calibre/commit/bcd0ab12c41a887f8290a9b56e46c3a29038d9c4.patch"; + hash = "sha256-HZdbkKZYGYJ5pjv0ZNFNyT0gkeNPcMXKLEYGr6uzGAw="; + }) + (fetchpatch { + name = "CVE-2024-6782.patch"; + url = "https://github.com/kovidgoyal/calibre/commit/38a1bf50d8cd22052ae59c513816706c6445d5e9.patch"; + hash = "sha256-0E5RdzXAwenV15BqSHJxRTh3Ay8Vh1Z9AloqCHHrB50="; + }) + (fetchpatch { + name = "CVE-2024-7008.patch"; + url = "https://github.com/kovidgoyal/calibre/commit/863abac24e7bc3e5ca0b3307362ff1953ba53fe0.patch"; + hash = "sha256-0dV34AJRwQYE02bDdnA4o/fsy1q4vR7H5krBHyeAeKY="; + }) + (fetchpatch { + name = "CVE-2024-7009.patch"; + url = "https://github.com/kovidgoyal/calibre/commit/d56574285e8859d3d715eb7829784ee74337b7d7.patch"; + hash = "sha256-LFi68mIweF/2C/YNSrUiLwrq4++GSWxTmgVK1ktf3V4="; + }) ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; From 6f129cd63f3fa2408c0e0356eb9a2b8616614de6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Sep 2024 04:08:19 +0000 Subject: [PATCH 03/28] thunderbirdPackages.thunderbird-115: 115.14.0 -> 115.15.0 (cherry picked from commit a2a219465a4f0da31900fd31159c5a8427bbf35a) --- .../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 0b0009cbfd61..cb89aa3ffc0c 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -50,8 +50,8 @@ in rec { thunderbird = thunderbird-128; thunderbird-115 = common { - version = "115.14.0"; - sha512 = "b12e1302d6be94dd88bee6dd069d3fec944bfce95e1afc1d72c14cc188d952fd5a85f0e70575317250701ac89498d876f3384b022957689fabcef61ad7d78c29"; + version = "115.15.0"; + sha512 = "b161b99e09b6d1ba833f77264e35034ad199438b4fc88d244a6b68c84693fa2e90fbab60dafb827a2e23b37c484f9843a58751d93826ba7cdd0391114d253de2"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-115"; From d3ff616b8c95af0fc2e774a47836106213a04b92 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Sep 2024 16:14:06 +0000 Subject: [PATCH 04/28] asterisk: 20.9.2 -> 20.9.3 (cherry picked from commit 32a1f2f245f82e366162b827f79720abcbf14e92) --- pkgs/servers/asterisk/versions.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/asterisk/versions.json b/pkgs/servers/asterisk/versions.json index 69cc9af11021..19e2e2651d11 100644 --- a/pkgs/servers/asterisk/versions.json +++ b/pkgs/servers/asterisk/versions.json @@ -1,14 +1,14 @@ { "asterisk_18": { - "sha256": "11af7b24a7e027282696dda9370e812dcc5214e7ffb802ba42ee4ef3444c03b4", - "version": "18.24.2" + "sha256": "70af95d1067a5afec7acbf98a242d853ae5dc8637c8f20d1f30d0dcf96eadb29", + "version": "18.24.3" }, "asterisk_20": { - "sha256": "acc85a66f3b2a0e2784f4c551b8b0241a2393c47ff353543ae63b5dcf434b1ca", - "version": "20.9.2" + "sha256": "3d3d3c558f0ca9c3209a6aa7c561c2b85a1ab1b4099d4995f33c917b4cff9ee4", + "version": "20.9.3" }, "asterisk_21": { - "sha256": "a14f8e13c3099343ed3df45252965866d93642644404512ce4492b18ecc1a187", - "version": "21.4.2" + "sha256": "bd9f492d3a9e6a5c9f0a69440402be61285d14df9dc7049377f29f9cbecfeeda", + "version": "21.4.3" } } From 1444c7379267c3bdd207ec625b4e7251fa7e747f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 01:25:14 +0000 Subject: [PATCH 05/28] netbird-ui: 0.28.9 -> 0.29.0 (cherry picked from commit ea498c7af0eb2dc6bb226ff9bd8fbced991c7bf7) --- pkgs/tools/networking/netbird/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index c4bce67ff89d..b65ad77b4527 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -31,16 +31,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.28.9"; + version = "0.29.0"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; rev = "v${version}"; - hash = "sha256-SM288I+N645vzGmLO5hfDeFDqSJOe11+0VZVPneagHw="; + hash = "sha256-wzAvu8G1VJ/JLLxHwe4po/DkuLoAixLOx6XVatQThm8="; }; - vendorHash = "sha256-UlxylKiszgB2XQ4bZI23/YY/RsFCE7OlHT3DBsRhvCk="; + vendorHash = "sha256-YvfzqKjNxs2xaK0YSw3fNKluF3kIKu2KNSHhaLewNIw="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; From 4fe286f20846ceaea45b0c1099c5621b2fbdb7a4 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Mon, 9 Sep 2024 16:22:14 -0700 Subject: [PATCH 06/28] waycheck: 1.2.1 -> 1.3.1 (cherry picked from commit a1658a19e8445ab538cb0f277115ee38219e9e34) --- pkgs/by-name/wa/waycheck/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/waycheck/package.nix b/pkgs/by-name/wa/waycheck/package.nix index 73eb3146664e..585346a7f310 100644 --- a/pkgs/by-name/wa/waycheck/package.nix +++ b/pkgs/by-name/wa/waycheck/package.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "waycheck"; - version = "1.2.1"; + version = "1.3.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "serebit"; repo = "waycheck"; rev = "v${finalAttrs.version}"; - hash = "sha256-82jOYWhgD9JNDn24eCAeMm63R5BTy20lQVpiAwhDIOk="; + hash = "sha256-ZNUORCSeU+AGQoiIIfPpgW2o1ElX+j5Pcn2X/8pSpRI="; }; nativeBuildInputs = [ From 57f3f9e9232c9e804bb2a3260a08c9e1f8fa64bf Mon Sep 17 00:00:00 2001 From: Gavin John Date: Mon, 9 Sep 2024 16:24:41 -0700 Subject: [PATCH 07/28] waycheck: nixfmt (cherry picked from commit 9c622eb91dddd02ebeffdccee4d95c2dfd9c8cf3) --- pkgs/by-name/wa/waycheck/package.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/wa/waycheck/package.nix b/pkgs/by-name/wa/waycheck/package.nix index 585346a7f310..7f5e112b4a62 100644 --- a/pkgs/by-name/wa/waycheck/package.nix +++ b/pkgs/by-name/wa/waycheck/package.nix @@ -1,13 +1,14 @@ -{ lib -, stdenv -, fetchFromGitLab -, meson -, ninja -, pkg-config -, qt6 -, wayland -, glib -, wrapGAppsHook3 +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + pkg-config, + qt6, + wayland, + glib, + wrapGAppsHook3, }: stdenv.mkDerivation (finalAttrs: { From c663e4bad1278a0004c6faa13645054b89fb7e17 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Mon, 9 Sep 2024 16:25:26 -0700 Subject: [PATCH 08/28] waycheck: add updateScript (cherry picked from commit e39e305b25edd489ce024dc5e5a9aa60983fb4e3) --- pkgs/by-name/wa/waycheck/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/wa/waycheck/package.nix b/pkgs/by-name/wa/waycheck/package.nix index 7f5e112b4a62..2494407b165b 100644 --- a/pkgs/by-name/wa/waycheck/package.nix +++ b/pkgs/by-name/wa/waycheck/package.nix @@ -9,6 +9,7 @@ wayland, glib, wrapGAppsHook3, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -49,6 +50,8 @@ stdenv.mkDerivation (finalAttrs: { qtWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Simple GUI that displays the protocols implemented by a Wayland compositor"; homepage = "https://gitlab.freedesktop.org/serebit/waycheck"; From 7c148375c432ca6c92b0c5db3d6360c6bec1ca00 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Mon, 9 Sep 2024 16:25:46 -0700 Subject: [PATCH 09/28] waycheck: add pandapip1 to maintainers (cherry picked from commit 453c599b61b8ff4d614caedffa56f235ab631dee) --- pkgs/by-name/wa/waycheck/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/wa/waycheck/package.nix b/pkgs/by-name/wa/waycheck/package.nix index 2494407b165b..b8dd02dabded 100644 --- a/pkgs/by-name/wa/waycheck/package.nix +++ b/pkgs/by-name/wa/waycheck/package.nix @@ -56,7 +56,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Simple GUI that displays the protocols implemented by a Wayland compositor"; homepage = "https://gitlab.freedesktop.org/serebit/waycheck"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ julienmalka ]; + maintainers = with lib.maintainers; [ + julienmalka + pandapip1 + ]; mainProgram = "waycheck"; platforms = lib.platforms.linux; }; From e048432a775ac08d1d8d8cd6a3091cad49d98b4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 11 Jun 2024 14:09:27 +0100 Subject: [PATCH 10/28] devenv: 1.0.5 -> 1.0.6 (cherry picked from commit cefbadfd3b0ac49e5cbea0d25d7e2d6922be1fe9) --- pkgs/by-name/de/devenv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index 9284bc2218b7..69893d15b58a 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -29,7 +29,7 @@ let doInstallCheck = false; }); - version = "1.0.5"; + version = "1.0.6"; in rustPlatform.buildRustPackage { pname = "devenv"; inherit version; @@ -38,10 +38,10 @@ in rustPlatform.buildRustPackage { owner = "cachix"; repo = "devenv"; rev = "v${version}"; - hash = "sha256-W5DFIifCjGYJXJzLU3RpqBeqes4zrf0Sr/6rwzTygPU="; + hash = "sha256-vGmMEQohwHiTtkFm6WTKtNNYVqPJA6YxRhAizbhtCwE="; }; - cargoHash = "sha256-a6o28oonA6G0xo83PXwbH86V0aDDAAA2zajE67qsSU0="; + cargoHash = "sha256-89pivwMs/TpCQBaKFH6iUEpaid5eQOrvyz5otcFKy54="; nativeBuildInputs = [ makeWrapper pkg-config ]; From bc9727e2bbe36ad27246b739e3795bd83abaec1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 13 Jun 2024 09:10:14 +0100 Subject: [PATCH 11/28] devenv: 1.0.6 -> 1.0.7 (cherry picked from commit a06e115bbb8b6ce30331fdc7e89415c819cf2bc5) --- pkgs/by-name/de/devenv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index 69893d15b58a..aef566f030eb 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -29,7 +29,7 @@ let doInstallCheck = false; }); - version = "1.0.6"; + version = "1.0.7"; in rustPlatform.buildRustPackage { pname = "devenv"; inherit version; @@ -38,10 +38,10 @@ in rustPlatform.buildRustPackage { owner = "cachix"; repo = "devenv"; rev = "v${version}"; - hash = "sha256-vGmMEQohwHiTtkFm6WTKtNNYVqPJA6YxRhAizbhtCwE="; + hash = "sha256-eTbBvYwGlKExMSTyHQya6+6kdx1rtva/aVfyAZu2NUU="; }; - cargoHash = "sha256-89pivwMs/TpCQBaKFH6iUEpaid5eQOrvyz5otcFKy54="; + cargoHash = "sha256-fmxXCOrWRM4ZKwQS9vCIh7LonpifyeNGsj/td1CjedA="; nativeBuildInputs = [ makeWrapper pkg-config ]; From 6e1195e4244dcee87c5eedd66e4df6e2a494205d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 23 Jul 2024 20:08:07 +0100 Subject: [PATCH 12/28] devenv: 1.0.7 -> 1.0.8 (cherry picked from commit d6ecafa36527e78e7d3969dcef7f3f45cee28ec2) --- pkgs/by-name/de/devenv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index aef566f030eb..9fc28e1ea267 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -29,7 +29,7 @@ let doInstallCheck = false; }); - version = "1.0.7"; + version = "1.0.8"; in rustPlatform.buildRustPackage { pname = "devenv"; inherit version; @@ -38,10 +38,10 @@ in rustPlatform.buildRustPackage { owner = "cachix"; repo = "devenv"; rev = "v${version}"; - hash = "sha256-eTbBvYwGlKExMSTyHQya6+6kdx1rtva/aVfyAZu2NUU="; + hash = "sha256-q/ERT4Ui315opFz4h4+BsJ/zrTYdXkwq13vvrpL+KzM="; }; - cargoHash = "sha256-fmxXCOrWRM4ZKwQS9vCIh7LonpifyeNGsj/td1CjedA="; + cargoHash = "sha256-fCXAFVmKns8uglbzyCznoVFGCU+Veq0t1h8T7i1P5XQ="; nativeBuildInputs = [ makeWrapper pkg-config ]; From f87fedbb0b1d304b60230c0933d86413ed8cb3e5 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Wed, 7 Aug 2024 18:51:57 -0700 Subject: [PATCH 13/28] devenv: rm test binaries Prior to this change the devenv package contained "devenv-run-tests" and "xtask" test binaries. (cherry picked from commit e574a549ab5c22d9d0405d2aed1ab4edeed5ad2e) --- pkgs/by-name/de/devenv/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index 9fc28e1ea267..38c87811560c 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -43,6 +43,8 @@ in rustPlatform.buildRustPackage { cargoHash = "sha256-fCXAFVmKns8uglbzyCznoVFGCU+Veq0t1h8T7i1P5XQ="; + buildAndTestSubdir = "devenv"; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ From 307397285b555615aae3633eca0a6f22689dc464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 10 Sep 2024 23:38:53 +0100 Subject: [PATCH 14/28] devenv: 1.0.8 -> 1.1 (cherry picked from commit 0206930c80f517e01b2745061f134b3601c4ffa3) --- pkgs/by-name/de/devenv/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index 38c87811560c..4c42ea46d623 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -17,19 +17,19 @@ let devenv_nix = nix.overrideAttrs (old: { - version = "2.21-devenv"; + version = "2.24-devenv"; src = fetchFromGitHub { owner = "domenkozar"; repo = "nix"; - rev = "b24a9318ea3f3600c1e24b4a00691ee912d4de12"; - hash = "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794="; + rev = "1e61e9f40673f84c3b02573145492d8af581bec5"; + hash = "sha256-uDwWyizzlQ0HFzrhP6rVp2+2NNA+/TM5zT32dR8GUlg="; }; buildInputs = old.buildInputs ++ [ libgit2 ]; doCheck = false; doInstallCheck = false; }); - version = "1.0.8"; + version = "1.1"; in rustPlatform.buildRustPackage { pname = "devenv"; inherit version; @@ -38,10 +38,10 @@ in rustPlatform.buildRustPackage { owner = "cachix"; repo = "devenv"; rev = "v${version}"; - hash = "sha256-q/ERT4Ui315opFz4h4+BsJ/zrTYdXkwq13vvrpL+KzM="; + hash = "sha256-7o2OBUwE51ZNMCBB4rg5LARc8S6C9vuzRXnqk3d/lN4="; }; - cargoHash = "sha256-fCXAFVmKns8uglbzyCznoVFGCU+Veq0t1h8T7i1P5XQ="; + cargoHash = "sha256-Yos8iOWfRJcOqbanskUg75cX05dvxWnq42NhmQt/jf4="; buildAndTestSubdir = "devenv"; From be66d371321422043438096e87aa95efebbff632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 11 Sep 2024 08:37:45 +0100 Subject: [PATCH 15/28] devenv: fix build on darwin (cherry picked from commit efd9b31d09687e6e09ffa41c58524e9698d20a5e) --- pkgs/by-name/de/devenv/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index 4c42ea46d623..82e854d9c466 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -4,19 +4,17 @@ , makeWrapper , rustPlatform , testers - , cachix , darwin , libgit2 -, nix +, nixVersions , openssl , pkg-config - , devenv # required to run version test }: let - devenv_nix = nix.overrideAttrs (old: { + devenv_nix = nixVersions.nix_2_24.overrideAttrs (old: { version = "2.24-devenv"; src = fetchFromGitHub { owner = "domenkozar"; From f4172cc5c40ffa127db1ec435949008c0d57398f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Tue, 10 Sep 2024 19:32:35 +0200 Subject: [PATCH 16/28] fastly: 10.13.3 -> 10.14.0 (cherry picked from commit 6316f217591e1e04411d0a322420fd7265006129) --- pkgs/misc/fastly/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index b853c21ac31a..e656d68d6356 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.13.3"; + version = "10.14.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-tjaYsvCj0Vy0DyTgoZthtQhYYLuBw1+ncVdb9rB71Vw="; + hash = "sha256-bYxA/+bzbam7fT9kAPZ7W5gLDu8l5vowL26OrD+qlCA="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-WZfaIoVwLMoXU/NLVQAiwH6SuEU0BEKy4Vg887K6c6o="; + vendorHash = "sha256-innmJ40h80SFx8dRVsY4vR5QehFuavkl357zShXiyIE="; nativeBuildInputs = [ installShellFiles @@ -52,8 +52,8 @@ buildGoModule rec { ]; preBuild = let cliConfigToml = fetchurl { - url = "https://web.archive.org/web/20231130153524/https://developer.fastly.com/api/internal/cli-config"; - hash = "sha256-ZKr6D4DI+lr8FDjfLMgpn4Zq4i5kiwcLEDEScuuCBBw="; + url = "https://web.archive.org/web/20240910172801/https://developer.fastly.com/api/internal/cli-config"; + hash = "sha256-r4ahroyU4hyTN88UK02FvXU8OTQ6OoNInt9WrzZk7Bk="; }; in '' cp ${cliConfigToml} ./pkg/config/config.toml From 3f949b33d68a2b1ee049084716ea2df941a578f8 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 11 Sep 2024 15:16:43 +0200 Subject: [PATCH 17/28] palemoon-bin: 33.3.0 -> 33.3.1 (cherry picked from commit 5a6bd6e0c5b89809ae03389afb6be5f805fc27e0) --- pkgs/applications/networking/browsers/palemoon/bin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index 370489c3da81..b204f23a673e 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.3.0"; + version = "33.3.1"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -158,11 +158,11 @@ stdenv.mkDerivation (finalAttrs: { in { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-9JZzwWe40M6nJkzeUqNDPXMfDGBnLRDSLL5kE2sNzCs="; + hash = "sha256-auo45tzMY6bKahSEmUrkcYnz7v+GFbsrG+ePAKRC00U="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-K3PC1EDZeDyJUPhfvqTlqyMM07GmiWlUdYiNnSZuesw="; + hash = "sha256-7qrT5fSfwcEAkbq8g/HRoUiDv5+qrzpiysjHTdZVgLc="; }; }; From 41e73a6bc83c39952114a087216d988a07ff3427 Mon Sep 17 00:00:00 2001 From: networkException Date: Thu, 12 Sep 2024 02:07:34 +0200 Subject: [PATCH 18/28] chromium,chromedriver: 128.0.6613.119 -> 128.0.6613.137 https://chromereleases.googleblog.com/2024/09/stable-channel-update-for-desktop_10.html This update includes 5 security fixes. CVEs: CVE-2024-8636 CVE-2024-8637 CVE-2024-8638 CVE-2024-8639 (cherry picked from commit bae4c09c77fea7200a067370d9ae7a73e28e5543) --- .../networking/browsers/chromium/upstream-info.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index c354b4e997cc..efda9bfc45da 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,11 +1,11 @@ { stable = { chromedriver = { - hash_darwin = "sha256-jqBrEpqHRjpxi7sp/dSzQFzROS21bPTfwvco/UzKMug="; + hash_darwin = "sha256-UtBJZG+pRdqwxWsvuxYrRJsmFdMEa5h6lWXt39cPxF0="; hash_darwin_aarch64 = - "sha256-7T9uargLSXs4uqBmS00eUNvhYiA42UC7DPTkTI2sM8U="; - hash_linux = "sha256-Li4f3+zZl2HCbxwIyLpylRJ1PMRbV3LKW7dBEnKyIdo="; - version = "128.0.6613.119"; + "sha256-2HFrIwc8Jzlg6/eKkJqfd8kwS8c6powU2RnpBGMSBak="; + hash_linux = "sha256-8EEJL0A/t0VabaKHEHC2WHwygUo+PCsKeU09SqRzkVE="; + version = "128.0.6613.137"; }; deps = { gn = { @@ -15,8 +15,8 @@ version = "2024-06-11"; }; }; - hash = "sha256-WCemrL5jPRn5P1olLwfrAM1xLc0hcaBYDj0CZPoPucU="; - version = "128.0.6613.119"; + hash = "sha256-/q+Z1a1EFZRQvC3pmuDbzJWzSSYkI7bfgUAaJRBaj00="; + version = "128.0.6613.137"; }; ungoogled-chromium = { deps = { From f58344f39f56e4ae3a13567650a8761a8db44c72 Mon Sep 17 00:00:00 2001 From: networkException Date: Thu, 12 Sep 2024 02:07:57 +0200 Subject: [PATCH 19/28] ungoogled-chromium: 128.0.6613.119-1 -> 128.0.6613.137-1 https://chromereleases.googleblog.com/2024/09/stable-channel-update-for-desktop_10.html This update includes 5 security fixes. CVEs: CVE-2024-8636 CVE-2024-8637 CVE-2024-8638 CVE-2024-8639 (cherry picked from commit a84b51fdd1ee2e500cabfc68b115e808b374e0d3) --- .../networking/browsers/chromium/upstream-info.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index efda9bfc45da..1aee35f96b89 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -27,11 +27,11 @@ version = "2024-06-11"; }; ungoogled-patches = { - hash = "sha256-qHt7Rjx1VmKlX8ko7hpNv8SW/rNhXsGchWs6A/aXuu0="; - rev = "128.0.6613.119-1"; + hash = "sha256-o/cEVLD64qYd/VIbmN/FCFbu7LgQsZdWkyxIns7/bRs="; + rev = "128.0.6613.137-1"; }; }; - hash = "sha256-WCemrL5jPRn5P1olLwfrAM1xLc0hcaBYDj0CZPoPucU="; - version = "128.0.6613.119"; + hash = "sha256-/q+Z1a1EFZRQvC3pmuDbzJWzSSYkI7bfgUAaJRBaj00="; + version = "128.0.6613.137"; }; } From 79843e49eb5b4d772fafe886cb0b428fe4ea9159 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 12 Sep 2024 19:08:32 +0300 Subject: [PATCH 20/28] linux_testing: 6.11-rc6 -> 6.11-rc7 (cherry picked from commit 7689b6f5dd56f95ae067ee4074829efd350009f1) --- 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 870d954fb07e..42feed6114d3 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.11-rc6", - "hash": "sha256:15lx6da4kdsipxlv7my8wamss5i001r4cc2ab1icvw1ms207b5in" + "version": "6.11-rc7", + "hash": "sha256:17c8vwvra042mib1s60nqqai0s7qc0qkvrf0j7ziqmy2llq8cbxy" }, "6.1": { "version": "6.1.109", From 76cd2249fae6540e710619381cabe43336b46ee5 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 12 Sep 2024 19:08:35 +0300 Subject: [PATCH 21/28] linux_6_10: 6.10.9 -> 6.10.10 (cherry picked from commit 9082362fda01d868a432d2a16e11b4747a1fc825) --- 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 42feed6114d3..479293c83177 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -36,7 +36,7 @@ "hash": "sha256:08ngskni7d9wi93vlwcmbdg7sb2jl1drhhzn62k9nsrg1r7crrss" }, "6.10": { - "version": "6.10.9", - "hash": "sha256:0n385x7hc5pqxiiy26ampgzf56wqfvydg70va27xrhm7w1q9nj54" + "version": "6.10.10", + "hash": "sha256:1kcvh1g3p1sj4q34ylcmm43824f97z4k695lcxnzp7pbnlsyg1z6" } } From e5494e4d7e69a431d292624573750f8751fbc719 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 12 Sep 2024 19:08:38 +0300 Subject: [PATCH 22/28] linux_6_6: 6.6.50 -> 6.6.51 (cherry picked from commit 9be115990ecc036eae0a3fadfd751df38e351f2a) --- 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 479293c83177..ca1c740bb4a3 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:1n86dfv8qcm21z3inrz0n7gnwik7s51xfrabyq8ajy15b93a2fpi" }, "6.6": { - "version": "6.6.50", - "hash": "sha256:0vp8sbm9fqj09vh7fib39rw18n5cj8zfydqsr5h00898mxny6rf0" + "version": "6.6.51", + "hash": "sha256:1cq8l3n12gnk6kgms5c7v71l199ip8lc9fpx7s8w8y88cla9l30w" }, "6.8": { "version": "6.8.12", From 3ca9095b0922a1b3350d5ea625468c194520ccbb Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 12 Sep 2024 19:08:42 +0300 Subject: [PATCH 23/28] linux_6_1: 6.1.109 -> 6.1.110 (cherry picked from commit 2f9ebbe92208924cf0a2293b7813cee598837624) --- 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 ca1c740bb4a3..d92214e7e7e1 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:17c8vwvra042mib1s60nqqai0s7qc0qkvrf0j7ziqmy2llq8cbxy" }, "6.1": { - "version": "6.1.109", - "hash": "sha256:1h8sq3p075wyfgs2vjg8y1dbj27dj16c4rbxpgfwahinqq5g8bvk" + "version": "6.1.110", + "hash": "sha256:0slgvwldjdyi5vzhgriamkmrj4p942yacclgcw29331gfjs39gly" }, "5.15": { "version": "5.15.166", From 76b313bbe431f2b9e61d9184b0e5b54c2f074fad Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 12 Sep 2024 19:08:45 +0300 Subject: [PATCH 24/28] linux_5_15: 5.15.166 -> 5.15.167 (cherry picked from commit ab9afc141c94a520186f03a7ab59ea9d618728fc) --- 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 d92214e7e7e1..c09700496144 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:0slgvwldjdyi5vzhgriamkmrj4p942yacclgcw29331gfjs39gly" }, "5.15": { - "version": "5.15.166", - "hash": "sha256:1krri2sf0hvvgai0z9lp8h12gcmpigapb42qxs2pcnxqb7ialv75" + "version": "5.15.167", + "hash": "sha256:0c6s6l5sz9ibws7bymb393ww0z9i3amsk1yx0bahipz3xhc1yxdi" }, "5.10": { "version": "5.10.225", From fd3c5e94e42249ae23a85765dcaf6af782601766 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 12 Sep 2024 19:08:48 +0300 Subject: [PATCH 25/28] linux_5_10: 5.10.225 -> 5.10.226 (cherry picked from commit 1677ac8d2dab890908161b57445cd2b5db7ec248) --- 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 c09700496144..f0b2aacb5251 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:0c6s6l5sz9ibws7bymb393ww0z9i3amsk1yx0bahipz3xhc1yxdi" }, "5.10": { - "version": "5.10.225", - "hash": "sha256:0770757ildcc0cs6alnb5cspg6ysg2wqly9z5q1vjf3mh0xbzmw5" + "version": "5.10.226", + "hash": "sha256:19hwwl5sbya65mch7fwmji2cli9b8796zjqbmkybjrarg1j9m8gn" }, "5.4": { "version": "5.4.283", From 47bb8e422b3ce070d5e1eeea643d8dd83bcdd276 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 12 Sep 2024 19:08:50 +0300 Subject: [PATCH 26/28] linux_5_4: 5.4.283 -> 5.4.284 (cherry picked from commit 8c909c6cf30c08e4eee0bc616fe390e6f3d3dd3c) --- 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 f0b2aacb5251..38c63bc86ea9 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:19hwwl5sbya65mch7fwmji2cli9b8796zjqbmkybjrarg1j9m8gn" }, "5.4": { - "version": "5.4.283", - "hash": "sha256:15zpw5vwi8c4yjap28lzrwdvj3yrynnbx6vw8aqiqamlk4qnl315" + "version": "5.4.284", + "hash": "sha256:0axkwfhvq3w2072xjqww476qa3rjglxyqmf72mlp9b5ymswil8kp" }, "4.19": { "version": "4.19.321", From 9650804e3b6c139cd9318cb0f2ee0781e1c256ee Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 12 Sep 2024 19:08:53 +0300 Subject: [PATCH 27/28] linux_4_19: 4.19.321 -> 4.19.322 (cherry picked from commit a4821155b872ac32eeac19989d2b950c99e03836) --- 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 38c63bc86ea9..5007b5bf8ccc 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "hash": "sha256:0axkwfhvq3w2072xjqww476qa3rjglxyqmf72mlp9b5ymswil8kp" }, "4.19": { - "version": "4.19.321", - "hash": "sha256:1n86dfv8qcm21z3inrz0n7gnwik7s51xfrabyq8ajy15b93a2fpi" + "version": "4.19.322", + "hash": "sha256:0qj106lj554y1kdqj8kwyf7pk9bvrrpgz6s8zyh7d61mk7wws9sf" }, "6.6": { "version": "6.6.51", From cd70dfe3f839de395ff91426481dd057a246a6e3 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 12 Sep 2024 19:09:14 +0300 Subject: [PATCH 28/28] linux_latest-libre: 19624 -> 19631 (cherry picked from commit e05f91dc7b4953b0c205f96727ee143bdfb029b3) --- 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 a2ab4a5cbe8a..e4a67262485a 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 = "19624"; - sha256 = "0q3kg7dqvsiar3m70mvmn6bkkm4k1zn4fbh5r8ynib753wlhf504"; + rev = "19631"; + sha256 = "0hydmrdwqrrmrnk6r583m7c2hq1k68c9c8yqjc0bd6q4x7ys32ci"; } , ... }: