From b454739b7af3edc8af28d2927c407cd2fa60a4af Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Thu, 12 Dec 2024 16:34:06 +0100 Subject: [PATCH 01/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] [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"; From c07b1fc1ba9a4be8faff2eb39d3eaac3dcb21824 Mon Sep 17 00:00:00 2001 From: Simon Hauser Date: Sat, 21 Dec 2024 00:56:42 +0100 Subject: [PATCH 17/21] perlPackages.MailDKIM: add missing CryptX dependency (#366744) We've been getting `Can't locate Crypt/PK/Ed25519.pm in @INC` when trying to `use Mail::DKIM::PrivateKey`. This is especially critical as this crashed our sympa instance. (cherry picked from commit 8f85b83ec497f83ad2d5aeb0acedd7bf34062e44) --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3807ca8cf6932..187f9b0d229ae 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15012,7 +15012,7 @@ with self; { url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-1.20230911.tar.gz"; hash = "sha256-kecxcoK3JM+9LJtuZjDvFDKISLb8UgPv1w3sL7hyaMo="; }; - propagatedBuildInputs = [ CryptOpenSSLRSA MailAuthenticationResults MailTools NetDNS ]; + propagatedBuildInputs = [ CryptOpenSSLRSA CryptX MailAuthenticationResults MailTools NetDNS ]; doCheck = false; # tries to access the domain name system buildInputs = [ NetDNSResolverMock TestRequiresInternet YAMLLibYAML ]; meta = { From 24deb3679f74062aeb64f130ed63c1e9b3ba6111 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 04:49:29 +0000 Subject: [PATCH 18/21] php82: 8.2.26 -> 8.2.27 (cherry picked from commit 213d47367cf094c9afc6ef22659990d24b87b708) --- pkgs/development/interpreters/php/8.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index 6f80ac7be89d5..fda72fbfcd024 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/pkgs/development/interpreters/php/8.2.nix @@ -4,8 +4,8 @@ let base = callPackage ./generic.nix ( _args // { - version = "8.2.26"; - hash = "sha256-vlfDR9RRyQW8tDNoMqhk2ZKN0OIJibhycF/qC6ZHbGs="; + version = "8.2.27"; + hash = "sha256-blfbr3aafz3rTw9IuMU15nHMChgCLtf2/yO1DpQdS2A="; } ); in From d05735e516f83ee941ba384a62ee789fa53014cf Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 21 Dec 2024 17:21:14 +0100 Subject: [PATCH 19/21] php83: 8.3.14 -> 8.3.15 ChangeLog: https://www.php.net/ChangeLog-8.php#8.3.15 (cherry picked from commit 1f57576570725394c1f22eec4ec863338b426202) --- pkgs/development/interpreters/php/8.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix index abae36f9a5ed3..aa87f534dc700 100644 --- a/pkgs/development/interpreters/php/8.3.nix +++ b/pkgs/development/interpreters/php/8.3.nix @@ -4,8 +4,8 @@ let base = callPackage ./generic.nix ( _args // { - version = "8.3.14"; - hash = "sha256-9W+mac5MAUUqKSH0ADTXedjCuX0HSUk61HgYE7kiHPg="; + version = "8.3.15"; + hash = "sha256-sWdaT/cwtYEbjmp2h0iMQug14Vapl3aqPm8Ber2jvpg="; } ); in From 99f881c95e1a8c359d5cbcf1ee06b98b8569de9e Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Fri, 29 Nov 2024 18:26:30 +0100 Subject: [PATCH 20/21] gitlab: 17.5.2 -> 17.6.1 (cherry picked from commit b7eae8cb6ad3dcde8c6a9d19e0a81004c94e2a50) --- .../version-management/gitlab/data.json | 16 +- .../gitlab/gitaly/default.nix | 6 +- .../gitlab-elasticsearch-indexer/default.nix | 6 +- .../gitlab/gitlab-pages/default.nix | 6 +- .../gitlab/gitlab-workhorse/default.nix | 4 +- .../version-management/gitlab/rubyEnv/Gemfile | 87 +++-- .../gitlab/rubyEnv/Gemfile.lock | 234 ++++++------- .../gitlab/rubyEnv/gemset.nix | 331 ++++++++---------- 8 files changed, 333 insertions(+), 357 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 47db1515a4e30..94dcc95a2d36e 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "17.5.4", - "repo_hash": "sha256-hKG9IZthAJc99wogi8K/4PgM5zTs525jKDZP9k6Clt0=", - "yarn_hash": "0x1yhgjrm7zyj9qir4yk1zkzj009a3s20hf6fqmsaala4hynnlnq", + "version": "17.6.1", + "repo_hash": "1az442dj0xxkb3bdqgln7ax5779bmndbx8p8mszybgghkjl0g4nq", + "yarn_hash": "0g60lvngbvgvirjag5l539innmklh2x6a56vd38svrgx5jm6d3jc", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v17.5.4-ee", + "rev": "v17.6.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "17.5.4", - "GITLAB_PAGES_VERSION": "17.5.4", + "GITALY_SERVER_VERSION": "17.6.1", + "GITLAB_PAGES_VERSION": "17.6.1", "GITLAB_SHELL_VERSION": "14.39.0", - "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.3.0", - "GITLAB_WORKHORSE_VERSION": "17.5.4" + "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.4.0", + "GITLAB_WORKHORSE_VERSION": "17.6.1" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 99bbc9cb6379d..55897855a8c74 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -7,7 +7,7 @@ }: let - version = "17.5.4"; + version = "17.6.1"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -21,10 +21,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-sxe4AwxkzuhVq/LJpsRbqBTYtF751rborawDhsFgfhc="; + hash = "sha256-eh/dMoKnwN+xz6dMnPZUD8b/SyrxUqDAtWmCIBXbIT4="; }; - vendorHash = "sha256-VN+d6jMX3f4ua+YEF6LmqEOTRm2q4zxZ/X73hhA4fNs="; + vendorHash = "sha256-AxuAEiYV3jwWxcuTLc1i4/6sG957YIA+Fmky5Dkdzu8="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix index 0f3019096b920..625ee8f4724db 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gitlab-elasticsearch-indexer"; - version = "5.3.0"; + version = "5.4.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-elasticsearch-indexer"; rev = "v${version}"; - hash = "sha256-upbVe78HLRWXf8knxsVX6mGbXHfMTPa7yQ7/XMTgGLo="; + hash = "sha256-jrUNOxqc/k4a/34nHEatGnBorTlh/EuHnEs/GfFRUcI="; }; - vendorHash = "sha256-sws1r6W6tYJI/zOWFFp2hry9ToXuE4fezIL1XPgp0EM="; + vendorHash = "sha256-iL8QowfX0OpU9irUP4MJXhGVim7GU2fTMLgJSTAfh9w="; buildInputs = [ icu ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index df4572e20f35d..27c07da4639ee 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "17.5.4"; + version = "17.6.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-gjYnougKEsydEW3sYSYxcGP7B0uL+IKs0nP3udOyqTg="; + hash = "sha256-fLQ2Hd1GtSBfxUJIozf4xcXC5yvNX4xqh0H0UVL55kw="; }; - vendorHash = "sha256-M2RQPkLWsi9rHXI3lSb9w9nxiklTkV8wpC9VoH0SP6M="; + vendorHash = "sha256-2feUOWcGj7eQ43rfM6IF55BawYVP4UY5sKA29Y9ozPk="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 1a7523fa793e0..e6c7da12cc407 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "17.5.4"; + version = "17.6.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { @@ -17,7 +17,7 @@ buildGoModule rec { sourceRoot = "${src.name}/workhorse"; - vendorHash = "sha256-10gJPUncde48Lk23mShHXM6ItTHvjh6Y8yMlGFfKkj8="; + vendorHash = "sha256-ir2Npjl39K2DzjT8fnbOOcMmfHiwFnVmvG04oh2GoOA="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 77864b7b4c113..99b050b2d5cb3 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -63,7 +63,7 @@ gem 'responders', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'sprockets', '~> 3.7.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'sprockets-rails', '~> 3.5.1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'view_component', '~> 3.14.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'view_component', '~> 3.20.0' # rubocop:todo Gemfile/MissingFeatureCategory # Supported DBs gem 'pg', '~> 1.5.6', feature_category: :database @@ -83,7 +83,7 @@ gem 'marginalia', '~> 1.11.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'declarative_policy', '~> 1.1.0' # rubocop:todo Gemfile/MissingFeatureCategory # For source code paths mapping -gem 'coverband', '6.1.2', require: false, feature_category: :shared +gem 'coverband', '6.1.4', require: false, feature_category: :shared # Authentication libraries gem 'devise', '~> 4.9.3', feature_category: :system_access @@ -112,7 +112,7 @@ gem 'openid_connect', '~> 2.3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-atlassian-oauth2', '~> 0.2.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'rack-oauth2', '~> 2.2.1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'jwt', '~> 2.5' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'jwt', '~> 2.9.3' # rubocop:todo Gemfile/MissingFeatureCategory # Kerberos authentication. EE-only gem 'gssapi', '~> 1.3.1', group: :kerberos # rubocop:todo Gemfile/MissingFeatureCategory @@ -159,9 +159,8 @@ gem 'grape-path-helpers', '~> 2.0.1', feature_category: :api gem 'rack-cors', '~> 2.0.1', require: 'rack/cors' # rubocop:todo Gemfile/MissingFeatureCategory # GraphQL API -gem 'graphql', '~> 2.3.14', feature_category: :api +gem 'graphql', '~> 2.4.1', feature_category: :api gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api -gem 'graphiql-rails', '~> 1.10', feature_category: :api gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api gem 'graphlient', '~> 0.8.0', feature_category: :importers # Used by BulkImport feature (group::import) @@ -235,9 +234,9 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-model', '~> 7.2', feature_category: :global_search gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation', feature_category: :global_search gem 'elasticsearch-api', '7.17.11', feature_category: :global_search -gem 'aws-sdk-core', '~> 3.206.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-core', '~> 3.211.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'aws-sdk-s3', '~> 1.163.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-s3', '~> 1.169.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'faraday-typhoeus', '~> 1.1', feature_category: :global_search gem 'faraday_middleware-aws-sigv4', '~> 1.0.1', feature_category: :global_search # Used with Elasticsearch to support http keep-alive connections @@ -248,7 +247,7 @@ gem 'html-pipeline', '~> 2.14.3', feature_category: :markdown gem 'deckar01-task_list', '2.3.4', feature_category: :markdown gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup', feature_category: :markdown gem 'commonmarker', '~> 0.23.10', feature_category: :markdown -gem 'kramdown', '~> 2.3.1', feature_category: :markdown +gem 'kramdown', '~> 2.4.0', feature_category: :markdown gem 'RedCloth', '~> 4.3.3', feature_category: :markdown gem 'org-ruby', '~> 0.9.12', feature_category: :markdown gem 'creole', '~> 0.5.0', feature_category: :markdown @@ -257,10 +256,12 @@ gem 'asciidoctor', '~> 2.0.18', feature_category: :markdown gem 'asciidoctor-include-ext', '~> 0.4.0', require: false, feature_category: :markdown gem 'asciidoctor-plantuml', '~> 0.0.16', feature_category: :markdown gem 'asciidoctor-kroki', '~> 0.10.0', require: false, feature_category: :markdown -gem 'rouge', '~> 4.3.0', feature_category: :shared +gem 'rouge', '~> 4.4.0', feature_category: :shared gem 'truncato', '~> 0.7.12', feature_category: :team_planning gem 'nokogiri', '~> 1.16', feature_category: :shared gem 'gitlab-glfm-markdown', '~> 0.0.21', feature_category: :markdown +gem 'tanuki_emoji', '~> 0.13', feature_category: :markdown +gem 'unicode-emoji', '~> 4.0', feature_category: :markdown # Calendar rendering gem 'icalendar', '~> 2.10.1', feature_category: :system_access @@ -376,20 +377,18 @@ gem 'terser', '1.0.2' # rubocop:todo Gemfile/MissingFeatureCategory gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client' # rubocop:todo Gemfile/MissingFeatureCategory gem 'addressable', '~> 2.8' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'tanuki_emoji', '~> 0.9' # rubocop:todo Gemfile/MissingFeatureCategory gem 'gon', '~> 6.4.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'request_store', '~> 1.5.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'base32', '~> 0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'gitlab-license', '~> 2.5', feature_category: :shared # Protect against bruteforcing gem 'rack-attack', '~> 6.7.0' # rubocop:todo Gemfile/MissingFeatureCategory # Sentry integration -gem 'sentry-ruby', '~> 5.19.0', feature_category: :observability -gem 'sentry-rails', '~> 5.19.0', feature_category: :observability -gem 'sentry-sidekiq', '~> 5.19.0', feature_category: :observability +gem 'sentry-ruby', '~> 5.21.0', feature_category: :observability +gem 'sentry-rails', '~> 5.21.0', feature_category: :observability +gem 'sentry-sidekiq', '~> 5.21.0', feature_category: :observability # PostgreSQL query parsing # @@ -437,31 +436,31 @@ gem 'gitlab-security_report_schemas', '0.1.2.min15.0.0.max15.2.1', feature_categ # OpenTelemetry group :opentelemetry do # Core OpenTelemetry gems - gem 'opentelemetry-sdk', feature_category: :tooling - gem 'opentelemetry-exporter-otlp', feature_category: :tooling + gem 'opentelemetry-sdk', feature_category: :observability + gem 'opentelemetry-exporter-otlp', feature_category: :observability # OpenTelemetry gems selected from full set in `opentelemetry-instrumentation-all` metagem - gem 'opentelemetry-instrumentation-active_support', feature_category: :tooling - gem 'opentelemetry-instrumentation-action_pack', feature_category: :tooling - gem 'opentelemetry-instrumentation-active_job', feature_category: :tooling - gem 'opentelemetry-instrumentation-active_record', feature_category: :tooling - gem 'opentelemetry-instrumentation-action_view', feature_category: :tooling - gem 'opentelemetry-instrumentation-aws_sdk', feature_category: :tooling - gem 'opentelemetry-instrumentation-http', feature_category: :tooling - gem 'opentelemetry-instrumentation-concurrent_ruby', feature_category: :tooling - gem 'opentelemetry-instrumentation-ethon', feature_category: :tooling - gem 'opentelemetry-instrumentation-excon', feature_category: :tooling - gem 'opentelemetry-instrumentation-faraday', feature_category: :tooling - gem 'opentelemetry-instrumentation-grape', feature_category: :tooling - gem 'opentelemetry-instrumentation-graphql', feature_category: :tooling - gem 'opentelemetry-instrumentation-http_client', feature_category: :tooling - gem 'opentelemetry-instrumentation-net_http', feature_category: :tooling - gem 'opentelemetry-instrumentation-pg', feature_category: :tooling - gem 'opentelemetry-instrumentation-rack', feature_category: :tooling - gem 'opentelemetry-instrumentation-rails', feature_category: :tooling - gem 'opentelemetry-instrumentation-rake', feature_category: :tooling - gem 'opentelemetry-instrumentation-redis', feature_category: :tooling - gem 'opentelemetry-instrumentation-sidekiq', feature_category: :tooling + gem 'opentelemetry-instrumentation-active_support', feature_category: :observability + gem 'opentelemetry-instrumentation-action_pack', feature_category: :observability + gem 'opentelemetry-instrumentation-active_job', feature_category: :observability + gem 'opentelemetry-instrumentation-active_record', feature_category: :observability + gem 'opentelemetry-instrumentation-action_view', feature_category: :observability + gem 'opentelemetry-instrumentation-aws_sdk', feature_category: :observability + gem 'opentelemetry-instrumentation-http', feature_category: :observability + gem 'opentelemetry-instrumentation-concurrent_ruby', feature_category: :observability + gem 'opentelemetry-instrumentation-ethon', feature_category: :observability + gem 'opentelemetry-instrumentation-excon', feature_category: :observability + gem 'opentelemetry-instrumentation-faraday', feature_category: :observability + gem 'opentelemetry-instrumentation-grape', feature_category: :observability + gem 'opentelemetry-instrumentation-graphql', feature_category: :observability + gem 'opentelemetry-instrumentation-http_client', feature_category: :observability + gem 'opentelemetry-instrumentation-net_http', feature_category: :observability + gem 'opentelemetry-instrumentation-pg', feature_category: :observability + gem 'opentelemetry-instrumentation-rack', feature_category: :observability + gem 'opentelemetry-instrumentation-rails', feature_category: :observability + gem 'opentelemetry-instrumentation-rake', feature_category: :observability + gem 'opentelemetry-instrumentation-redis', feature_category: :observability + gem 'opentelemetry-instrumentation-sidekiq', feature_category: :observability end gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -493,7 +492,7 @@ end group :development, :test do gem 'deprecation_toolkit', '~> 1.5.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'bullet', '~> 7.1.2' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'parser', '= 3.3.3.0', feature_category: :shared + gem 'parser', '= 3.3.6.0', feature_category: :shared gem 'pry-byebug' # rubocop:todo Gemfile/MissingFeatureCategory gem 'pry-rails', '~> 0.3.9' # rubocop:todo Gemfile/MissingFeatureCategory gem 'pry-shell', '~> 0.6.4' # rubocop:todo Gemfile/MissingFeatureCategory @@ -510,7 +509,7 @@ group :development, :test do gem 'spring', '~> 4.1.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'spring-commands-rspec', '~> 1.0.4' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'gitlab-styles', '~> 12.0.1', feature_category: :tooling + gem 'gitlab-styles', '~> 13.0.1', feature_category: :tooling gem 'haml_lint', '~> 0.58', feature_category: :tooling gem 'bundler-audit', '~> 0.9.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory @@ -582,7 +581,7 @@ group :test do gem 'shoulda-matchers', '~> 5.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'email_spec', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'webmock', '~> 3.23.0', feature_category: :shared + gem 'webmock', '~> 3.24.0', feature_category: :shared gem 'rails-controller-testing' # rubocop:todo Gemfile/MissingFeatureCategory gem 'concurrent-ruby', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'test-prof', '~> 1.4.0', feature_category: :tooling @@ -593,7 +592,7 @@ group :test do # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'gitlab_quality-test_tooling', '~> 1.39.0', require: false, feature_category: :tooling + gem 'gitlab_quality-test_tooling', '~> 2.1.0', require: false, feature_category: :tooling end gem 'octokit', '~> 9.0', feature_category: :importers @@ -630,10 +629,10 @@ gem 'ssh_data', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 17.4.0.pre.rc1', feature_category: :gitaly +gem 'gitaly', '~> 17.5.0.pre.rc1', feature_category: :gitaly # KAS GRPC protocol definitions -gem 'gitlab-kas-grpc', '~> 17.4.0.pre.rc1', feature_category: :deployment_management +gem 'gitlab-kas-grpc', '~> 17.5.0', feature_category: :deployment_management # Lock the version before issues below are resolved: # https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939 @@ -716,7 +715,7 @@ gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite' # rubocop:todo Gemfile/Missi gem 'arr-pm', '~> 0.0.12' # rubocop:todo Gemfile/MissingFeatureCategory # Remote Development -gem 'devfile', '~> 0.0.28.pre.alpha1', feature_category: :workspaces +gem 'devfile', '~> 0.1.0', feature_category: :workspaces # Apple plist parsing gem 'CFPropertyList', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 4926df4f551fc..94e4e0d1022b9 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -217,7 +217,7 @@ PATH PATH remote: vendor/gems/sidekiq-reliable-fetch specs: - gitlab-sidekiq-fetcher (0.11.0) + gitlab-sidekiq-fetcher (0.12.0) json (>= 2.5) sidekiq (~> 7.0) @@ -312,9 +312,10 @@ GEM apollo_upload_server (2.1.6) actionpack (>= 6.1.6) graphql (>= 1.8) - app_store_connect (0.29.0) + app_store_connect (0.38.0) activesupport (>= 6.0.0) - jwt (>= 1.4, <= 2.5.0) + jwt (>= 1.4) + zeitwerk (>= 2.6.7) arr-pm (0.0.12) asciidoctor (2.0.23) asciidoctor-include-ext (0.4.0) @@ -334,20 +335,20 @@ GEM awesome_print (1.9.2) awrence (1.2.1) aws-eventstream (1.3.0) - aws-partitions (1.877.0) + aws-partitions (1.1001.0) aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.206.0) + aws-sdk-core (3.211.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) + aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) aws-sdk-kms (1.76.0) aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.163.0) - aws-sdk-core (~> 3, >= 3.205.0) + aws-sdk-s3 (1.169.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) aws-sigv4 (1.9.1) @@ -451,7 +452,7 @@ GEM countries (4.0.1) i18n_data (~> 0.13.0) sixarm_ruby_unaccent (~> 1.1) - coverband (6.1.2) + coverband (6.1.4) redis (>= 3.0) crack (0.4.3) safe_yaml (~> 1.0.0) @@ -508,7 +509,7 @@ GEM thor (>= 0.19, < 2) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devfile (0.0.28.pre.alpha1) + devfile (0.1.0) device_detector (1.0.0) devise (4.9.3) bcrypt (~> 3.0) @@ -531,12 +532,12 @@ GEM docile (1.4.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - doorkeeper (5.6.6) + doorkeeper (5.7.1) railties (>= 5) doorkeeper-device_authorization_grant (1.0.3) doorkeeper (~> 5.5) - doorkeeper-openid_connect (1.8.7) - doorkeeper (>= 5.5, < 5.7) + doorkeeper-openid_connect (1.8.9) + doorkeeper (>= 5.5, < 5.8) jwt (>= 2.5) dotenv (2.7.6) dry-cli (1.0.0) @@ -593,13 +594,14 @@ GEM expression_parser (0.9.0) extended-markdown-filter (0.7.0) html-pipeline (~> 2.9) - factory_bot (6.4.5) + factory_bot (6.5.0) activesupport (>= 5.0.0) - factory_bot_rails (6.4.3) - factory_bot (~> 6.4) + factory_bot_rails (6.4.4) + factory_bot (~> 6.5) railties (>= 5.0.0) - faraday (2.11.0) - faraday-net_http (>= 2.0, < 3.4) + faraday (2.12.1) + faraday-net_http (>= 2.0, < 3.5) + json logger faraday-follow_redirects (0.3.0) faraday (>= 1, < 3) @@ -714,7 +716,7 @@ GEM git (1.18.0) addressable (~> 2.8) rchardet (~> 1.8) - gitaly (17.4.0.pre.rc1) + gitaly (17.5.0.pre.rc42) grpc (~> 1.0) gitlab (4.19.0) httparty (~> 0.20) @@ -739,7 +741,7 @@ GEM nokogiri (~> 1, >= 1.10.8) gitlab-glfm-markdown (0.0.21) rb_sys (= 0.9.94) - gitlab-kas-grpc (17.4.0.pre.rc1) + gitlab-kas-grpc (17.5.1) grpc (~> 1.0) gitlab-labkit (0.36.1) actionpack (>= 5.0.0, < 8.0.0) @@ -765,13 +767,15 @@ GEM gitlab-security_report_schemas (0.1.2.min15.0.0.max15.2.1) activesupport (>= 6, < 8) json_schemer (~> 2.3.0) - gitlab-styles (12.0.1) - rubocop (~> 1.62.1) - rubocop-factory_bot (~> 2.25.1) - rubocop-graphql (~> 1.5.0) - rubocop-performance (~> 1.20.2) - rubocop-rails (~> 2.24.0) - rubocop-rspec (~> 2.27.1) + gitlab-styles (13.0.1) + rubocop (~> 1.67.0) + rubocop-capybara (~> 2.21.0) + rubocop-factory_bot (~> 2.26.1) + rubocop-graphql (~> 1.5.4) + rubocop-performance (~> 1.21.1) + rubocop-rails (~> 2.26.0) + rubocop-rspec (~> 3.0.4) + rubocop-rspec_rails (~> 2.30.0) gitlab_chronic_duration (0.12.0) numerizer (~> 0.2) gitlab_omniauth-ldap (2.2.0) @@ -779,11 +783,11 @@ GEM omniauth (>= 1.3, < 3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - gitlab_quality-test_tooling (1.39.0) + gitlab_quality-test_tooling (2.1.0) activesupport (>= 7.0, < 7.2) amatch (~> 0.4.1) fog-google (~> 1.24, >= 1.24.1) - gitlab (~> 4.19) + gitlab (>= 4.19, < 6.0) http (~> 5.0) influxdb-client (~> 3.1) nokogiri (~> 1.10) @@ -913,13 +917,11 @@ GEM grape_logging (1.8.4) grape rack - graphiql-rails (1.10.0) - railties graphlient (0.8.0) faraday (~> 2.0) graphql-client graphlyte (1.0.0) - graphql (2.3.17) + graphql (2.4.1) base64 fiber-storage graphql-client (0.23.0) @@ -959,7 +961,7 @@ GEM haml (5.2.2) temple (>= 0.8.0) tilt - haml_lint (0.58.0) + haml_lint (0.59.0) haml (>= 5.0) parallel (~> 1.10) rainbow @@ -1025,7 +1027,7 @@ GEM character_set (~> 1.4) regexp_parser (~> 2.5) regexp_property_values (~> 1.0) - json (2.7.2) + json (2.7.3) json-jwt (1.16.6) activesupport (>= 4.2) aes_key_wrap @@ -1044,7 +1046,8 @@ GEM pg (>= 0.18.1) jsonpath (1.1.2) multi_json - jwt (2.5.0) + jwt (2.9.3) + base64 kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -1059,7 +1062,7 @@ GEM kaminari-core (1.2.2) knapsack (4.0.0) rake - kramdown (2.3.2) + kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) @@ -1110,7 +1113,7 @@ GEM loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - lookbook (2.3.2) + lookbook (2.3.4) activemodel css_parser htmlbeautifier (~> 1.3) @@ -1142,7 +1145,7 @@ GEM mini_histogram (0.3.1) mini_magick (4.12.0) mini_mime (1.1.2) - mini_portile2 (2.8.5) + mini_portile2 (2.8.7) minitest (5.11.3) mixlib-cli (2.1.8) mixlib-config (3.0.27) @@ -1150,8 +1153,7 @@ GEM mixlib-log (3.0.9) mixlib-shellout (3.2.7) chef-utils - mize (0.4.1) - protocol (~> 2.0) + mize (0.6.0) msgpack (1.5.4) multi_json (1.14.1) multi_xml (0.6.0) @@ -1186,7 +1188,7 @@ GEM netrc (0.11.0) nio4r (2.7.0) no_proxy_fix (0.1.2) - nokogiri (1.16.0) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) notiffany (0.1.3) @@ -1201,7 +1203,7 @@ GEM rack (>= 1.2, < 4) snaky_hash (~> 2.0) version_gem (~> 1.1) - octokit (9.1.0) + octokit (9.2.0) faraday (>= 1, < 3) sawyer (~> 0.9) ohai (18.1.3) @@ -1276,7 +1278,7 @@ GEM opentelemetry-api (1.2.5) opentelemetry-common (0.21.0) opentelemetry-api (~> 1.0) - opentelemetry-exporter-otlp (0.28.1) + opentelemetry-exporter-otlp (0.29.0) google-protobuf (>= 3.18) googleapis-common-protos-types (~> 1.3) opentelemetry-api (~> 1.1) @@ -1285,7 +1287,7 @@ GEM opentelemetry-semantic_conventions opentelemetry-helpers-sql-obfuscation (0.1.0) opentelemetry-common (~> 0.20) - opentelemetry-instrumentation-action_mailer (0.1.0) + opentelemetry-instrumentation-action_mailer (0.2.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-active_support (~> 0.1) opentelemetry-instrumentation-base (~> 0.22.1) @@ -1293,20 +1295,20 @@ GEM opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-rack (~> 0.21) - opentelemetry-instrumentation-action_view (0.7.2) + opentelemetry-instrumentation-action_view (0.7.3) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-active_support (~> 0.1) + opentelemetry-instrumentation-active_support (~> 0.6) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-active_job (0.7.7) + opentelemetry-instrumentation-active_job (0.7.8) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-active_record (0.7.4) + opentelemetry-instrumentation-active_record (0.8.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-active_support (0.6.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-aws_sdk (0.5.4) + opentelemetry-instrumentation-aws_sdk (0.7.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-base (0.22.3) @@ -1340,20 +1342,20 @@ GEM opentelemetry-instrumentation-net_http (0.22.7) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-pg (0.28.0) + opentelemetry-instrumentation-pg (0.29.0) opentelemetry-api (~> 1.0) opentelemetry-helpers-sql-obfuscation opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rack (0.24.6) + opentelemetry-instrumentation-rack (0.25.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rails (0.31.2) + opentelemetry-instrumentation-rails (0.32.0) opentelemetry-api (~> 1.0) - opentelemetry-instrumentation-action_mailer (~> 0.1.0) + opentelemetry-instrumentation-action_mailer (~> 0.2.0) opentelemetry-instrumentation-action_pack (~> 0.9.0) opentelemetry-instrumentation-action_view (~> 0.7.0) opentelemetry-instrumentation-active_job (~> 0.7.0) - opentelemetry-instrumentation-active_record (~> 0.7.0) + opentelemetry-instrumentation-active_record (~> 0.8.0) opentelemetry-instrumentation-active_support (~> 0.6.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-rake (0.2.2) @@ -1405,7 +1407,7 @@ GEM activerecord (>= 6.1) request_store (~> 1.4) parallel (1.24.0) - parser (3.3.3.0) + parser (3.3.6.0) ast (~> 2.4.1) racc parslet (1.8.2) @@ -1436,8 +1438,6 @@ GEM unparser prometheus-client-mmap (1.1.1) rb_sys (~> 0.9.86) - protocol (2.0.0) - ruby_parser (~> 3.0) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) @@ -1455,8 +1455,8 @@ GEM nio4r (~> 2.0) pyu-ruby-sasl (0.0.3.3) raabro (1.4.0) - racc (1.6.2) - rack (2.2.9) + racc (1.8.1) + rack (2.2.10) rack-accept (0.4.5) rack (>= 0.4) rack-attack (6.7.0) @@ -1503,7 +1503,7 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - rails-i18n (7.0.9) + rails-i18n (7.0.10) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) railties (7.0.8.4) @@ -1571,11 +1571,10 @@ GEM retriable (3.1.2) reverse_markdown (1.4.0) nokogiri - rexml (3.3.2) - strscan + rexml (3.3.9) rinku (2.0.0) rotp (6.3.0) - rouge (4.3.0) + rouge (4.4.0) rqrcode (2.2.0) chunky_png (~> 1.0) rqrcode_core (~> 1.0) @@ -1625,37 +1624,37 @@ GEM activerecord get_process_mem rails - rubocop (1.62.1) + rubocop (1.67.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.31.1, < 2.0) + regexp_parser (>= 2.4, < 3.0) + rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.2) - parser (>= 3.3.0.4) - rubocop-capybara (2.20.0) - rubocop (~> 1.41) - rubocop-factory_bot (2.25.1) + rubocop-ast (1.32.3) + parser (>= 3.3.1.0) + rubocop-capybara (2.21.0) rubocop (~> 1.41) - rubocop-graphql (1.5.1) - rubocop (>= 0.90, < 2) - rubocop-performance (1.20.2) + rubocop-factory_bot (2.26.1) + rubocop (~> 1.61) + rubocop-graphql (1.5.4) + rubocop (>= 1.50, < 2) + rubocop-performance (1.21.1) rubocop (>= 1.48.1, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rails (2.24.1) + rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rails (2.26.2) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.33.0, < 2.0) + rubocop (>= 1.52.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rspec (2.27.1) - rubocop (~> 1.40) - rubocop-capybara (~> 2.17) - rubocop-factory_bot (~> 2.22) + rubocop-rspec (3.0.5) + rubocop (~> 1.61) + rubocop-rspec_rails (2.30.0) + rubocop (~> 1.61) + rubocop-rspec (~> 3, >= 3.0.1) ruby-fogbugz (0.3.0) crack (~> 0.4) multipart-post (~> 2.0) @@ -1678,9 +1677,6 @@ GEM rexml ruby-statistics (3.0.0) ruby2_keywords (0.0.5) - ruby_parser (3.21.0) - racc (~> 1.5) - sexp_processor (~> 4.16) rubyntlm (0.6.3) rubypants (0.2.0) rubyzip (2.3.2) @@ -1701,27 +1697,26 @@ GEM seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) - selenium-webdriver (4.23.0) + selenium-webdriver (4.25.0) base64 (~> 0.2) logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - semver_dialects (3.4.3) + semver_dialects (3.4.4) deb_version (~> 1.0.1) pastel (~> 0.8.0) thor (~> 1.3) tty-command (~> 0.10.1) - sentry-rails (5.19.0) + sentry-rails (5.21.0) railties (>= 5.0) - sentry-ruby (~> 5.19.0) - sentry-ruby (5.19.0) + sentry-ruby (~> 5.21.0) + sentry-ruby (5.21.0) bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) - sentry-sidekiq (5.19.0) - sentry-ruby (~> 5.19.0) + sentry-sidekiq (5.21.0) + sentry-ruby (~> 5.21.0) sidekiq (>= 3.0) - sexp_processor (4.17.1) shellany (0.0.1) shoulda-matchers (5.1.0) activesupport (>= 5.2.0) @@ -1799,7 +1794,6 @@ GEM unicode-display_width (>= 1.5, < 3.0) unicode_utils (~> 1.4) strings-ansi (0.2.0) - strscan (3.1.0) swd (2.0.3) activesupport (>= 3) attr_required (>= 0.0.5) @@ -1810,7 +1804,8 @@ GEM ffi (~> 1.1) sysexits (1.2.0) table_print (1.5.7) - tanuki_emoji (0.9.0) + tanuki_emoji (0.13.0) + i18n (~> 1.14) telesign (2.2.4) net-http-persistent (>= 3.0.0, < 5.0) telesignenterprise (2.2.2) @@ -1885,6 +1880,9 @@ GEM unf_ext unf_ext (0.0.8.2) unicode-display_width (2.4.2) + unicode-emoji (4.0.0) + unicode-version (~> 1.0) + unicode-version (1.4.0) unicode_utils (1.4.0) uniform_notifier (1.16.0) unleash (3.2.2) @@ -1904,8 +1902,8 @@ GEM activesupport (>= 3.0) version_gem (1.1.0) version_sorter (2.3.0) - view_component (3.14.0) - activesupport (>= 5.2.0, < 8.0) + view_component (3.20.0) + activesupport (>= 5.2.0, < 8.1) concurrent-ruby (~> 1.0) method_source (~> 1.0) virtus (2.0.0) @@ -1936,7 +1934,7 @@ GEM activesupport faraday (~> 2.0) faraday-follow_redirects - webmock (3.23.1) + webmock (3.24.0) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -1983,8 +1981,8 @@ DEPENDENCIES attr_encrypted (~> 3.2.4)! awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.206.0) - aws-sdk-s3 (~> 1.163.0) + aws-sdk-core (~> 3.211.0) + aws-sdk-s3 (~> 1.169.0) axe-core-rspec (~> 4.9.0) babosa (~> 2.0) base32 (~> 0.3.0) @@ -2009,7 +2007,7 @@ DEPENDENCIES concurrent-ruby (~> 1.1) connection_pool (~> 2.4) countries (~> 4.0.0) - coverband (= 6.1.2) + coverband (= 6.1.4) creole (~> 0.5.0) crystalball (~> 0.7.0) cssbundling-rails (= 1.4.1) @@ -2020,7 +2018,7 @@ DEPENDENCIES declarative_policy (~> 1.1.0) deprecation_toolkit (~> 1.5.1) derailed_benchmarks - devfile (~> 0.0.28.pre.alpha1) + devfile (~> 0.1.0) device_detector devise (~> 4.9.3) devise-pbkdf2-encryptable (~> 0.0.0)! @@ -2061,7 +2059,7 @@ DEPENDENCIES gdk-toogle (~> 0.9, >= 0.9.5) gettext (~> 3.4, >= 3.4.9) gettext_i18n_rails (~> 1.13.0) - gitaly (~> 17.4.0.pre.rc1) + gitaly (~> 17.5.0.pre.rc1) gitlab-backup-cli! gitlab-chronic (~> 0.10.5) gitlab-dangerfiles (~> 4.8.0) @@ -2071,7 +2069,7 @@ DEPENDENCIES gitlab-glfm-markdown (~> 0.0.21) gitlab-housekeeper! gitlab-http! - gitlab-kas-grpc (~> 17.4.0.pre.rc1) + gitlab-kas-grpc (~> 17.5.0) gitlab-labkit (~> 0.36.0) gitlab-license (~> 2.5) gitlab-mail_room (~> 0.0.24) @@ -2085,12 +2083,12 @@ DEPENDENCIES gitlab-secret_detection! gitlab-security_report_schemas (= 0.1.2.min15.0.0.max15.2.1) gitlab-sidekiq-fetcher! - gitlab-styles (~> 12.0.1) + gitlab-styles (~> 13.0.1) gitlab-topology-service-client (~> 0.1)! gitlab-utils! gitlab_chronic_duration (~> 0.12) gitlab_omniauth-ldap (~> 2.2.0) - gitlab_quality-test_tooling (~> 1.39.0) + gitlab_quality-test_tooling (~> 2.1.0) gon (~> 6.4.0) google-apis-androidpublisher_v3 (~> 0.34.0) google-apis-cloudbilling_v1 (~> 0.21.0) @@ -2115,10 +2113,9 @@ DEPENDENCIES grape-swagger (~> 2.1.0) grape-swagger-entity (~> 0.5.1) grape_logging (~> 1.8, >= 1.8.4) - graphiql-rails (~> 1.10) graphlient (~> 0.8.0) graphlyte (~> 1.0.0) - graphql (~> 2.3.14) + graphql (~> 2.4.1) graphql-docs (~> 5.0.0) grpc (= 1.63.0) gssapi (~> 1.3.1) @@ -2142,10 +2139,10 @@ DEPENDENCIES json (~> 2.7.2) json_schemer (~> 2.3.0) jsonb_accessor (~> 1.3.10) - jwt (~> 2.5) + jwt (~> 2.9.3) kaminari (~> 1.2.2) knapsack (~> 4.0.0) - kramdown (~> 2.3.1) + kramdown (~> 2.4.0) kubeclient (~> 4.11.0) lefthook (~> 1.7.0) letter_opener_web (~> 3.0.0) @@ -2222,7 +2219,7 @@ DEPENDENCIES pact (~> 1.64) paper_trail (~> 15.0) parallel (~> 1.19) - parser (= 3.3.3.0) + parser (= 3.3.6.0) parslet (~> 1.8) peek (~> 1.1) pg (~> 1.5.6) @@ -2255,7 +2252,7 @@ DEPENDENCIES responders (~> 3.0) retriable (~> 3.1.2) rexml (~> 3.3.2) - rouge (~> 4.3.0) + rouge (~> 4.4.0) rqrcode (~> 2.2) rspec-benchmark (~> 0.6.0) rspec-parameterized (~> 1.0, >= 1.0.2) @@ -2279,9 +2276,9 @@ DEPENDENCIES seed-fu (~> 2.3.7) selenium-webdriver (~> 4.21, >= 4.21.1) semver_dialects (~> 3.0) - sentry-rails (~> 5.19.0) - sentry-ruby (~> 5.19.0) - sentry-sidekiq (~> 5.19.0) + sentry-rails (~> 5.21.0) + sentry-ruby (~> 5.21.0) + sentry-sidekiq (~> 5.21.0) shoulda-matchers (~> 5.1.0) sidekiq! sidekiq-cron (~> 1.12.0) @@ -2303,7 +2300,7 @@ DEPENDENCIES stackprof (~> 0.2.26) state_machines-activerecord (~> 0.8.0) sys-filesystem (~> 1.4.3) - tanuki_emoji (~> 0.9) + tanuki_emoji (~> 0.13) telesignenterprise (~> 2.2) terser (= 1.0.2) test-prof (~> 1.4.0) @@ -2315,17 +2312,18 @@ DEPENDENCIES tty-prompt (~> 0.23) typhoeus (~> 1.4.0) undercover (~> 0.5.0) + unicode-emoji (~> 4.0) unleash (~> 3.2.2) valid_email (~> 0.1) validates_hostname (~> 1.0.13) version_sorter (~> 2.3) - view_component (~> 3.14.0) + view_component (~> 3.20.0) vite_rails (~> 3.0.17) vite_ruby (~> 3.8.0) vmstat (~> 2.3.0) warning (~> 1.3.0) webauthn (~> 3.0) - webmock (~> 3.23.0) + webmock (~> 3.24.0) webrick (~> 1.8.1) wikicloth (= 0.8.1) yajl-ruby (~> 1.4.3) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 0d38783c9d3b6..dd5ddff416041 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -228,15 +228,15 @@ src: version = "2.1.6"; }; app_store_connect = { - dependencies = ["activesupport" "jwt"]; + dependencies = ["activesupport" "jwt" "zeitwerk"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03s3x8b6ifjrqk9ian59i9yyxxl65ykvbb4r424j2hjsh8iskmq1"; + sha256 = "1rjwnb5fj0kzwgrn1n98gnb0s855ck1dm3j06sd01vcqj8829xih"; type = "gem"; }; - version = "0.29.0"; + version = "0.38.0"; }; arr-pm = { groups = ["default"]; @@ -378,10 +378,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zcwrlg4in3gzvsiynpzp9fzlr5grrhc2881xcgfs01ppmxysllm"; + sha256 = "01w3b84d129q9b6bg2cm8p4cn8pl74l343sxsc47ax9sglqz6y99"; type = "gem"; }; - version = "1.877.0"; + version = "1.1001.0"; }; aws-sdk-cloudformation = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -400,10 +400,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w1cqsh59c417359sj07wj5dkg0qlx5adz1m6r9knj6ax06z9zch"; + sha256 = "16mvscjhxdyhlvk2rpbxdzqmyikcf64xavb35grk4dkh0pg390rk"; type = "gem"; }; - version = "3.206.0"; + version = "3.211.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -422,10 +422,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07nbpffq5ih9ig7lx3721a99as9agnpd99r15s578wwsqrkkssnl"; + sha256 = "1jnf9k9d91ki3yvy12q4kph5wvd8l3ziwwh0qsmar5xhyb7zbwrz"; type = "gem"; }; - version = "1.163.0"; + version = "1.169.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -993,10 +993,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cms6ppz367fqfynyzjdsy1lqrxkrh6vvfzznrw3mxhz1xmkb7wp"; + sha256 = "1j0p1qsnnx0xhx43y7xskxwpcsv3yw5wj79qf7naf3nhdn73kkv5"; type = "gem"; }; - version = "6.1.2"; + version = "6.1.4"; }; crack = { dependencies = ["safe_yaml"]; @@ -1233,10 +1233,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yyggbmai6jhrndhs154vd6manng9fig7jak1x875l1iz64p1hjr"; + sha256 = "18fbys0bf562681c96a4qcbdwxhlc9w3jz8rzkkfqns421hn024q"; type = "gem"; }; - version = "0.0.28.pre.alpha1"; + version = "0.1.0"; }; device_detector = { groups = ["default"]; @@ -1358,10 +1358,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q2pywgyn6cbnm0fh3dln5z1qgd1g8hvb4x8rppjc1bpfxnfhi13"; + sha256 = "0a6nbc12nfz355am2vwm1ql2p8zck7mr941glghmnl32djaga24b"; type = "gem"; }; - version = "5.6.6"; + version = "5.7.1"; }; doorkeeper-device_authorization_grant = { dependencies = ["doorkeeper"]; @@ -1380,10 +1380,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11p7p3b0yb12xfdhxxsifc2mz0rj1hlgi8sbcwjzxvld24rszvbi"; + sha256 = "1bpw7flhhkfffbfpxrpc46hw1jrvmyafn8npqzhlds8ks68sj2ap"; type = "gem"; }; - version = "1.8.7"; + version = "1.8.9"; }; dotenv = { groups = ["default"]; @@ -1694,10 +1694,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1glq677vmd3xrdilcx6ar8sdaysm9ldrppg34yzw43jzr6dx47fp"; + sha256 = "0q927lvgjqj0xaplxhicj5xv8xadx3957mank3p7g01vb6iv6x33"; type = "gem"; }; - version = "6.4.5"; + version = "6.5.0"; }; factory_bot_rails = { dependencies = ["factory_bot" "railties"]; @@ -1705,21 +1705,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j6w4rr2cb5wng9yrn2ya9k40q52m0pbz47kzw8xrwqg3jncwwza"; + sha256 = "122wkrc3d2q1dlca27794hh3arw0kvrf3rgmvn7hj3y5lb51g7hk"; type = "gem"; }; - version = "6.4.3"; + version = "6.4.4"; }; faraday = { - dependencies = ["faraday-net_http" "logger"]; + dependencies = ["faraday-net_http" "json" "logger"]; groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00pd34pnfmij5iw1xv73f6d68zng63wyjhmk7dyi010kmb4x5sp6"; + sha256 = "0vxaw0mg8avqivdj0lzj19nxf652ri208grsdf0361flyn5i5wi3"; type = "gem"; }; - version = "2.11.0"; + version = "2.12.1"; }; faraday-follow_redirects = { dependencies = ["faraday"]; @@ -2156,10 +2156,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1czp3492kpvpbxwgb7bpdlwmnldr64qvw5z0sa6yf6w7fzx9vikj"; + sha256 = "05z84knb5f520azqcq0mzwrp3s4c13hpl1bfkkq86paw4hq94ihm"; type = "gem"; }; - version = "17.4.0.pre.rc1"; + version = "17.5.0.pre.rc42"; }; gitlab = { dependencies = ["httparty" "terminal-table"]; @@ -2273,10 +2273,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jljmgkabr02645nd7f0zf936k4q2j3yfhap445q66z7lcsr8rrp"; + sha256 = "19qwlv3kjszypx8in77llqanlsgdcb16wsgzzfkph79hm7x9nqw8"; type = "gem"; }; - version = "17.4.0.pre.rc1"; + version = "17.5.1"; }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; @@ -2410,18 +2410,18 @@ src: path = "${src}/vendor/gems/sidekiq-reliable-fetch"; type = "path"; }; - version = "0.11.0"; + version = "0.12.0"; }; gitlab-styles = { - dependencies = ["rubocop" "rubocop-factory_bot" "rubocop-graphql" "rubocop-performance" "rubocop-rails" "rubocop-rspec"]; + dependencies = ["rubocop" "rubocop-capybara" "rubocop-factory_bot" "rubocop-graphql" "rubocop-performance" "rubocop-rails" "rubocop-rspec" "rubocop-rspec_rails"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cyi9sccg1h7ia12i9jwbq5ygic53c7pc08ms7i1h7qfmfq058yq"; + sha256 = "1gb89c035f32hj8iam4hxlyx6c7f1apq66hzzrvan5djjzz4065z"; type = "gem"; }; - version = "12.0.1"; + version = "13.0.1"; }; gitlab-topology-service-client = { dependencies = ["grpc"]; @@ -2471,10 +2471,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dgalsl4452fgbzkg8frgyyas6rp3zac055iihsv3db9bi4vhg1v"; + sha256 = "0z74fj5gklxpq8bc622f6psaaz8fpkg08q4lf28kj9krcx3b0jw3"; type = "gem"; }; - version = "1.39.0"; + version = "2.1.0"; }; globalid = { dependencies = ["activesupport"]; @@ -2903,17 +2903,6 @@ src: }; version = "1.8.4"; }; - graphiql-rails = { - dependencies = ["railties"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0h0hi4i49hd7087ba7kh78wykc9gqnz0j9hlhplvkj1ply4zjmxm"; - type = "gem"; - }; - version = "1.10.0"; - }; graphlient = { dependencies = ["faraday" "graphql-client"]; groups = ["default"]; @@ -2941,10 +2930,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qsljlb2fm8qmd8169ijyrnfixd63jcpy7w222bws1xbz1dna0sy"; + sha256 = "0sc2s5yprba7i6x8iskd39fsp93r04xa08wbz1m5bygvj0lb7zpf"; type = "gem"; }; - version = "2.3.17"; + version = "2.4.1"; }; graphql-client = { dependencies = ["activesupport" "graphql"]; @@ -3050,10 +3039,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mf24djxk6968n0ypwbib790nzijcf03m4kw0dnks8csfxj6hy9g"; + sha256 = "1cc45znb0fiab69d0x67yakd5kywwl7w9ck128ikzqrgixa2ps12"; type = "gem"; }; - version = "0.58.0"; + version = "0.59.0"; }; hamlit = { dependencies = ["temple" "thor" "tilt"]; @@ -3401,14 +3390,14 @@ src: version = "3.8.0"; }; json = { - groups = ["default" "development" "test"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q"; + sha256 = "1prbjd8r4rq6hjc6d5hn8hlpf4g9h62swxj7absjac7qqnzwrhvw"; type = "gem"; }; - version = "2.7.2"; + version = "2.7.3"; }; json-jwt = { dependencies = ["activesupport" "aes_key_wrap" "base64" "bindata" "faraday" "faraday-follow_redirects"]; @@ -3455,14 +3444,15 @@ src: version = "1.1.2"; }; jwt = { - groups = ["default"]; + dependencies = ["base64"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kcmnx6rgjyd7sznai9ccns2nh7p7wnw3mi8a7vf2wkm51azwddq"; + sha256 = "0rba9mji57sfa1kjhj0bwff1377vj0i8yx2rd39j5ik4vp60gzam"; type = "gem"; }; - version = "2.5.0"; + version = "2.9.3"; }; kaminari = { dependencies = ["activesupport" "kaminari-actionview" "kaminari-activerecord" "kaminari-core"]; @@ -3524,10 +3514,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0757lqaq593z8hzdv98nai73ag384dkk7jgj3mcq2r6ix7130ifb"; + sha256 = "1ic14hdcqxn821dvzki99zhmcy130yhv5fqfffkcf87asv5mnbmn"; type = "gem"; }; - version = "2.3.2"; + version = "2.4.0"; }; kramdown-parser-gfm = { dependencies = ["kramdown"]; @@ -3716,10 +3706,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02hniq2gjckb0s70w2p90aymrf4x8lpjl0mq1arhl5fr2gmyzkdb"; + sha256 = "01bni0dlqc9blb1akqsna39l2wb9a9dgv75mqhihrb0lnng4qj0n"; type = "gem"; }; - version = "2.3.2"; + version = "2.3.4"; }; lru_redux = { groups = ["default"]; @@ -3883,10 +3873,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; + sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk"; type = "gem"; }; - version = "2.8.5"; + version = "2.8.7"; }; minitest = { groups = ["development" "test"]; @@ -3941,15 +3931,14 @@ src: version = "3.2.7"; }; mize = { - dependencies = ["protocol"]; groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09zn7789ifzc13xraqsqxk762l4898n1f63scidgzjq1y06bmg2m"; + sha256 = "0qr3vf0qc216kyyv2vnp8p9pv73di6zd6v9sx51qw5awrd90y6iz"; type = "gem"; }; - version = "0.4.1"; + version = "0.6.0"; }; msgpack = { groups = ["default"]; @@ -4197,10 +4186,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l8b0i24h4irivyhwy9xmkjbggw86cxkzkiqdqg0jpcp9qc8h4rl"; + sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq"; type = "gem"; }; - version = "1.16.0"; + version = "1.16.7"; }; notiffany = { dependencies = ["nenv" "shellany"]; @@ -4250,10 +4239,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lw2537cdgxx9la7d5jwm3qkk5bwarz1v3glh68n4b3js9cscjbq"; + sha256 = "05j3gz79gxkid3lc2balyllqik4v4swnm0rcvxz14m76bkrpz92g"; type = "gem"; }; - version = "9.1.0"; + version = "9.2.0"; }; ohai = { dependencies = ["chef-config" "chef-utils" "ffi" "ffi-yajl" "ipaddress" "mixlib-cli" "mixlib-config" "mixlib-log" "mixlib-shellout" "plist" "train-core" "wmi-lite"]; @@ -4528,10 +4517,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0saiiaf5bkg95fjcq6asz5w86s6zg76xb0r93dcffhvnz36z0r2v"; + sha256 = "1yl10v1vvb9krvvks0si5nbjpknz8lcbbcryqkf2g0db3kha072d"; type = "gem"; }; - version = "0.28.1"; + version = "0.29.0"; }; opentelemetry-helpers-sql-obfuscation = { dependencies = ["opentelemetry-common"]; @@ -4550,10 +4539,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1afibmwprdiqnkin7lb6zdxng36rqa7qbl5fl9wx0lchpc039zjj"; + sha256 = "03nbn48q5ymk4wyhvnqa1wzvi1mzy2cbc8pmpf26x217zy6dvwl8"; type = "gem"; }; - version = "0.1.0"; + version = "0.2.0"; }; opentelemetry-instrumentation-action_pack = { dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base" "opentelemetry-instrumentation-rack"]; @@ -4572,10 +4561,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17qild0js6rgv95rphhs19jhd6ixspv1qvpijchqxmxg8waxmwih"; + sha256 = "08ga079lc2xariw83xc4ly1kab718ripmfb9af7xh6vm9qajka3d"; type = "gem"; }; - version = "0.7.2"; + version = "0.7.3"; }; opentelemetry-instrumentation-active_job = { dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; @@ -4583,10 +4572,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a5afx39bf0pzi0w75ic8zs8447i96993h056ww4vr23zl585f2x"; + sha256 = "0hirfvkg4kf575al080zvnpbxs3y9qlmzdr1w7qwkap7mjdks6r8"; type = "gem"; }; - version = "0.7.7"; + version = "0.7.8"; }; opentelemetry-instrumentation-active_record = { dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; @@ -4594,10 +4583,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fq0i6rmxvgj56jafj8ka19j2nkpj2yvj7h0zi0hc4s6r1s2xmvx"; + sha256 = "1j61jv60hdvjs18rj7i3lbkd5zqkfm8fdx15c0ixdxc15q88778r"; type = "gem"; }; - version = "0.7.4"; + version = "0.8.0"; }; opentelemetry-instrumentation-active_support = { dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; @@ -4616,10 +4605,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fxk5jaliz93njgfmbl5ygsbzbwqbh0g48w4ar905xxsfg1dl18q"; + sha256 = "1d8rbbn3qnv0bb4l7mlxd9zlihf8m6k7rrajaj5zmq5p9fq79hx3"; type = "gem"; }; - version = "0.5.4"; + version = "0.7.0"; }; opentelemetry-instrumentation-base = { dependencies = ["opentelemetry-api" "opentelemetry-registry"]; @@ -4737,10 +4726,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sv1bkmapkzyvivf50wjcmq7cv16g9capngzky8p1p2dai0f2794"; + sha256 = "1lgkjp0h0hf51n6afgafqaswvm06ybsvj3yf7dxxkzjpnzgxvjvg"; type = "gem"; }; - version = "0.28.0"; + version = "0.29.0"; }; opentelemetry-instrumentation-rack = { dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; @@ -4748,10 +4737,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dmfxcc2xz2qa4zp0sks5zrqcfr4fbpbc9xdgvcv8ys0ipf7pwn0"; + sha256 = "0g94rqqgw1jhqfng2692559wrldl6xji45lhbr4id3l1dd7qp72k"; type = "gem"; }; - version = "0.24.6"; + version = "0.25.0"; }; opentelemetry-instrumentation-rails = { dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-action_mailer" "opentelemetry-instrumentation-action_pack" "opentelemetry-instrumentation-action_view" "opentelemetry-instrumentation-active_job" "opentelemetry-instrumentation-active_record" "opentelemetry-instrumentation-active_support" "opentelemetry-instrumentation-base"]; @@ -4759,10 +4748,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12k4s1k9wa257bqfny33byscb4ai86jw4q6ygrzsj3iv2bij07w9"; + sha256 = "13nj66l0jhs4pz4krlncyach5zb1bbb82bfipkvc33b0dmicll88"; type = "gem"; }; - version = "0.31.2"; + version = "0.32.0"; }; opentelemetry-instrumentation-rake = { dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; @@ -4941,10 +4930,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sryynf3iws1b2ffba1gvmlpf8jzhfva5p0qdf37x6wdj683rqm2"; + sha256 = "0fxw738al3qxa4s4ghqkxb908sav03i3h7xflawwmxzhqiyfdm15"; type = "gem"; }; - version = "3.3.3.0"; + version = "3.3.6.0"; }; parslet = { groups = ["default" "development" "test"]; @@ -5084,17 +5073,6 @@ src: }; version = "1.1.1"; }; - protocol = { - dependencies = ["ruby_parser"]; - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1f8nvz0621gfsyiwy2nmwaliqafmf4p2wnln9qldd31vwl4wbmyw"; - type = "gem"; - }; - version = "2.0.0"; - }; pry = { dependencies = ["coderay" "method_source"]; groups = ["default" "development" "test"]; @@ -5181,24 +5159,24 @@ src: version = "1.4.0"; }; racc = { - groups = ["default" "development" "test"]; + groups = ["coverage" "default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; type = "gem"; }; - version = "1.6.2"; + version = "1.8.1"; }; rack = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hj0rkw2z9r1lcg2wlrcld2n3phwrcgqcp7qd1g9a7hwgalh2qzx"; + sha256 = "0ax778fsfvlhj7c11n0d1wdcb8bxvkb190a9lha5d91biwzyx9g4"; type = "gem"; }; - version = "2.2.9"; + version = "2.2.10"; }; rack-accept = { dependencies = ["rack"]; @@ -5348,10 +5326,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s8kvic2ia34ngssz6h15wqj0k3wwblhyh0f9v0j3gy7ly0dp161"; + sha256 = "1jiiv5ni1jrk15g572wc0l1ansbx6aqqsp2mk0pg9h18mkh1dbpg"; type = "gem"; }; - version = "7.0.9"; + version = "7.0.10"; }; railties = { dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor" "zeitwerk"]; @@ -5673,15 +5651,14 @@ src: version = "1.4.0"; }; rexml = { - dependencies = ["strscan"]; groups = ["coverage" "danger" "default" "development" "omnibus" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zr5qpa8lampaqzhdcjcvyqnrqcjl7439mqjlkjz43wdhmpnh4s5"; + sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p"; type = "gem"; }; - version = "3.3.2"; + version = "3.3.9"; }; rinku = { groups = ["default"]; @@ -5708,10 +5685,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "072qvvrcqj0yfr3b0j932mlhvn41i38bq37z7z07i3ikagndkqwy"; + sha256 = "0r0b48945hakgy0y7lg6h1bb7pkfz8jqd0r6777f80ij3sansvbs"; type = "gem"; }; - version = "4.3.0"; + version = "4.4.0"; }; rqrcode = { dependencies = ["chunky_png" "rqrcode_core"]; @@ -5877,15 +5854,15 @@ src: version = "0.0.9"; }; rubocop = { - dependencies = ["json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0daamn13fbm77rdwwa4w6j6221iq6091asivgdhk6n7g398frcdf"; + sha256 = "131pbjl7bv9g9qli84j91kgqmcqzdm2flq7r9abskl3ndqiagk4c"; type = "gem"; }; - version = "1.62.1"; + version = "1.67.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -5893,10 +5870,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v3q8n48w8h809rqbgzihkikr4g3xk72m1na7s97jdsmjjq6y83w"; + sha256 = "03zywfpm4540q6hw8srhi8pzp0gg51w65ir8jkaw58vk3j31w820"; type = "gem"; }; - version = "1.31.2"; + version = "1.32.3"; }; rubocop-capybara = { dependencies = ["rubocop"]; @@ -5904,10 +5881,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f5r9di123hc4x2h453a143986plfzz9935bwc7267wj8awl8s1a"; + sha256 = "1aw0n8jwhsr39r9q2k90xjmcz8ai2k7xx2a87ld0iixnv3ylw9jx"; type = "gem"; }; - version = "2.20.0"; + version = "2.21.0"; }; rubocop-factory_bot = { dependencies = ["rubocop"]; @@ -5915,10 +5892,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d012phc7z5h1j1d2aisnbkmqlb95sld5jriia5qg2gpgbg1nxb2"; + sha256 = "1aljadsjx7affcarzbhz7pydpy6fgqb8hl951y0cmrffxpa3rqcd"; type = "gem"; }; - version = "2.25.1"; + version = "2.26.1"; }; rubocop-graphql = { dependencies = ["rubocop"]; @@ -5926,10 +5903,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sw242bz2al9c1arprim9pd0kks8wbla77kkjvwp7kp1m01dc0lm"; + sha256 = "14j14ld5d3w141r5lgaljcd8q1g3w4xn592cwzqxlxw5n108v21d"; type = "gem"; }; - version = "1.5.1"; + version = "1.5.4"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -5937,10 +5914,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cf7fn4dwf45r3nhnda0dhnwn8qghswyqbfxr2ippb3z8a6gmc8v"; + sha256 = "0kkkv073c01px27w69g93gbjwajxji5wmawrmbb5l9s4ll101wjw"; type = "gem"; }; - version = "1.20.2"; + version = "1.21.1"; }; rubocop-rails = { dependencies = ["activesupport" "rack" "rubocop" "rubocop-ast"]; @@ -5948,21 +5925,32 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06dcxrr71sn0kkw8fwh0w884zbig2ilxpkl66s7lcis9jmkggv83"; + sha256 = "1bc4xpyx0gldjdmbl9aaqav5bjiqfc2zdw7k2r1zblmgsq4ilmpm"; type = "gem"; }; - version = "2.24.1"; + version = "2.26.2"; }; rubocop-rspec = { - dependencies = ["rubocop" "rubocop-capybara" "rubocop-factory_bot"]; + dependencies = ["rubocop"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17ksg89i1k5kyhi241pc0zyzmq1n7acxg0zybav5vrqbf02cw9rg"; + sha256 = "03vyjxs5rzrsn5graljffgzy1fgbyn99w5fz69y243dhn6gy5a66"; type = "gem"; }; - version = "2.27.1"; + version = "3.0.5"; + }; + rubocop-rspec_rails = { + dependencies = ["rubocop" "rubocop-rspec"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ijc1kw81884k0wjq1sgwaxa854n1fdddscp4fnzfzlx7zl150c8"; + type = "gem"; + }; + version = "2.30.0"; }; ruby-fogbugz = { dependencies = ["crack" "multipart-post"]; @@ -6071,17 +6059,6 @@ src: }; version = "0.0.5"; }; - ruby_parser = { - dependencies = ["racc" "sexp_processor"]; - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0sy5y7w89ii5iqym7b21glcwxqg8kizxfy8a7kcxq0j65wyqjhiq"; - type = "gem"; - }; - version = "3.21.0"; - }; rubyntlm = { groups = ["default"]; platforms = []; @@ -6203,10 +6180,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00dq3450kadsvxh1lpndasy0bab0ilrjhrnvlicfmkvrx3gfs2j9"; + sha256 = "1md0sixm8dq8a7riv50x4q1z273q47b5jvcbv5hxympxn3ran4by"; type = "gem"; }; - version = "4.23.0"; + version = "4.25.0"; }; semver_dialects = { dependencies = ["deb_version" "pastel" "thor" "tty-command"]; @@ -6214,10 +6191,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10ncp5pl9jsm81kj89gwyhsilbqhgh0j2cfz66q3ls86g2gsjgmf"; + sha256 = "1i2wxx2vdpdiwcr4npqxzdzmd7hwzlllsrpxpic13na654r3wxri"; type = "gem"; }; - version = "3.4.3"; + version = "3.4.4"; }; sentry-rails = { dependencies = ["railties" "sentry-ruby"]; @@ -6225,10 +6202,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "158rhsv547f3c31kfz8kdr7kpgm34sqm0bzbkxpqg3pazqim7bfl"; + sha256 = "00nn1agy19s3zp7y06zxal6ds8h6w2rlxb6vjk5x7w5gk78l7adm"; type = "gem"; }; - version = "5.19.0"; + version = "5.21.0"; }; sentry-ruby = { dependencies = ["bigdecimal" "concurrent-ruby"]; @@ -6236,10 +6213,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12w3w779dcab85x1i4aavd5fw8xdb7mvhs3cvx85q2l48vr8kpqd"; + sha256 = "0ac6yy9nfwak6pi8xp2qx31pap1l4h4qhkiala5y1rzwkbahski9"; type = "gem"; }; - version = "5.19.0"; + version = "5.21.0"; }; sentry-sidekiq = { dependencies = ["sentry-ruby" "sidekiq"]; @@ -6247,20 +6224,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "106bxqzi0mhvxm583mly7a95rv77m89dd51433fwnpdk2m5yq5hv"; + sha256 = "1qlh1r1h6lj57bbgzv9r78pp194jl79bqivn9ffrvxiqjb3lxxbd"; type = "gem"; }; - version = "5.19.0"; - }; - sexp_processor = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "182x05kpdjlckh31qizws50fz7sjk86yjjfmy45z61q3f930j4ci"; - type = "gem"; - }; - version = "4.17.1"; + version = "5.21.0"; }; shellany = { groups = ["default" "test"]; @@ -6617,16 +6584,6 @@ src: }; version = "0.2.0"; }; - strscan = { - groups = ["coverage" "danger" "default" "development" "omnibus" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; - type = "gem"; - }; - version = "3.1.0"; - }; swd = { dependencies = ["activesupport" "attr_required" "faraday" "faraday-follow_redirects"]; groups = ["default"]; @@ -6680,14 +6637,15 @@ src: version = "1.5.7"; }; tanuki_emoji = { + dependencies = ["i18n"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mj0qyapppbvlr81a4pcivgsbwi5082iyzbxypasxdv17wl0p7q0"; + sha256 = "14vdkzrfq3sv9dfzz0sgw89z7a6jic43jkndj7nqhvxdbhm1iqny"; type = "gem"; }; - version = "0.9.0"; + version = "0.13.0"; }; telesign = { dependencies = ["net-http-persistent"]; @@ -7068,6 +7026,27 @@ src: }; version = "2.4.2"; }; + unicode-emoji = { + dependencies = ["unicode-version"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zis8a993f4hxmcmmacm7rwzd06hpzfs7aa4zqqik39gg8pxz74l"; + type = "gem"; + }; + version = "4.0.0"; + }; + unicode-version = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qvmcyv9gh5i0x4pzd30jn1j9vn6h67zaiymmklz4b8498srlh2n"; + type = "gem"; + }; + version = "1.4.0"; + }; unicode_utils = { groups = ["default"]; platforms = []; @@ -7179,10 +7158,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0333krs3kil7p1rr7cvfrsqr1plns7j6wca9mjgns9qdqkhnv0cn"; + sha256 = "12r27rq6xlzngc1qv9zhbis0zx2216b8brb0bqg54di91jw94cdc"; type = "gem"; }; - version = "3.14.0"; + version = "3.20.0"; }; virtus = { dependencies = ["axiom-types" "coercible" "descendants_tracker"]; @@ -7276,10 +7255,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "158d2ikjfzw43kgm095klp43ihphk0cv5xjprk44w73xfv03i9qg"; + sha256 = "08kixkdp41dw39kqfxf2wp5m4z9b6fxg6yfa6xin0wy7dxzka0dy"; type = "gem"; }; - version = "3.23.1"; + version = "3.24.0"; }; webrick = { groups = ["default" "development" "test"]; From ab9010ed3eaef59a533ddc9cd90f5575d0b276e5 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Wed, 11 Dec 2024 13:19:32 +0100 Subject: [PATCH 21/21] gitlab: 17.6.1 -> 17.6.2 https://about.gitlab.com/releases/2024/12/11/patch-release-gitlab-17-6-2-released/ (cherry picked from commit 887e7d91ba8e9514f0e68ef95573ca8083df133f) --- .../applications/version-management/gitlab/data.json | 12 ++++++------ .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-pages/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- .../version-management/gitlab/rubyEnv/Gemfile | 2 +- .../version-management/gitlab/rubyEnv/Gemfile.lock | 4 ++-- .../version-management/gitlab/rubyEnv/gemset.nix | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 94dcc95a2d36e..ec6422cea4f99 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "17.6.1", - "repo_hash": "1az442dj0xxkb3bdqgln7ax5779bmndbx8p8mszybgghkjl0g4nq", + "version": "17.6.2", + "repo_hash": "0j08l2rhhlm5b6cim3bq5zk6lwimf467jhqarm01mxn53qj5rfna", "yarn_hash": "0g60lvngbvgvirjag5l539innmklh2x6a56vd38svrgx5jm6d3jc", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v17.6.1-ee", + "rev": "v17.6.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "17.6.1", - "GITLAB_PAGES_VERSION": "17.6.1", + "GITALY_SERVER_VERSION": "17.6.2", + "GITLAB_PAGES_VERSION": "17.6.2", "GITLAB_SHELL_VERSION": "14.39.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.4.0", - "GITLAB_WORKHORSE_VERSION": "17.6.1" + "GITLAB_WORKHORSE_VERSION": "17.6.2" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 55897855a8c74..65d4b1b2275b8 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -7,7 +7,7 @@ }: let - version = "17.6.1"; + version = "17.6.2"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -21,7 +21,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-eh/dMoKnwN+xz6dMnPZUD8b/SyrxUqDAtWmCIBXbIT4="; + hash = "sha256-i+Yk5hFhtIxf12crSJRbkHNbfPy9ZbxSNFEPwFOovhE="; }; vendorHash = "sha256-AxuAEiYV3jwWxcuTLc1i4/6sG957YIA+Fmky5Dkdzu8="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 27c07da4639ee..6bb247177ed7e 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "17.6.1"; + version = "17.6.2"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-fLQ2Hd1GtSBfxUJIozf4xcXC5yvNX4xqh0H0UVL55kw="; + hash = "sha256-iO6kMggGajB7ARXsJynEVbgd7iPBBp0x6J1lKuOxgH4="; }; vendorHash = "sha256-2feUOWcGj7eQ43rfM6IF55BawYVP4UY5sKA29Y9ozPk="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index e6c7da12cc407..9e0a2b9a8bfc3 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "17.6.1"; + version = "17.6.2"; # nixpkgs-update: no auto update src = fetchFromGitLab { diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 99b050b2d5cb3..5e5b17ead2edd 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -715,7 +715,7 @@ gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite' # rubocop:todo Gemfile/Missi gem 'arr-pm', '~> 0.0.12' # rubocop:todo Gemfile/MissingFeatureCategory # Remote Development -gem 'devfile', '~> 0.1.0', feature_category: :workspaces +gem 'devfile', '~> 0.1.1', feature_category: :workspaces # Apple plist parsing gem 'CFPropertyList', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 94e4e0d1022b9..2d125ee82500c 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -509,7 +509,7 @@ GEM thor (>= 0.19, < 2) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devfile (0.1.0) + devfile (0.1.1) device_detector (1.0.0) devise (4.9.3) bcrypt (~> 3.0) @@ -2018,7 +2018,7 @@ DEPENDENCIES declarative_policy (~> 1.1.0) deprecation_toolkit (~> 1.5.1) derailed_benchmarks - devfile (~> 0.1.0) + devfile (~> 0.1.1) device_detector devise (~> 4.9.3) devise-pbkdf2-encryptable (~> 0.0.0)! diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index dd5ddff416041..bf1ce4c42b5e2 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -1233,10 +1233,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18fbys0bf562681c96a4qcbdwxhlc9w3jz8rzkkfqns421hn024q"; + sha256 = "0yf8ckwr0pkzbdhs4y57gv9a80hvasdjv815fn67yhs4zpphqs5f"; type = "gem"; }; - version = "0.1.0"; + version = "0.1.1"; }; device_detector = { groups = ["default"];