From b454739b7af3edc8af28d2927c407cd2fa60a4af Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Thu, 12 Dec 2024 16:34:06 +0100 Subject: [PATCH 01/16] matomo: mark 4.x as EOL --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 ++ pkgs/servers/web-apps/matomo/default.nix | 1 + 2 files changed, 3 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index f08854d8cef29..66e606ae35fc4 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -360,6 +360,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `luarocks-packages-updater`'s .csv format, used to define lua packages to be updated, has changed: `src` (URL of a git repository) has now become `rockspec` (URL of a rockspec) to remove ambiguity regarding which rockspec to use and simplify implementation. +- `matomo` 4.x reached end of life on December 19, 2024. It is recommended to upgrade to `matomo_5`. + - `mkosi` was updated to v22. Parts of the user interface have changed. Consult the release notes of [v19](https://github.com/systemd/mkosi/releases/tag/v19), [v20](https://github.com/systemd/mkosi/releases/tag/v20), diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 4de267fd7797d..692a5e332151d 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -119,6 +119,7 @@ let homepage = "https://matomo.org/"; platforms = platforms.all; maintainers = with maintainers; [ florianjacob kiwi sebbel twey boozedog ] ++ teams.flyingcircus.members; + knownVulnerabilities = lib.optional (lib.versionOlder version "5.0") "Support for Matomo 4 ended on 2024-12-19. It is recommended to upgrade to `matomo_5` instead."; }; }; in From 26516ba99ee0ca48959b96a46596ff129f50aea7 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Thu, 12 Dec 2024 16:39:33 +0100 Subject: [PATCH 02/16] matomo_5: 5.1.2 -> 5.2.0 --- pkgs/servers/web-apps/matomo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 692a5e332151d..6e34f1d19735e 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -7,15 +7,15 @@ let hash = "sha256-cGnsxfpvt7FyhxFcA2/gWWe7CyanVGZVKtCDES3XLdI="; }; matomo_5 = { - version = "5.1.2"; - hash = "sha256-6kR6OOyqwQfV+pRqHO+VMLM1eZQb0om65EilAnIlW9U="; + version = "5.2.0"; + hash = "sha256-0hMbcvntoOWFJ00DytkFfcP7/giqtrhmxawVNzMP2KA="; }; matomo-beta = { version = "5.2.0"; # `beta` examples: "b1", "rc1", null # when updating: use null if stable version is >= latest beta or release candidate - beta = "rc1"; - hash = "sha256-heAd01p8QHkrxQY2MEf//YXNplgL19Opw/WhA2cwZ+c="; + beta = null; + hash = "sha256-0hMbcvntoOWFJ00DytkFfcP7/giqtrhmxawVNzMP2KA="; }; }; common = pname: { version, hash, beta ? null }: From 72170a83c01dbd78fbcd84a0ff47d6174fcc4662 Mon Sep 17 00:00:00 2001 From: emilylange Date: Thu, 19 Dec 2024 17:22:25 +0100 Subject: [PATCH 03/16] chromium: fix cross-"building" of recompressed FODs (cherry picked from commit 6a711c3e8f0c69a3abb7100ba8a52760ea7751cb) --- pkgs/applications/networking/browsers/chromium/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index fe6ee29713ecf..a29352b8555fe 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -223,9 +223,10 @@ let name = "source.tar.zstd"; downloadToTemp = false; passthru.unpack = true; + nativeBuildInputs = [ zstd ]; postFetch = '' tar \ - --use-compress-program="${lib.getExe zstd} -T$NIX_BUILD_CORES" \ + --use-compress-program="zstd -T$NIX_BUILD_CORES" \ --sort=name \ --mtime="1970-01-01" \ --owner=root --group=root \ From d64225628168c80b46986dae5228934ef90aa638 Mon Sep 17 00:00:00 2001 From: emilylange Date: Thu, 19 Dec 2024 17:25:44 +0100 Subject: [PATCH 04/16] chromium,chromedriver: 131.0.6778.139 -> 131.0.6778.204 https://chromereleases.googleblog.com/2024/12/stable-channel-update-for-desktop_18.html This update includes 5 security fixes. CVEs: CVE-2024-12692 CVE-2024-12693 CVE-2024-12694 CVE-2024-12695 (cherry picked from commit 7a25e3878f8ea6bffdea1ebd35eb0efff77ba94c) --- .../networking/browsers/chromium/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index fc99e8d8129fe..bca8407c04c25 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,9 +1,9 @@ { "chromium": { - "version": "131.0.6778.139", + "version": "131.0.6778.204", "chromedriver": { - "hash_darwin": "sha256-QLYUD5SDHoPdiPHX46ps/oBhzDjwxBuQEh0hzbEY73Q=", - "hash_darwin_aarch64": "sha256-VZ4nS9H1J1R6OXqqOaFLHM2rD8dyUTTWur5X1CNm4sU=" + "hash_darwin": "sha256-xxTu1aPNTfGpaPFC55NihzJbcjDL3fBXimQIGBPaU18=", + "hash_darwin_aarch64": "sha256-WyNiLNIPPUesDCYYs6Uc0aZDou0N60kZvL31DlqHMtw=" }, "deps": { "depot_tools": { @@ -19,8 +19,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "c35bbcbd7c2775a12a3f320e05ac0022939b1a8a", - "hash": "sha256-oJ4y9W51RMiUk40Uz8b3LJH0kMD5GMDG2V//Tng4/4A=", + "rev": "52183f9e99a61056f9b78535f53d256f1516f2a0", + "hash": "sha256-D7+Ji8Y1vw1Sgt9njbZDGbgbzT8eAvx/95M8SsHyiN4=", "recompress": true }, "src/third_party/clang-format/script": { @@ -760,8 +760,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "b97fcc24b3523da5e389d2a6d76857f134be09c5", - "hash": "sha256-5Es9Zot/DH+UKq3+aCgeQC+Llgj7/lmPXUYvar/hX7I=" + "rev": "7f72bbed40ca85a6b68ca2f15feca342c9c256d0", + "hash": "sha256-QJcC6T2IOCXhObwND0jPQTUl84lotcYRCIQe4GTtczc=" } } }, From 95afa1ff70a8df25db8213d921ca14fe9f0ad0b1 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 20 Dec 2024 10:25:29 +0300 Subject: [PATCH 05/16] linux_6_12: 6.12.5 -> 6.12.6 (cherry picked from commit 992b3ae6bfddd29401c51037c75ffaec0c910d11) --- 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 444c60058681f..5b27299bdd9fd 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.5", - "hash": "sha256:1k9bc0lpgg29bh7zqz3pm91hhjnfyl5aw6r6hph3ha743k77y81r" + "version": "6.12.6", + "hash": "sha256:17lwn89903ffyi2b29j59c1gsczsc1kj3x70hnxziqg4blhsnl6l" } } From f7c393041c2b31e9e027b90a2ac927be59c3cf49 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 20 Dec 2024 10:25:33 +0300 Subject: [PATCH 06/16] linux_6_6: 6.6.66 -> 6.6.67 (cherry picked from commit 61a720f53e16bfda2afa863e0dcdf7b31a4602ac) --- 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 5b27299bdd9fd..9af12c73ab78b 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.66", - "hash": "sha256:0lhy5waj330hmaxbqpfw2fxzkvvlxxs1nr325i8jy736qhvpjxcx" + "version": "6.6.67", + "hash": "sha256:06iy243l7c2nldamq0nzbkwxrqr7sg0p89gdp3ib18s2xj1a87g4" }, "6.11": { "version": "6.11.11", From 11ef51fbb2bc6be60a793af0e9765ecae8dfb579 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 20 Dec 2024 10:25:39 +0300 Subject: [PATCH 07/16] linux_6_1: 6.1.120 -> 6.1.121 (cherry picked from commit 2d84ed11e90186b5c5c363559a4460493dc8a979) --- 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 9af12c73ab78b..1caf4a6ffcb6c 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.120", - "hash": "sha256:06gp5fdq0bc39hd8mf9mrdrygdybdr3nzsb58lcapf5vmjw9gjb1" + "version": "6.1.121", + "hash": "sha256:0hrv9l2m4yqhh6cwr8xj9jvx8y3sfwmd394g0f2iawrgc3d1dg6x" }, "5.15": { "version": "5.15.174", From e543dcdd8d9b26a1e1103112d846151f00d7d03b Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 20 Dec 2024 10:25:42 +0300 Subject: [PATCH 08/16] linux_5_15: 5.15.174 -> 5.15.175 (cherry picked from commit c41d83bd8f954f2e84aef4bc385c1a09ecdd208f) --- 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 1caf4a6ffcb6c..cd4d38a7dab7e 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:0hrv9l2m4yqhh6cwr8xj9jvx8y3sfwmd394g0f2iawrgc3d1dg6x" }, "5.15": { - "version": "5.15.174", - "hash": "sha256:02kn9nvaa36s070k235lk9x6n40l2zlwj4v6i2y6nnx0cjw3rrn3" + "version": "5.15.175", + "hash": "sha256:1l59x1f1b29mayhzxxkh9vlba41h51mmfh1vram31bks1v4bpn4g" }, "5.10": { "version": "5.10.231", From 279723ca391abc4bfb4a1290c194109672f32235 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 20 Dec 2024 10:25:46 +0300 Subject: [PATCH 09/16] linux_5_10: 5.10.231 -> 5.10.232 (cherry picked from commit a8ce8341dd3863dcf9a3efa01dc2f5cd88c73b83) --- 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 cd4d38a7dab7e..35e0117773706 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:1l59x1f1b29mayhzxxkh9vlba41h51mmfh1vram31bks1v4bpn4g" }, "5.10": { - "version": "5.10.231", - "hash": "sha256:0xcnlz5ib4b368z5cyp4qwys3jsbm18wlvwn73rzj2j6rj1lhnjn" + "version": "5.10.232", + "hash": "sha256:1w5ycdh24j4gsjc2zk7nhbmya59vhi49lbh8333ziprqlj4lb97x" }, "5.4": { "version": "5.4.287", From 0c7a7523e8a281efe61d184c85718f7c046978d4 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 20 Dec 2024 10:25:53 +0300 Subject: [PATCH 10/16] linux_5_4: 5.4.287 -> 5.4.288 (cherry picked from commit d1f97900eb606269d72812534e8269265b553020) --- 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 35e0117773706..41694279e9947 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:1w5ycdh24j4gsjc2zk7nhbmya59vhi49lbh8333ziprqlj4lb97x" }, "5.4": { - "version": "5.4.287", - "hash": "sha256:082bq26bwi8jxfbk840wf9awm5l65aya4bg43im9qvqfpzjzl3qd" + "version": "5.4.288", + "hash": "sha256:1zhsb6gwhb6cvijzh7s8rnm4b06klyhb2mxb06gcyfvj0givlvw7" }, "4.19": { "version": "4.19.322", From 660c89002787b35c9cf35e38a2d94bc5f4799979 Mon Sep 17 00:00:00 2001 From: networkException Date: Fri, 20 Dec 2024 13:58:58 +0100 Subject: [PATCH 11/16] ungoogled-chromium: 131.0.6778.139-1 -> 131.0.6778.204-1 https://chromereleases.googleblog.com/2024/12/stable-channel-update-for-desktop_18.html This update includes 5 security fixes. CVEs: CVE-2024-12692 CVE-2024-12693 CVE-2024-12694 CVE-2024-12695 (cherry picked from commit 6b60271a1d7f214e5bd61b2696f0d1edd25cb754) --- .../networking/browsers/chromium/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index bca8407c04c25..bdee1a9a8f338 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -766,7 +766,7 @@ } }, "ungoogled-chromium": { - "version": "131.0.6778.139", + "version": "131.0.6778.204", "deps": { "depot_tools": { "rev": "20b9bdcace7ed561d6a75728c85373503473cb6b", @@ -777,16 +777,16 @@ "hash": "sha256-a8yCdBsl0nBMPS+pCLwrkAvQNP/THx/z/GySyOgx4Jk=" }, "ungoogled-patches": { - "rev": "131.0.6778.139-1", - "hash": "sha256-6ehqckNitebDNEiY9qgbk8XMLADhpayxodpSFjlUDTA=" + "rev": "131.0.6778.204-1", + "hash": "sha256-08XBobDtEuVG/tli7SXJ3Ca/aFM4kybuk043sVswPj8=" }, "npmHash": "sha256-b1l8SwjAfoColoa3zhTMPEF/rRuxzT3ATHE77rWU5EA=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "c35bbcbd7c2775a12a3f320e05ac0022939b1a8a", - "hash": "sha256-oJ4y9W51RMiUk40Uz8b3LJH0kMD5GMDG2V//Tng4/4A=", + "rev": "52183f9e99a61056f9b78535f53d256f1516f2a0", + "hash": "sha256-D7+Ji8Y1vw1Sgt9njbZDGbgbzT8eAvx/95M8SsHyiN4=", "recompress": true }, "src/third_party/clang-format/script": { @@ -1526,8 +1526,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "b97fcc24b3523da5e389d2a6d76857f134be09c5", - "hash": "sha256-5Es9Zot/DH+UKq3+aCgeQC+Llgj7/lmPXUYvar/hX7I=" + "rev": "7f72bbed40ca85a6b68ca2f15feca342c9c256d0", + "hash": "sha256-QJcC6T2IOCXhObwND0jPQTUl84lotcYRCIQe4GTtczc=" } } } From ebdacab79d9bbd73d10325900eeecc629902c361 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Thu, 19 Dec 2024 16:03:17 +0100 Subject: [PATCH 12/16] percona-server: add updateScript (cherry picked from commit 65d0417b29f9266f10881431f0a5cf2fbbb66af5) --- pkgs/servers/sql/percona-server/8_0.nix | 9 ++++++++- pkgs/servers/sql/percona-server/8_4.nix | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/percona-server/8_0.nix b/pkgs/servers/sql/percona-server/8_0.nix index ceee7ffa0f79d..bf860af011374 100644 --- a/pkgs/servers/sql/percona-server/8_0.nix +++ b/pkgs/servers/sql/percona-server/8_0.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + gitUpdater, bison, cmake, pkg-config, @@ -182,7 +183,13 @@ stdenv.mkDerivation (finalAttrs: { connector-c = finalAttrs.finalPackage; server = finalAttrs.finalPackage; mysqlVersion = lib.versions.majorMinor finalAttrs.version; - tests.percona-server = nixosTests.mysql.percona-server_8_0; + tests.percona-server = + nixosTests.mysql."percona-server_${lib.versions.major finalAttrs.version}_${lib.versions.minor finalAttrs.version}"; + updateScript = gitUpdater { + url = "https://github.com/percona/percona-server"; + rev-prefix = "Percona-Server-"; + allowedVersions = "${lib.versions.major finalAttrs.version}\\.${lib.versions.minor finalAttrs.version}\\..+"; + }; }; meta = with lib; { diff --git a/pkgs/servers/sql/percona-server/8_4.nix b/pkgs/servers/sql/percona-server/8_4.nix index dba6bceb4de97..77ded9a0bad0b 100644 --- a/pkgs/servers/sql/percona-server/8_4.nix +++ b/pkgs/servers/sql/percona-server/8_4.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + gitUpdater, bison, cmake, pkg-config, @@ -204,7 +205,13 @@ stdenv.mkDerivation (finalAttrs: { connector-c = finalAttrs.finalPackage; server = finalAttrs.finalPackage; mysqlVersion = lib.versions.majorMinor finalAttrs.version; - tests.percona-server = nixosTests.mysql.percona-server_8_4; + tests.percona-server = + nixosTests.mysql."percona-server_${lib.versions.major finalAttrs.version}_${lib.versions.minor finalAttrs.version}"; + updateScript = gitUpdater { + url = "https://github.com/percona/percona-server"; + rev-prefix = "Percona-Server-"; + allowedVersions = "${lib.versions.major finalAttrs.version}\\.${lib.versions.minor finalAttrs.version}\\..+"; + }; }; meta = with lib; { From ff74f8542c561e727042ecbff556622db0a13592 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Thu, 19 Dec 2024 16:05:16 +0100 Subject: [PATCH 13/16] percona-server_8_4: 8.4.2-2 -> 8.4.3-3 release notes: https://docs.percona.com/percona-server/8.4/release-notes/8.4.3-3.html Fixed CVEs, taken from 2d69ebbc4ec95f0b5b2cd4fca76cb20ff7e15996: Fixes: * https://github.com/advisories/GHSA-m6rg-98pc-7rxm * https://github.com/advisories/GHSA-97c4-2w4v-c7r8 * https://github.com/advisories/GHSA-m7rw-p49v-xvr4 * https://github.com/advisories/GHSA-cgw6-mmr2-9474 * https://github.com/advisories/GHSA-m2x9-pvwq-m49p * https://github.com/advisories/GHSA-w76f-wfx3-5qjq * https://github.com/advisories/GHSA-vqmm-339w-hc7c * https://github.com/advisories/GHSA-2rhg-4865-8qfj * https://github.com/advisories/GHSA-vggh-55p7-p625 * https://github.com/advisories/GHSA-j5r3-hxmp-cxpr * https://github.com/advisories/GHSA-c72q-9j4p-2mp4 * https://github.com/advisories/GHSA-cj7p-fg4w-qrvh * https://github.com/advisories/GHSA-fv75-hjwp-hmcm * https://github.com/advisories/GHSA-xhf9-m56c-xh6w * https://github.com/advisories/GHSA-c494-hg27-rg85 * https://github.com/advisories/GHSA-r97q-xhcv-9xx9 * https://github.com/advisories/GHSA-h3ph-4h6g-xqfq * https://github.com/advisories/GHSA-mffh-p59m-fv66 * https://github.com/advisories/GHSA-vchj-ggm5-9rcm * https://github.com/advisories/GHSA-jv2x-g26c-46cq * https://github.com/advisories/GHSA-xcwx-vhj6-p7m7 * https://github.com/advisories/GHSA-6vrv-p2wx-g2fg * https://github.com/advisories/GHSA-6pjm-6xcx-c94q * https://github.com/advisories/GHSA-36gq-2499-pq9x * https://github.com/advisories/GHSA-6477-mq9q-6867 (cherry picked from commit 78075270c40294bfbb64977efd2d034ab7270b23) --- pkgs/servers/sql/percona-server/8_4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/percona-server/8_4.nix b/pkgs/servers/sql/percona-server/8_4.nix index 77ded9a0bad0b..790cd857faa91 100644 --- a/pkgs/servers/sql/percona-server/8_4.nix +++ b/pkgs/servers/sql/percona-server/8_4.nix @@ -51,11 +51,11 @@ assert !(withJemalloc && withTcmalloc); stdenv.mkDerivation (finalAttrs: { pname = "percona-server"; - version = "8.4.2-2"; + version = "8.4.3-3"; src = fetchurl { url = "https://downloads.percona.com/downloads/Percona-Server-${lib.versions.majorMinor finalAttrs.version}/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz"; - hash = "sha256-KdaF2+vZfWf6fW8HWi+c97SHW+WqmlcpdPzUUgX94EY="; + hash = "sha256-37W0b8zYKErToJBU+aYtCmQjorcDtvuG0YbOwJzuZgo="; }; nativeBuildInputs = [ From 5d7be7f8289a0db845979128dabc8aca5ee38679 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Thu, 19 Dec 2024 16:13:07 +0100 Subject: [PATCH 14/16] percona-xtrabackup_8_4: 8.4.0-1 -> 8.4.0-2 release notes: https://docs.percona.com/percona-xtrabackup/8.4/release-notes/8.4.0-2.html (cherry picked from commit f1d219d74d0b8616a4a807bab7d937a9ac390cc0) --- pkgs/tools/backup/percona-xtrabackup/8_4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/percona-xtrabackup/8_4.nix b/pkgs/tools/backup/percona-xtrabackup/8_4.nix index 47efd663a1d4e..82f2ab5ea95d8 100644 --- a/pkgs/tools/backup/percona-xtrabackup/8_4.nix +++ b/pkgs/tools/backup/percona-xtrabackup/8_4.nix @@ -3,8 +3,8 @@ callPackage ./generic.nix ( args // { - version = "8.4.0-1"; - hash = "sha256-2tWRRYH0P0HZsWTxeuvDeVWvDwqjjdv6J7YiZwoTKtM="; + version = "8.4.0-2"; + hash = "sha256-ClW/B175z/sxF/MT9iHW1Wtr0ere63tIgUpcMp1IfTs="; # includes https://github.com/Percona-Lab/libkmip.git fetchSubmodules = true; From d5431c53f1bece005f802604d3bc949e34afe087 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 11 Dec 2024 08:12:59 +0100 Subject: [PATCH 15/16] moodle: 4.4.4 -> 4.4.5 Undisclosed security fixes are mentioned in the release notes. Changes: https://moodledev.io/general/releases/4.4/4.4.5 (cherry picked from commit 2ffd9decddeadc8b7883ec20fcda98df5f72ab7a) --- pkgs/servers/web-apps/moodle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix index c1fdf27b7a606..90493e72e6084 100644 --- a/pkgs/servers/web-apps/moodle/default.nix +++ b/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, plugins ? [ ], nixosTests }: let - version = "4.4.4"; + version = "4.4.5"; versionParts = lib.take 2 (lib.splitVersion version); # 4.2 -> 402, 3.11 -> 311 @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/download.php/direct/stable${stableVersion}/${pname}-${version}.tgz"; - hash = "sha256-9ZMQvv0fL6JwUD5ZJnzfzZkiGOfOV9zMc0hX3PKttBw="; + hash = "sha256-CronmobN0OFZHhMCmruPae34j1FNrvMLO02q1VlQfgY="; }; phpConfig = writeText "config.php" '' From 41e30b94dd4c33ea4b108384048890df7daa21c8 Mon Sep 17 00:00:00 2001 From: "nix-backports[bot]" <190413589+nix-backports[bot]@users.noreply.github.com> Date: Fri, 20 Dec 2024 22:02:02 +0200 Subject: [PATCH 16/16] [Backport release-24.05] discord: bump all versions (#366344) --- .../instant-messengers/discord/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 646d1eee63b4c..04922a0d6dff5 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -9,16 +9,16 @@ let versions = if stdenv.hostPlatform.isLinux then { - stable = "0.0.77"; - ptb = "0.0.121"; - canary = "0.0.541"; - development = "0.0.54"; + stable = "0.0.78"; + ptb = "0.0.124"; + canary = "0.0.549"; + development = "0.0.56"; } else { - stable = "0.0.329"; - ptb = "0.0.151"; - canary = "0.0.653"; + stable = "0.0.330"; + ptb = "0.0.153"; + canary = "0.0.661"; development = "0.0.68"; }; version = versions.${branch}; @@ -26,33 +26,33 @@ let x86_64-linux = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-Mm6kdwBsIOOkU1cNgfx4EZq/xeZPwUb2keKBkYv52hQ="; + hash = "sha256-1G9NM0Z6dN2LtunHkkIzNNA+xFslxhnI8GVrjXlNZK8="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-Zaf6Pg6xeSyiIFJMlT+VkE/sXJULSqGzGHmK5MpBuhg="; + hash = "sha256-jJncDqX2vCWFIpgruX1SknZBrCvMM5HSy6je9xxnxqM="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-upT12C23Vkm+BZycKAufRzM5YHizpZJtEaJjHGzYtv4="; + hash = "sha256-hwgvPNoEGjfg6uLlC/k3iYfxfjbja5H2F2aSiEcGZ/o="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-3Qhysb7QFE7W4nqAHffgz9hbud6n6PGcGN6xGBmD6ow="; + hash = "sha256-pxoFT1P/F/0Mhy5sECZlzIxrHK+/Y8Sy5BvgvNYRfM4="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-LIB+MwGm15TE5xB1yNPY61RmYVUJo7+i94qwDag6uHY="; + hash = "sha256-wLDr2jtjPsV3rUsFCNKKHXTwGPdoR/whLmr4w8I7x+U="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-R8R3r2i/+ru+82OBGBmF+Kn502RK/64VwtbdRVSwj0g="; + hash = "sha256-EvIEMyqOotnyqBC8w4XbF+RuP+g2Bjt4hD4aEeEzZGU="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-uBnVz+d5Mp3fjICQQ/SZgFmkXVQGprf7VvUxv0hy00o="; + hash = "sha256-dCeLnfgvaKngO8r/VIDgQLkMKgV7BDOOKcXUdo91Eeo="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";