From cd75ec216aadbcec5b3b9a96897d2a1247b24713 Mon Sep 17 00:00:00 2001 From: Sven Friedrich Date: Fri, 2 Feb 2024 09:23:13 +0100 Subject: [PATCH 01/33] nixos/networkd: allow configuring RTTSec for CAKE qdisc --- nixos/modules/system/boot/networkd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index a7399bd55e77..f2c226ed227c 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -1297,6 +1297,7 @@ let "Wash" "SplitGSO" "AckFilter" + "RTTSec" ]) (assertValueOneOf "AutoRateIngress" boolValues) (assertInt "OverheadBytes") From 0d2187f1b24c43c9515bba4756728735327133f0 Mon Sep 17 00:00:00 2001 From: Funkeleinhorn Date: Sun, 27 Oct 2024 17:21:27 +0100 Subject: [PATCH 02/33] halloy: fix add halloy url scheme handler halloy also registers the halloy:// scheme handler and uses it for example to share themes. This commit adds this scheme handler so halloy:// urls can be opened on NixOS. --- pkgs/by-name/ha/halloy/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix index 2fc97ae6ad9d..37aad2e307c5 100644 --- a/pkgs/by-name/ha/halloy/package.nix +++ b/pkgs/by-name/ha/halloy/package.nix @@ -76,6 +76,7 @@ rustPlatform.buildRustPackage rec { mimeTypes = [ "x-scheme-handler/irc" "x-scheme-handler/ircs" + "x-scheme-handler/halloy" ]; categories = [ "Network" From ea103a02af2bdd57a9ee4e54fd4d83ee15bd0578 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Fri, 22 Nov 2024 13:37:10 +0000 Subject: [PATCH 03/33] libstroke: fix build with gcc14 > stroke.c:267:5: error: implicit declaration of function 'strcpy' fix by including `string.h`. code seems abandoned but is still used by a handful of packages. --- pkgs/by-name/li/libstroke/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/li/libstroke/package.nix b/pkgs/by-name/li/libstroke/package.nix index 2231adbf80cc..d3f44a038105 100644 --- a/pkgs/by-name/li/libstroke/package.nix +++ b/pkgs/by-name/li/libstroke/package.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { sha256 = "0bbpqzsqh9zrc6cg62f6vp1p4dzvv37blsd0gdlzdskgwvyzba8d"; }; + postPatch = '' + sed -i 1i'#include ' libstroke/stroke.c + ''; + nativeBuildInputs = [ automake autoconf ]; buildInputs = [ libX11 ]; From 13b508e96868e385c480ac5fc2f8c247ba3e4601 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Sun, 24 Nov 2024 09:53:02 +0100 Subject: [PATCH 04/33] =?UTF-8?q?rabbitmq-server:=204.0.2=20=E2=86=92=204.?= =?UTF-8?q?0.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Diff: https://github.com/rabbitmq/rabbitmq-server/compare/v4.0.2...v4.0.4 --- pkgs/servers/amqp/rabbitmq-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 2e1483deeb05..949198944872 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -42,12 +42,12 @@ in stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "4.0.2"; + version = "4.0.4"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-mSwjQTLkEWBBbbMDLZ+qldS2YDcUvp8BB+J0+RLQvZE="; + hash = "sha256-7ff/BFXH0MiMEV+GsfCnBPGGlgPht6gM0K43V2ogtHc="; }; nativeBuildInputs = [ From ec7e61744071273adc8f3c6bcfe1c56c9320b9bd Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Sun, 24 Nov 2024 10:15:16 +0100 Subject: [PATCH 05/33] rabbitmq-server: use the latest compatible Erlang version --- pkgs/top-level/all-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38982497a655..ffccc8a2dcf2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12177,8 +12177,9 @@ with pkgs; qremotecontrol-server = libsForQt5.callPackage ../servers/misc/qremotecontrol-server { }; - rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server { - erlang = erlang_26; + rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server rec { + erlang = erlang_27; + elixir = pkgs.elixir.override { inherit erlang; }; }; radicale2 = callPackage ../servers/radicale/2.x.nix { }; From d1761537ac54922496276856531bf1921f0f59bf Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Sun, 24 Nov 2024 10:16:17 +0100 Subject: [PATCH 06/33] rabbitmq-server: move to by-name hierarchy --- .../default.nix => by-name/ra/rabbitmq-server/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{servers/amqp/rabbitmq-server/default.nix => by-name/ra/rabbitmq-server/package.nix} (100%) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/by-name/ra/rabbitmq-server/package.nix similarity index 100% rename from pkgs/servers/amqp/rabbitmq-server/default.nix rename to pkgs/by-name/ra/rabbitmq-server/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffccc8a2dcf2..4f0306e00e5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12177,7 +12177,7 @@ with pkgs; qremotecontrol-server = libsForQt5.callPackage ../servers/misc/qremotecontrol-server { }; - rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server rec { + rabbitmq-server = callPackage ../by-name/ra/rabbitmq-server/package.nix rec { erlang = erlang_27; elixir = pkgs.elixir.override { inherit erlang; }; }; From 7dd27c3376369166880c1dbca8e12dea22cb6290 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Nov 2024 02:59:57 +0000 Subject: [PATCH 07/33] nfs-ganesha: 6.2 -> 6.3 --- pkgs/by-name/nf/nfs-ganesha/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nf/nfs-ganesha/package.nix b/pkgs/by-name/nf/nfs-ganesha/package.nix index 422c3e885a63..5d34e652fb22 100644 --- a/pkgs/by-name/nf/nfs-ganesha/package.nix +++ b/pkgs/by-name/nf/nfs-ganesha/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; - version = "6.2"; + version = "6.3"; outputs = [ "out" @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - hash = "sha256-wWN9E6QxipTh5ppEyEbhqG0uSVjd+DzWgY/oj5FIso0="; + hash = "sha256-4gPhmBC42uCcaEhdJj9ZWw4ECB9UYwP+c2ndBFbBK0k="; }; preConfigure = "cd src"; From 145b28d89928b49544664107f520aaf9a233c4b7 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 28 Nov 2024 08:39:07 +0100 Subject: [PATCH 08/33] qgis: use default python version --- pkgs/applications/gis/qgis/unwrapped-ltr.nix | 4 ++-- pkgs/applications/gis/qgis/unwrapped.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index bc807b7e1074..af4fdd4abb68 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -30,7 +30,7 @@ , postgresql , proj , protobuf -, python311 +, python3 , qca-qt5 , qscintilla , qt3d @@ -49,7 +49,7 @@ }: let - py = python311.override { + py = python3.override { self = py; packageOverrides = self: super: { pyqt5 = super.pyqt5.override { diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 577dfdf5e17f..9b01df56622d 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -30,7 +30,7 @@ , postgresql , proj , protobuf -, python311 +, python3 , qca-qt5 , qscintilla , qt3d @@ -49,7 +49,7 @@ }: let - py = python311.override { + py = python3.override { self = py; packageOverrides = self: super: { pyqt5 = super.pyqt5.override { From 2b1e9f0252dc48f65a7a2331b7a42a1cf523eea8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 Nov 2024 11:42:19 +0100 Subject: [PATCH 09/33] python312Packages.aiowmi: init at 0.2.3 Python WMI Queries https://github.com/cesbit/aiowmi --- .../python-modules/aiowmi/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/aiowmi/default.nix diff --git a/pkgs/development/python-modules/aiowmi/default.nix b/pkgs/development/python-modules/aiowmi/default.nix new file mode 100644 index 000000000000..e1506a4fd6da --- /dev/null +++ b/pkgs/development/python-modules/aiowmi/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pycryptodome, + pytestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "aiowmi"; + version = "0.2.3"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "cesbit"; + repo = "aiowmi"; + rev = "refs/tags/v${version}"; + hash = "sha256-bKxGIUxGAW1GDa5xlv9NNWr5xLTdpK5dSsym/5y9nGQ="; + }; + + build-system = [ setuptools ]; + + dependencies = [ pycryptodome ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "aiowmi" ]; + + meta = { + description = "Python WMI Queries"; + homepage = "https://github.com/cesbit/aiowmi"; + changelog = "https://github.com/cesbit/aiowmi/releases/tag/v${version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 62a1df04f4d3..e94c090a396f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -471,6 +471,8 @@ self: super: with self; { aiowebostv = callPackage ../development/python-modules/aiowebostv { }; + aiowmi = callPackage ../development/python-modules/aiowmi { }; + aiowinreg = callPackage ../development/python-modules/aiowinreg { }; aiowithings = callPackage ../development/python-modules/aiowithings { }; From bfff65c1e5e9e73ac3b2d43339da4314c0a8ede0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Nov 2024 23:19:59 +0100 Subject: [PATCH 10/33] python312Packages.jh2: init at 5.0.4 HTTP/2 State-Machine based protocol implementation https://github.com/jawah/h2 --- .../python-modules/jh2/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/jh2/default.nix diff --git a/pkgs/development/python-modules/jh2/default.nix b/pkgs/development/python-modules/jh2/default.nix new file mode 100644 index 000000000000..8da07d9294d6 --- /dev/null +++ b/pkgs/development/python-modules/jh2/default.nix @@ -0,0 +1,55 @@ +{ + lib, + buildPythonPackage, + cargo, + fetchFromGitHub, + hypothesis, + pytestCheckHook, + pythonOlder, + rustc, + rustPlatform, +}: + +buildPythonPackage rec { + pname = "jh2"; + version = "5.0.4"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "jawah"; + repo = "h2"; + rev = "refs/tags/v${version}"; + hash = "sha256-la1tZ+t6HeGqaua1f858mT1IRyqS0hnoOiKr656vthQ="; + fetchSubmodules = true; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-m1MkKhwTMDGsC0jt1skyFb23Ln5spa+vUEOyA5pHxP4="; + }; + + build-system = [ + cargo + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + rustc + ]; + + nativeCheckInputs = [ + hypothesis + pytestCheckHook + ]; + + pythonImportsCheck = [ "jh2" ]; + + meta = { + description = "HTTP/2 State-Machine based protocol implementation"; + homepage = "https://github.com/jawah/h2"; + changelog = "https://github.com/jawah/h2/blob/${src.rev}/CHANGELOG.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 64e349ca071f..136c4ad0b146 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6564,6 +6564,8 @@ self: super: with self; { jenkins-job-builder = callPackage ../development/python-modules/jenkins-job-builder { }; + jh2 = callPackage ../development/python-modules/jh2 { }; + jianpu-ly = callPackage ../development/python-modules/jianpu-ly { }; jieba = callPackage ../development/python-modules/jieba { }; From 6399331a255eb944c1c77e071bb5230418390682 Mon Sep 17 00:00:00 2001 From: Marco Rebhan Date: Fri, 29 Nov 2024 00:07:27 +0100 Subject: [PATCH 11/33] nix-plugin-pijul: 0.1.4 -> 0.1.5 --- pkgs/by-name/ni/nix-plugin-pijul/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ni/nix-plugin-pijul/package.nix b/pkgs/by-name/ni/nix-plugin-pijul/package.nix index f9089715de31..34241da25652 100644 --- a/pkgs/by-name/ni/nix-plugin-pijul/package.nix +++ b/pkgs/by-name/ni/nix-plugin-pijul/package.nix @@ -14,14 +14,14 @@ nixOverride ? null, nix-plugin-pijul, }: -let nix = if nixOverride != null then nixOverride else nixVersions.nix_2_18; +let nix = if nixOverride != null then nixOverride else nixVersions.nix_2_24; in stdenv.mkDerivation (finalAttrs: { pname = "nix-plugin-pijul"; - version = "0.1.4"; + version = "0.1.5"; src = fetchzip { url = "https://dblsaiko.net/pub/nix-plugin-pijul/nix-plugin-pijul-${finalAttrs.version}.tar.gz"; - hash = "sha256-X25tFqcAgNWmkMxbfXGx8KJ25BV6sFWAQM9NvjQeSmQ="; + hash = "sha256-1BJZ0lv7XDgT/AiXmJ2Z5Jn0tEa1Yerp9YYcjVCHqoI="; }; nativeBuildInputs = [ @@ -73,7 +73,7 @@ in stdenv.mkDerivation (finalAttrs: { stable = localRepoCheck nixVersions.stable; latest = localRepoCheck nixVersions.latest; git = localRepoCheck nixVersions.git; - nix_2_18 = localRepoCheck nixVersions.nix_2_18; + nix_2_24 = localRepoCheck nixVersions.nix_2_24; }; meta = { From a1ed423d07e3951396923bfa98e7ae4396ba7737 Mon Sep 17 00:00:00 2001 From: aleksana Date: Fri, 29 Nov 2024 17:57:09 +0800 Subject: [PATCH 12/33] jogger: 1.2.4-unstable-2024-04-05 -> 1.2.5 --- pkgs/by-name/jo/jogger/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/jo/jogger/package.nix b/pkgs/by-name/jo/jogger/package.nix index 465e5478ff2c..d4d4dbf67317 100644 --- a/pkgs/by-name/jo/jogger/package.nix +++ b/pkgs/by-name/jo/jogger/package.nix @@ -21,19 +21,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "jogger"; - version = "1.2.4-unstable-2024-04-05"; + version = "1.2.5"; src = fetchFromGitea { domain = "codeberg.org"; owner = "baarkerlounger"; repo = "jogger"; - rev = "09386b9503a9b996b86ea4638268403868b24d6a"; - hash = "sha256-oGjqYRHkYk22/RzDc5c0066SlOPGRGC6z/BTn1DM03o="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-bju9XXMT6HRHG9QViO+FQCYQ+llrC+GP/AlIha0mxkM="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) pname version src; - hash = "sha256-+8mMJgLHLUdFLOwjhXolHcVUP+s/j6PlWeRh8sGRYTc="; + hash = "sha256-YCLIxKl4QCmqHx/WXwxpqOqIMx1Ab16QyAi+j542eoY="; }; nativeBuildInputs = [ From 32d6f520080da4d61fd49f3d6d1155e26a800d44 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 Nov 2024 11:02:17 +0100 Subject: [PATCH 13/33] mqtt-randompub: init at 0.2.2 Tool that sends random MQTT messages to random topics https://github.com/fabaff/mqtt-randompub --- pkgs/by-name/mq/mqtt-randompub/package.nix | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/mq/mqtt-randompub/package.nix diff --git a/pkgs/by-name/mq/mqtt-randompub/package.nix b/pkgs/by-name/mq/mqtt-randompub/package.nix new file mode 100644 index 000000000000..033bb53d1ef5 --- /dev/null +++ b/pkgs/by-name/mq/mqtt-randompub/package.nix @@ -0,0 +1,36 @@ +{ + lib, + fetchFromGitHub, + python3, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "mqtt-randompub"; + version = "0.2.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "fabaff"; + repo = "mqtt-randompub"; + rev = "refs/tags/${version}"; + hash = "sha256-vAFEVlw9reRP+4Qwywv+cP27SU1c3seL3Z+b/YfUdl8="; + }; + + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ paho-mqtt ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "mqtt_randompub" ]; + + meta = { + description = "Tool that sends random MQTT messages to random topics"; + homepage = "https://github.com/fabaff/mqtt-randompub"; + changelog = "https://github.com/fabaff/mqtt-randompub/blob/${src.rev}/ChangeLog"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "mqtt-randompub"; + }; +} From b62f26270daa8e752175ea9b06a386b6e30236f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Nov 2024 12:28:58 +0000 Subject: [PATCH 14/33] ytdownloader: 3.18.3 -> 3.18.4 --- pkgs/by-name/yt/ytdownloader/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/yt/ytdownloader/package.nix b/pkgs/by-name/yt/ytdownloader/package.nix index 43265c6bd348..9fa975747dbb 100644 --- a/pkgs/by-name/yt/ytdownloader/package.nix +++ b/pkgs/by-name/yt/ytdownloader/package.nix @@ -12,16 +12,16 @@ buildNpmPackage rec { pname = "ytDownloader"; - version = "3.18.3"; + version = "3.18.4"; src = fetchFromGitHub { owner = "aandrew-me"; repo = "ytDownloader"; rev = "refs/tags/v${version}"; - hash = "sha256-omq1krlHj0+SvyofQtJnVBiQzHPIC/v/WhXGClm0vzM="; + hash = "sha256-3kR4UOEwHmp63289H7onVU48q9vGpS0oPRj0Qb1s47w="; }; - npmDepsHash = "sha256-PE9RWdnUlHTCBqGN6xvq+B7gXke/KsKsGcg1SAy7bfs="; + npmDepsHash = "sha256-ifo3O9cF52hRsPKD70pJ42O7XhzrBg//iXzBWrpv+5I="; nativeBuildInputs = [ copyDesktopItems From 09da4761e12433446529d72b12ee7371770949e6 Mon Sep 17 00:00:00 2001 From: fidgetingbits Date: Sat, 16 Nov 2024 16:39:14 +0800 Subject: [PATCH 15/33] vermin: init a 1.6.0 --- pkgs/by-name/ve/vermin/package.nix | 40 ++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/ve/vermin/package.nix diff --git a/pkgs/by-name/ve/vermin/package.nix b/pkgs/by-name/ve/vermin/package.nix new file mode 100644 index 000000000000..3fe5c63dc1e8 --- /dev/null +++ b/pkgs/by-name/ve/vermin/package.nix @@ -0,0 +1,40 @@ +{ + lib, + fetchFromGitHub, + python3Packages, +}: +python3Packages.buildPythonApplication rec { + pname = "vermin"; + version = "1.6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "netromdk"; + repo = "vermin"; + rev = "v${version}"; + hash = "sha256-lgxYQ8oNfa0+8BUf3nRv0fcNLP+UATjz733ms3pM6gQ="; + }; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ + setuptools + ]; + + checkPhase = '' + runHook preCheck + python runtests.py + runHook postCheck + ''; + + meta = { + mainProgram = "vermin"; + homepage = "https://github.com/netromdk/vermin"; + changelog = "https://github.com/netromdk/vermin/releases/tag/v${version}"; + description = "Concurrently detect the minimum Python versions needed to run code"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.fidgetingbits ]; + }; +} From eebd4c3b0133cf3579e2a2c45e0657cccbf9c850 Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Fri, 29 Nov 2024 17:51:19 +0100 Subject: [PATCH 16/33] gitlab: 17.3.7 -> 17.5.2 --- nixos/modules/services/misc/gitlab.nix | 2 +- .../version-management/gitlab/data.json | 18 +- .../version-management/gitlab/default.nix | 2 +- .../gitlab/gitlab-workhorse/default.nix | 4 +- .../version-management/gitlab/rubyEnv/Gemfile | 103 +++--- .../gitlab/rubyEnv/Gemfile.lock | 289 ++++++++------- .../gitlab/rubyEnv/gemset.nix | 345 ++++++++++-------- pkgs/by-name/gi/gitaly/git.nix | 4 +- pkgs/by-name/gi/gitaly/package.nix | 6 +- .../gi/gitlab-container-registry/package.nix | 6 +- .../gitlab-elasticsearch-indexer/package.nix | 6 +- pkgs/by-name/gi/gitlab-pages/package.nix | 6 +- pkgs/by-name/gi/gitlab-shell/package.nix | 17 +- 13 files changed, 433 insertions(+), 375 deletions(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index ecbc087f739f..d86f688392df 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -1348,7 +1348,7 @@ in { ln -sf ${cableYml} ${cfg.statePath}/config/cable.yml ln -sf ${resqueYml} ${cfg.statePath}/config/resque.yml - ${cfg.packages.gitlab-shell}/bin/gitlab-shell-install + ${cfg.packages.gitlab-shell}/support/make_necessary_dirs ${optionalString cfg.smtp.enable '' install -m u=rw ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index f3adf9cab39d..c44172cdc7a9 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "17.3.7", - "repo_hash": "1nci1lnr7wikjrqqpya7ypwf2lcjlcvkjc3wc0b7wcx9jnrylbr1", - "yarn_hash": "1g5xqggdbrxz6ablav119jw8a2v8qdd2cwlbvpygablbcxqak41l", + "version": "17.5.2", + "repo_hash": "08mx9xbl6cagzp36qwzz1zab5w8y2x4yhy3x5hqv1qwbrjrlcxjd", + "yarn_hash": "0x1yhgjrm7zyj9qir4yk1zkzj009a3s20hf6fqmsaala4hynnlnq", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v17.3.7-ee", + "rev": "v17.5.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "17.3.7", - "GITLAB_PAGES_VERSION": "17.3.7", - "GITLAB_SHELL_VERSION": "14.38.0", - "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.2.0", - "GITLAB_WORKHORSE_VERSION": "17.3.7" + "GITALY_SERVER_VERSION": "17.5.2", + "GITLAB_PAGES_VERSION": "17.5.2", + "GITLAB_SHELL_VERSION": "14.39.0", + "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.3.0", + "GITLAB_WORKHORSE_VERSION": "17.5.2" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index f43ade4af22a..ec90b0e168a1 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -77,7 +77,7 @@ let cp Cargo.lock $out ''; }; - hash = "sha256-VYjCYUikORuXx27OYWyumBxeHw9aj/S1wcr9vLIsXeo="; + hash = "sha256-L/URWw7NoQhi7VV8ZiKLzthbF0wl4rIUqCQdH9wmAV0="; }; dontBuild = false; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index a54e9b74d8bb..d7693251d705 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.3.7"; + version = "17.5.2"; # nixpkgs-update: no auto update src = fetchFromGitLab { @@ -17,7 +17,7 @@ buildGoModule rec { sourceRoot = "${src.name}/workhorse"; - vendorHash = "sha256-sLr9kFKRNYOlCj9bmP+J7/Iu/OfFTEjAm64BUni+eiY="; + vendorHash = "sha256-10gJPUncde48Lk23mShHXM6ItTHvjh6Y8yMlGFfKkj8="; 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 56051fbe4876..77864b7b4c11 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -30,7 +30,7 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', requir # See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails if next? - gem 'rails', '~> 7.1.3.4', feature_category: :shared + gem 'rails', '~> 7.1.4', feature_category: :shared else gem 'rails', '~> 7.0.8.4', feature_category: :shared end @@ -39,6 +39,10 @@ gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab' # rubocop:todo Gemfi gem 'bootsnap', '~> 1.18.3', require: false # rubocop:todo Gemfile/MissingFeatureCategory +# Avoid the precompiled native gems because Omnibus needs to build this to ensure +# LD_LIBRARY_PATH is correct: https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7730 +gem 'ffi', '~> 1.17', force_ruby_platform: true, feature_category: :shared + gem 'openssl', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'ipaddr', '~> 1.2.5' # rubocop:todo Gemfile/MissingFeatureCategory @@ -59,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.13.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'view_component', '~> 3.14.0' # rubocop:todo Gemfile/MissingFeatureCategory # Supported DBs gem 'pg', '~> 1.5.6', feature_category: :database @@ -89,7 +93,7 @@ gem 'doorkeeper', '~> 5.6', '>= 5.6.6' # rubocop:todo Gemfile/MissingFeatureCate gem 'doorkeeper-openid_connect', '~> 1.8', '>= 1.8.7' # rubocop:todo Gemfile/MissingFeatureCategory gem 'doorkeeper-device_authorization_grant', '~> 1.0.0', feature_category: :system_access gem 'rexml', '~> 3.3.2' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'ruby-saml', '~> 1.17.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'ruby-saml', '~> 1.17.0', feature_category: :system_access gem 'omniauth', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-auth0', '~> 3.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-azure-activedirectory-v2', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -98,7 +102,7 @@ gem 'omniauth-github', '2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-google-oauth2', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth-oauth2-generic', '~> 0.2.2' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'omniauth-saml', '~> 2.2.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'omniauth-saml', '~> 2.2.1', feature_category: :system_access gem 'omniauth-shibboleth-redux', '~> 2.0', require: 'omniauth-shibboleth' # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md # rubocop:todo Gemfile/MissingFeatureCategory gem 'omniauth_openid_connect', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -138,7 +142,7 @@ gem 'browser', '~> 5.3.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'ohai', '~> 18.1' # rubocop:todo Gemfile/MissingFeatureCategory # GPG -gem 'gpgme', '~> 2.0.23' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gpgme', '~> 2.0.24', feature_category: :source_code_management # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes @@ -155,7 +159,7 @@ 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.5', feature_category: :api +gem 'graphql', '~> 2.3.14', 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 @@ -187,7 +191,7 @@ gem 'carrierwave', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'mini_magick', '~> 4.12' # rubocop:todo Gemfile/MissingFeatureCategory # for backups -gem 'fog-aws', '~> 3.18' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'fog-aws', '~> 3.26', feature_category: :shared # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. gem 'fog-core', '= 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -200,7 +204,7 @@ gem 'fog-local', '~> 0.8' # rubocop:todo Gemfile/MissingFeatureCategory # We may want to update this dependency if this is ever addressed upstream, e.g. via # https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93 gem 'fog-aliyun', '~> 0.4' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-fog-azure-rm', '~> 2.0.1', require: 'fog/azurerm', feature_category: :shared +gem 'gitlab-fog-azure-rm', '~> 2.1.0', require: 'fog/azurerm', feature_category: :shared # for Google storage @@ -231,32 +235,32 @@ 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.201.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-core', '~> 3.206.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'aws-sdk-s3', '~> 1.157.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-s3', '~> 1.163.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 gem 'typhoeus', '~> 1.4.0', feature_category: :global_search # Markdown and HTML processing -gem 'html-pipeline', '~> 2.14.3', feature_category: :team_planning -gem 'deckar01-task_list', '2.3.4', feature_category: :team_planning -gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'commonmarker', '~> 0.23.10', feature_category: :team_planning -gem 'kramdown', '~> 2.3.1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'RedCloth', '~> 4.3.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'org-ruby', '~> 0.9.12' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'creole', '~> 0.5.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'wikicloth', '0.8.1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'asciidoctor', '~> 2.0.18' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'asciidoctor-include-ext', '~> 0.4.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory -gem 'asciidoctor-plantuml', '~> 0.0.16' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'asciidoctor-kroki', '~> 0.10.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory +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 'RedCloth', '~> 4.3.3', feature_category: :markdown +gem 'org-ruby', '~> 0.9.12', feature_category: :markdown +gem 'creole', '~> 0.5.0', feature_category: :markdown +gem 'wikicloth', '0.8.1', feature_category: :markdown +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 'truncato', '~> 0.7.12' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'nokogiri', '~> 1.16' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-glfm-markdown', '~> 0.0.17', feature_category: :team_planning +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 # Calendar rendering gem 'icalendar', '~> 2.10.1', feature_category: :system_access @@ -271,7 +275,7 @@ gem 'rack', '~> 2.2.9' # rubocop:todo Gemfile/MissingFeatureCategory gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory group :puma do - gem 'puma', '= 6.4.0', require: false, feature_category: :shared + gem 'puma', '= 6.4.3', require: false, feature_category: :shared gem 'sd_notify', '~> 0.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory end @@ -279,7 +283,7 @@ end gem 'state_machines-activerecord', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory # Background jobs -gem 'sidekiq', '~> 7.1.6', feature_category: :scalability +gem 'sidekiq', path: 'vendor/gems/sidekiq-7.2.4', require: 'sidekiq', feature_category: :scalability gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', @@ -315,8 +319,8 @@ gem 'device_detector' # rubocop:todo Gemfile/MissingFeatureCategory # Redis gem 'redis-namespace', '~> 1.11.0', feature_category: :redis -gem 'redis', '~> 5.2.0', feature_category: :redis -gem 'redis-clustering', '~> 5.2.0', feature_category: :redis +gem 'redis', '~> 5.3.0', feature_category: :redis +gem 'redis-clustering', '~> 5.3.0', feature_category: :redis gem 'connection_pool', '~> 2.4' # rubocop:todo Gemfile/MissingFeatureCategory # Redis session store @@ -383,9 +387,9 @@ gem 'gitlab-license', '~> 2.5', feature_category: :shared gem 'rack-attack', '~> 6.7.0' # rubocop:todo Gemfile/MissingFeatureCategory # Sentry integration -gem 'sentry-ruby', '~> 5.18.0', feature_category: :error_tracking -gem 'sentry-rails', '~> 5.18.0', feature_category: :error_tracking -gem 'sentry-sidekiq', '~> 5.18.0', feature_category: :error_tracking +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 # PostgreSQL query parsing # @@ -400,7 +404,7 @@ gem 'thrift', '>= 0.16.0' # rubocop:todo Gemfile/MissingFeatureCategory # I18n gem 'rails-i18n', '~> 7.0', '>= 7.0.9', feature_category: :internationalization -gem 'gettext_i18n_rails', '~> 1.12.0', feature_category: :internationalization +gem 'gettext_i18n_rails', '~> 1.13.0', feature_category: :internationalization gem 'gettext', '~> 3.4', '>= 3.4.9', require: false, group: [:development, :test], @@ -427,6 +431,9 @@ gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', require: 'prometheus/client' # Required manually in config/initializers/require_async_gem gem 'async', '~> 2.12.1', require: false # rubocop:disable Gemfile/MissingFeatureCategory -- This is general utility gem +# Security report schemas used to validate CI job artifacts of security jobs +gem 'gitlab-security_report_schemas', '0.1.2.min15.0.0.max15.2.1', feature_category: :vulnerability_management + # OpenTelemetry group :opentelemetry do # Core OpenTelemetry gems @@ -460,7 +467,7 @@ end gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory group :development do - gem 'lefthook', '~> 1.6.8', require: false, feature_category: :tooling + gem 'lefthook', '~> 1.7.0', require: false, feature_category: :tooling gem 'rubocop', feature_category: :tooling gem 'solargraph', '~> 0.47.2', require: false # rubocop:todo Gemfile/MissingFeatureCategory @@ -474,7 +481,7 @@ group :development do gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'ruby-lsp', "~> 0.17.0", require: false, feature_category: :tooling + gem 'ruby-lsp', "~> 0.19.0", require: false, feature_category: :tooling gem 'ruby-lsp-rails', "~> 0.3.6", feature_category: :tooling @@ -494,7 +501,7 @@ group :development, :test do gem 'awesome_print', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database - gem 'rspec-rails', '~> 6.1.1', feature_category: :shared + gem 'rspec-rails', '~> 7.0.0', feature_category: :shared gem 'factory_bot_rails', '~> 6.4.3', feature_category: :tooling # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) @@ -532,7 +539,7 @@ group :development, :test do # For now we only use vite in development / test, and not for production builds # See: https://gitlab.com/gitlab-org/frontend/rfcs/-/issues/106 gem 'vite_rails', '~> 3.0.17', feature_category: :shared - gem 'vite_ruby', '~> 3.7.0', feature_category: :shared + gem 'vite_ruby', '~> 3.8.0', feature_category: :shared gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling end @@ -567,9 +574,9 @@ group :test do gem 'rspec-parameterized', '~> 1.0', '>= 1.0.2', require: false, feature_category: :tooling gem 'os', '~> 1.1', '>= 1.1.4', feature_category: :tooling - gem 'capybara', '~> 3.40' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'capybara-screenshot', '~> 1.0.26' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'selenium-webdriver', '~> 4.21', '>= 4.21.1' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'capybara', '~> 3.40', feature_category: :test_platform + gem 'capybara-screenshot', '~> 1.0.26', feature_category: :test_platform + gem 'selenium-webdriver', '~> 4.21', '>= 4.21.1', feature_category: :test_platform gem 'graphlyte', '~> 1.0.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -578,7 +585,7 @@ group :test do gem 'webmock', '~> 3.23.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.3.3', feature_category: :tooling + gem 'test-prof', '~> 1.4.0', feature_category: :tooling gem 'rspec_junit_formatter' # rubocop:todo Gemfile/MissingFeatureCategory gem 'guard-rspec' # rubocop:todo Gemfile/MissingFeatureCategory gem 'axe-core-rspec', '~> 4.9.0', feature_category: :tooling @@ -586,7 +593,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.33.0', require: false, feature_category: :tooling + gem 'gitlab_quality-test_tooling', '~> 1.39.0', require: false, feature_category: :tooling end gem 'octokit', '~> 9.0', feature_category: :importers @@ -623,10 +630,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.2.0', feature_category: :gitaly +gem 'gitaly', '~> 17.4.0.pre.rc1', feature_category: :gitaly # KAS GRPC protocol definitions -gem 'kas-grpc', '~> 0.6.0', feature_category: :deployment_management +gem 'gitlab-kas-grpc', '~> 17.4.0.pre.rc1', feature_category: :deployment_management # Lock the version before issues below are resolved: # https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939 @@ -709,7 +716,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.26.pre.alpha1', feature_category: :remote_development +gem 'devfile', '~> 0.0.28.pre.alpha1', feature_category: :workspaces # Apple plist parsing gem 'CFPropertyList', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -731,3 +738,7 @@ gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation gem 'openbao_client', path: 'gems/openbao_client' # rubocop:todo Gemfile/MissingFeatureCategory + +gem 'paper_trail', '~> 15.0' # rubocop:todo Gemfile/MissingFeatureCategory + +gem "i18n_data", "~> 0.13.1", feature_category: :system_access diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 15705711ef11..4926df4f551f 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -27,10 +27,22 @@ PATH remote: gems/gitlab-backup-cli specs: gitlab-backup-cli (0.0.1) - activesupport (< 7.2) + activesupport (>= 7) + addressable (~> 2.8) + concurrent-ruby (~> 1.1) + faraday (~> 2) google-cloud-storage_transfer (~> 1.2.0) + google-protobuf (~> 3.25, >= 3.25.3) googleauth (~> 1.8.1) + grpc (= 1.63.0) + json (~> 2.7.2) + jwt (~> 2.5) + logger (~> 1.5.3) + minitest (~> 5.11.0) + parallel (~> 1.19) + rack (~> 2.2.9) rainbow (~> 3.0) + rexml (~> 3.3.2) thor (~> 1.3) PATH @@ -193,6 +205,15 @@ PATH nokogiri (>= 1.4.4) omniauth (~> 2.0) +PATH + remote: vendor/gems/sidekiq-7.2.4 + specs: + sidekiq (7.2.4) + concurrent-ruby (< 2) + connection_pool (>= 2.3.0) + rack (>= 2.2.4) + redis-client (>= 0.19.0) + PATH remote: vendor/gems/sidekiq-reliable-fetch specs: @@ -205,7 +226,7 @@ GEM specs: CFPropertyList (3.0.5) rexml - RedCloth (4.3.3) + RedCloth (4.3.4) acme-client (2.0.18) faraday (>= 1.0, < 3.0.0) faraday-retry (>= 1.0, < 3.0.0) @@ -277,8 +298,8 @@ GEM i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.1) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) aes_key_wrap (1.1.0) akismet (3.0.0) aliyun-sdk (0.8.0) @@ -295,7 +316,7 @@ GEM activesupport (>= 6.0.0) jwt (>= 1.4, <= 2.5.0) arr-pm (0.0.12) - asciidoctor (2.0.18) + asciidoctor (2.0.23) asciidoctor-include-ext (0.4.0) asciidoctor (>= 1.5.6, < 3.0.0) asciidoctor-kroki (0.10.0) @@ -317,19 +338,19 @@ GEM aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.201.4) + aws-sdk-core (3.206.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.8) + 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.157.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-s3 (1.163.0) + aws-sdk-core (~> 3, >= 3.205.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sigv4 (1.8.0) + aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) axe-core-api (4.9.1) dumb_delegator @@ -487,7 +508,7 @@ GEM thor (>= 0.19, < 2) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devfile (0.0.26.pre.alpha1) + devfile (0.0.28.pre.alpha1) device_detector (1.0.0) devise (4.9.3) bcrypt (~> 3.0) @@ -577,8 +598,8 @@ GEM factory_bot_rails (6.4.3) factory_bot (~> 6.4) railties (>= 5.0.0) - faraday (2.10.1) - faraday-net_http (>= 2.0, < 3.2) + faraday (2.11.0) + faraday-net_http (>= 2.0, < 3.4) logger faraday-follow_redirects (0.3.0) faraday (>= 1, < 3) @@ -602,7 +623,7 @@ GEM fast_blank (1.0.1) fast_gettext (2.3.0) ffaker (2.23.0) - ffi (1.15.5) + ffi (1.17.0) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake @@ -628,7 +649,8 @@ GEM fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (3.18.0) + fog-aws (3.27.0) + base64 (~> 0.2.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) @@ -687,12 +709,12 @@ GEM prime racc text (>= 1.3.0) - gettext_i18n_rails (1.12.0) + gettext_i18n_rails (1.13.0) fast_gettext (>= 0.9.0) git (1.18.0) addressable (~> 2.8) rchardet (~> 1.8) - gitaly (17.2.0) + gitaly (17.4.0.pre.rc1) grpc (~> 1.0) gitlab (4.19.0) httparty (~> 0.20) @@ -706,7 +728,7 @@ GEM gitlab-experiment (0.9.1) activesupport (>= 3.0) request_store (>= 1.0) - gitlab-fog-azure-rm (2.0.1) + gitlab-fog-azure-rm (2.1.0) faraday (~> 2.0) faraday-follow_redirects (~> 0.3.0) faraday-net_http_persistent (~> 2.0) @@ -715,8 +737,10 @@ GEM mime-types net-http-persistent (~> 4.0) nokogiri (~> 1, >= 1.10.8) - gitlab-glfm-markdown (0.0.17) + gitlab-glfm-markdown (0.0.21) rb_sys (= 0.9.94) + gitlab-kas-grpc (17.4.0.pre.rc1) + grpc (~> 1.0) gitlab-labkit (0.36.1) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) @@ -738,6 +762,9 @@ GEM activesupport (>= 5.2.0) rake (~> 13.0) snowplow-tracker (~> 0.8.0) + 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) @@ -752,9 +779,10 @@ GEM omniauth (>= 1.3, < 3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - gitlab_quality-test_tooling (1.33.0) + gitlab_quality-test_tooling (1.39.0) activesupport (>= 7.0, < 7.2) amatch (~> 0.4.1) + fog-google (~> 1.24, >= 1.24.1) gitlab (~> 4.19) http (~> 5.0) influxdb-client (~> 3.1) @@ -846,7 +874,7 @@ GEM google-cloud-storage_transfer-v1 (0.8.0) gapic-common (>= 0.20.0, < 2.a) google-cloud-errors (~> 1.0) - google-protobuf (3.25.4) + google-protobuf (3.25.5) googleapis-common-protos (1.4.0) google-protobuf (~> 3.14) googleapis-common-protos-types (~> 1.2) @@ -859,7 +887,7 @@ GEM multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) - gpgme (2.0.23) + gpgme (2.0.24) mini_portile2 (~> 2.7) grape (2.0.0) activesupport (>= 5) @@ -876,10 +904,10 @@ GEM grape (~> 2.0) rake (> 12) ruby2_keywords (~> 0.0.2) - grape-swagger (2.1.0) + grape-swagger (2.1.1) grape (>= 1.7, < 3.0) rack-test (~> 2) - grape-swagger-entity (0.5.4) + grape-swagger-entity (0.5.5) grape-entity (~> 1) grape-swagger (~> 2) grape_logging (1.8.4) @@ -891,8 +919,9 @@ GEM faraday (~> 2.0) graphql-client graphlyte (1.0.0) - graphql (2.3.5) + graphql (2.3.17) base64 + fiber-storage graphql-client (0.23.0) activesupport (>= 3.0) graphql (>= 1.13.0) @@ -970,7 +999,7 @@ GEM i18n (1.14.4) concurrent-ruby (~> 1.0) i18n_data (0.13.1) - icalendar (2.10.1) + icalendar (2.10.2) ice_cube (~> 0.16) ice_cube (0.16.4) ice_nine (0.11.2) @@ -1028,8 +1057,6 @@ GEM activerecord kaminari-core (= 1.2.2) kaminari-core (1.2.2) - kas-grpc (0.6.0) - grpc (~> 1.0) knapsack (4.0.0) rake kramdown (2.3.2) @@ -1042,9 +1069,9 @@ GEM recursive-open-struct (~> 1.1, >= 1.1.1) rest-client (~> 2.0) language_server-protocol (3.17.0.3) - launchy (2.5.0) - addressable (~> 2.7) - lefthook (1.6.18) + launchy (2.5.2) + addressable (~> 2.8) + lefthook (1.7.18) letter_opener (1.10.0) launchy (>= 2.2, < 4) letter_opener_web (3.0.0) @@ -1249,8 +1276,8 @@ GEM opentelemetry-api (1.2.5) opentelemetry-common (0.21.0) opentelemetry-api (~> 1.0) - opentelemetry-exporter-otlp (0.27.0) - google-protobuf (~> 3.14) + opentelemetry-exporter-otlp (0.28.1) + google-protobuf (>= 3.18) googleapis-common-protos-types (~> 1.3) opentelemetry-api (~> 1.1) opentelemetry-common (~> 0.20) @@ -1266,89 +1293,81 @@ GEM opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-rack (~> 0.21) - opentelemetry-instrumentation-action_view (0.7.0) + opentelemetry-instrumentation-action_view (0.7.2) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-active_support (~> 0.1) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-active_job (0.7.1) + opentelemetry-instrumentation-active_job (0.7.7) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-active_record (0.7.2) + opentelemetry-instrumentation-active_record (0.7.4) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-active_support (0.5.1) + opentelemetry-instrumentation-active_support (0.6.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-aws_sdk (0.5.2) + opentelemetry-instrumentation-aws_sdk (0.5.4) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-base (0.22.3) opentelemetry-api (~> 1.0) opentelemetry-registry (~> 0.1) - opentelemetry-instrumentation-concurrent_ruby (0.21.3) + opentelemetry-instrumentation-concurrent_ruby (0.21.4) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-ethon (0.21.5) + opentelemetry-instrumentation-ethon (0.21.8) opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.21.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-excon (0.22.2) + opentelemetry-instrumentation-excon (0.22.4) opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.21.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-faraday (0.24.3) + opentelemetry-instrumentation-faraday (0.24.6) opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.21.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-grape (0.1.8) + opentelemetry-instrumentation-grape (0.2.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-rack (~> 0.21) - opentelemetry-instrumentation-graphql (0.28.2) + opentelemetry-instrumentation-graphql (0.28.4) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-http (0.23.3) + opentelemetry-instrumentation-http (0.23.4) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-http_client (0.22.5) + opentelemetry-instrumentation-http_client (0.22.7) opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.21.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-net_http (0.22.5) + opentelemetry-instrumentation-net_http (0.22.7) opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.21.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-pg (0.27.3) + opentelemetry-instrumentation-pg (0.28.0) opentelemetry-api (~> 1.0) opentelemetry-helpers-sql-obfuscation opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rack (0.24.4) + opentelemetry-instrumentation-rack (0.24.6) opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.21.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rails (0.30.2) + opentelemetry-instrumentation-rails (0.31.2) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-action_mailer (~> 0.1.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_support (~> 0.5.0) + opentelemetry-instrumentation-active_support (~> 0.6.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-rake (0.2.2) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-redis (0.25.5) + opentelemetry-instrumentation-redis (0.25.7) opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.21.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-sidekiq (0.25.4) + opentelemetry-instrumentation-sidekiq (0.25.7) opentelemetry-api (~> 1.0) - opentelemetry-common (~> 0.21.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-registry (0.3.0) opentelemetry-api (~> 1.1) - opentelemetry-sdk (1.4.1) + opentelemetry-sdk (1.5.0) opentelemetry-api (~> 1.1) opentelemetry-common (~> 0.20) opentelemetry-registry (~> 0.2) @@ -1382,6 +1401,9 @@ GEM diff-lcs (~> 1.5) expgen (~> 0.1) rainbow (~> 3.1.1) + paper_trail (15.1.0) + activerecord (>= 6.1) + request_store (~> 1.4) parallel (1.24.0) parser (3.3.3.0) ast (~> 2.4.1) @@ -1407,7 +1429,7 @@ GEM prime (0.1.2) forwardable singleton - prism (0.29.0) + prism (1.1.0) proc_to_ast (0.1.0) coderay parser @@ -1428,8 +1450,8 @@ GEM pry (>= 0.13.0) tty-markdown tty-prompt - public_suffix (5.0.0) - puma (6.4.0) + public_suffix (6.0.1) + puma (6.4.3) nio4r (~> 2.0) pyu-ruby-sasl (0.0.3.3) raabro (1.4.0) @@ -1510,7 +1532,7 @@ GEM json recursive-open-struct (1.1.3) redcarpet (3.6.0) - redis (5.2.0) + redis (5.3.0) redis-client (>= 0.22.0) redis-actionpack (5.4.0) actionpack (>= 5, < 8) @@ -1518,11 +1540,11 @@ GEM redis-store (>= 1.1.0, < 2) redis-client (0.22.2) connection_pool - redis-cluster-client (0.8.2) + redis-cluster-client (0.11.0) redis-client (~> 0.22) - redis-clustering (5.2.0) - redis (= 5.2.0) - redis-cluster-client (>= 0.7.11) + redis-clustering (5.3.0) + redis (= 5.3.0) + redis-cluster-client (>= 0.10.0) redis-namespace (1.11.0) redis (>= 4) redis-rack (3.0.0) @@ -1558,23 +1580,23 @@ GEM chunky_png (~> 1.0) rqrcode_core (~> 1.0) rqrcode_core (1.2.0) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) rspec-benchmark (0.6.0) benchmark-malloc (~> 0.2) benchmark-perf (~> 0.6) benchmark-trend (~> 0.4) rspec (>= 3.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + rspec-core (3.13.1) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.6) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) + rspec-support (~> 3.13.0) rspec-parameterized (1.0.2) rspec-parameterized-core (< 2) rspec-parameterized-table_syntax (< 2) @@ -1586,17 +1608,17 @@ GEM rspec-parameterized-table_syntax (1.0.0) binding_of_caller rspec-parameterized-core (< 2) - rspec-rails (6.1.1) - actionpack (>= 6.1) - activesupport (>= 6.1) - railties (>= 6.1) - rspec-core (~> 3.12) - rspec-expectations (~> 3.12) - rspec-mocks (~> 3.12) - rspec-support (~> 3.12) + rspec-rails (7.0.1) + actionpack (>= 7.0) + activesupport (>= 7.0) + railties (>= 7.0) + rspec-core (~> 3.13) + rspec-expectations (~> 3.13) + rspec-mocks (~> 3.13) + rspec-support (~> 3.13) rspec-retry (0.6.2) rspec-core (> 3.3) - rspec-support (3.12.0) + rspec-support (3.13.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) rspec_profiling (0.0.9) @@ -1637,15 +1659,15 @@ GEM ruby-fogbugz (0.3.0) crack (~> 0.4) multipart-post (~> 2.0) - ruby-lsp (0.17.4) + ruby-lsp (0.19.1) language_server-protocol (~> 3.17.0) - prism (>= 0.29.0, < 0.31) + prism (>= 1.1, < 2.0) rbs (>= 3, < 4) sorbet-runtime (>= 0.5.10782) - ruby-lsp-rails (0.3.8) - ruby-lsp (>= 0.17.2, < 0.18.0) - ruby-lsp-rspec (0.1.12) - ruby-lsp (~> 0.17.0) + ruby-lsp-rails (0.3.17) + ruby-lsp (>= 0.19.0, < 0.20.0) + ruby-lsp-rspec (0.1.15) + ruby-lsp (~> 0.19.0) ruby-magic (0.6.0) mini_portile2 (~> 2.8) ruby-openai (3.7.0) @@ -1690,24 +1712,19 @@ GEM pastel (~> 0.8.0) thor (~> 1.3) tty-command (~> 0.10.1) - sentry-rails (5.18.2) + sentry-rails (5.19.0) railties (>= 5.0) - sentry-ruby (~> 5.18.2) - sentry-ruby (5.18.2) + sentry-ruby (~> 5.19.0) + sentry-ruby (5.19.0) bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) - sentry-sidekiq (5.18.2) - sentry-ruby (~> 5.18.2) + sentry-sidekiq (5.19.0) + sentry-ruby (~> 5.19.0) sidekiq (>= 3.0) sexp_processor (4.17.1) shellany (0.0.1) shoulda-matchers (5.1.0) activesupport (>= 5.2.0) - sidekiq (7.1.6) - concurrent-ruby (< 2) - connection_pool (>= 2.3.0) - rack (>= 2.2.4) - redis-client (>= 0.14.0) sidekiq-cron (1.12.0) fugit (~> 1.8) globalid (>= 1.0.1) @@ -1805,7 +1822,7 @@ GEM unicode-display_width (>= 1.1.1, < 3) terser (1.0.2) execjs (>= 0.3.0, < 3) - test-prof (1.3.3.1) + test-prof (1.4.0) test_file_finder (0.3.1) faraday (>= 1.0, < 3.0, != 2.0.0) text (1.3.1) @@ -1887,7 +1904,7 @@ GEM activesupport (>= 3.0) version_gem (1.1.0) version_sorter (2.3.0) - view_component (3.13.0) + view_component (3.14.0) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -1898,7 +1915,7 @@ GEM vite_rails (3.0.17) railties (>= 5.1, < 8) vite_ruby (~> 3.0, >= 3.2.2) - vite_ruby (3.7.0) + vite_ruby (3.8.2) dry-cli (>= 0.7, < 2) rack-proxy (~> 0.6, >= 0.6.1) zeitwerk (~> 2.2) @@ -1966,8 +1983,8 @@ DEPENDENCIES attr_encrypted (~> 3.2.4)! awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.201.0) - aws-sdk-s3 (~> 1.157.0) + aws-sdk-core (~> 3.206.0) + aws-sdk-s3 (~> 1.163.0) axe-core-rspec (~> 4.9.0) babosa (~> 2.0) base32 (~> 0.3.0) @@ -2003,7 +2020,7 @@ DEPENDENCIES declarative_policy (~> 1.1.0) deprecation_toolkit (~> 1.5.1) derailed_benchmarks - devfile (~> 0.0.26.pre.alpha1) + devfile (~> 0.0.28.pre.alpha1) device_detector devise (~> 4.9.3) devise-pbkdf2-encryptable (~> 0.0.0)! @@ -2030,11 +2047,12 @@ DEPENDENCIES faraday_middleware-aws-sigv4 (~> 1.0.1) fast_blank (~> 1.0.1) ffaker (~> 2.23) + ffi (~> 1.17) flipper (~> 0.26.2) flipper-active_record (~> 0.26.2) flipper-active_support_cache_store (~> 0.26.2) fog-aliyun (~> 0.4) - fog-aws (~> 3.18) + fog-aws (~> 3.26) fog-core (= 2.1.0) fog-google (~> 1.24.1) fog-local (~> 0.8) @@ -2042,17 +2060,18 @@ DEPENDENCIES fuubar (~> 2.2.0) gdk-toogle (~> 0.9, >= 0.9.5) gettext (~> 3.4, >= 3.4.9) - gettext_i18n_rails (~> 1.12.0) - gitaly (~> 17.2.0) + gettext_i18n_rails (~> 1.13.0) + gitaly (~> 17.4.0.pre.rc1) gitlab-backup-cli! gitlab-chronic (~> 0.10.5) gitlab-dangerfiles (~> 4.8.0) gitlab-duo-workflow-service-client (~> 0.1)! gitlab-experiment (~> 0.9.1) - gitlab-fog-azure-rm (~> 2.0.1) - gitlab-glfm-markdown (~> 0.0.17) + gitlab-fog-azure-rm (~> 2.1.0) + gitlab-glfm-markdown (~> 0.0.21) gitlab-housekeeper! gitlab-http! + gitlab-kas-grpc (~> 17.4.0.pre.rc1) gitlab-labkit (~> 0.36.0) gitlab-license (~> 2.5) gitlab-mail_room (~> 0.0.24) @@ -2064,13 +2083,14 @@ DEPENDENCIES gitlab-schema-validation! gitlab-sdk (~> 0.3.0) 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-topology-service-client (~> 0.1)! gitlab-utils! gitlab_chronic_duration (~> 0.12) gitlab_omniauth-ldap (~> 2.2.0) - gitlab_quality-test_tooling (~> 1.33.0) + gitlab_quality-test_tooling (~> 1.39.0) gon (~> 6.4.0) google-apis-androidpublisher_v3 (~> 0.34.0) google-apis-cloudbilling_v1 (~> 0.21.0) @@ -2088,7 +2108,7 @@ DEPENDENCIES google-cloud-storage (~> 1.45.0) google-protobuf (~> 3.25, >= 3.25.3) googleauth (~> 1.8.1) - gpgme (~> 2.0.23) + gpgme (~> 2.0.24) grape (~> 2.0.0) grape-entity (~> 1.0.1) grape-path-helpers (~> 2.0.1) @@ -2098,7 +2118,7 @@ DEPENDENCIES graphiql-rails (~> 1.10) graphlient (~> 0.8.0) graphlyte (~> 1.0.0) - graphql (~> 2.3.5) + graphql (~> 2.3.14) graphql-docs (~> 5.0.0) grpc (= 1.63.0) gssapi (~> 1.3.1) @@ -2110,6 +2130,7 @@ DEPENDENCIES html-pipeline (~> 2.14.3) html2text httparty (~> 0.21.0) + i18n_data (~> 0.13.1) icalendar (~> 2.10.1) influxdb-client (~> 3.1) invisible_captcha (~> 2.1.0) @@ -2123,11 +2144,10 @@ DEPENDENCIES jsonb_accessor (~> 1.3.10) jwt (~> 2.5) kaminari (~> 1.2.2) - kas-grpc (~> 0.6.0) knapsack (~> 4.0.0) kramdown (~> 2.3.1) kubeclient (~> 4.11.0) - lefthook (~> 1.6.8) + lefthook (~> 1.7.0) letter_opener_web (~> 3.0.0) license_finder (~> 7.0) licensee (~> 9.16) @@ -2200,6 +2220,7 @@ DEPENDENCIES org-ruby (~> 0.9.12) os (~> 1.1, >= 1.1.4) pact (~> 1.64) + paper_trail (~> 15.0) parallel (~> 1.19) parser (= 3.3.3.0) parslet (~> 1.8) @@ -2212,7 +2233,7 @@ DEPENDENCIES pry-byebug pry-rails (~> 0.3.9) pry-shell (~> 0.6.4) - puma (= 6.4.0) + puma (= 6.4.3) rack (~> 2.2.9) rack-attack (~> 6.7.0) rack-cors (~> 2.0.1) @@ -2226,9 +2247,9 @@ DEPENDENCIES rbtrace (~> 0.4) re2 (= 2.7.0) recaptcha (~> 5.12) - redis (~> 5.2.0) + redis (~> 5.3.0) redis-actionpack (~> 5.4.0) - redis-clustering (~> 5.2.0) + redis-clustering (~> 5.3.0) redis-namespace (~> 1.11.0) request_store (~> 1.5.1) responders (~> 3.0) @@ -2238,13 +2259,13 @@ DEPENDENCIES rqrcode (~> 2.2) rspec-benchmark (~> 0.6.0) rspec-parameterized (~> 1.0, >= 1.0.2) - rspec-rails (~> 6.1.1) + rspec-rails (~> 7.0.0) rspec-retry (~> 0.6.2) rspec_junit_formatter rspec_profiling (~> 0.0.9) rubocop ruby-fogbugz (~> 0.3.0) - ruby-lsp (~> 0.17.0) + ruby-lsp (~> 0.19.0) ruby-lsp-rails (~> 0.3.6) ruby-lsp-rspec (~> 0.1.10) ruby-magic (~> 0.6) @@ -2258,11 +2279,11 @@ DEPENDENCIES seed-fu (~> 2.3.7) selenium-webdriver (~> 4.21, >= 4.21.1) semver_dialects (~> 3.0) - sentry-rails (~> 5.18.0) - sentry-ruby (~> 5.18.0) - sentry-sidekiq (~> 5.18.0) + sentry-rails (~> 5.19.0) + sentry-ruby (~> 5.19.0) + sentry-sidekiq (~> 5.19.0) shoulda-matchers (~> 5.1.0) - sidekiq (~> 7.1.6) + sidekiq! sidekiq-cron (~> 1.12.0) sigdump (~> 0.2.4) simple_po_parser (~> 1.1.6) @@ -2285,7 +2306,7 @@ DEPENDENCIES tanuki_emoji (~> 0.9) telesignenterprise (~> 2.2) terser (= 1.0.2) - test-prof (~> 1.3.3) + test-prof (~> 1.4.0) test_file_finder (~> 0.3.1) thrift (>= 0.16.0) timfel-krb5-auth (~> 0.8) @@ -2298,9 +2319,9 @@ DEPENDENCIES valid_email (~> 0.1) validates_hostname (~> 1.0.13) version_sorter (~> 2.3) - view_component (~> 3.13.0) + view_component (~> 3.14.0) vite_rails (~> 3.0.17) - vite_ruby (~> 3.7.0) + vite_ruby (~> 3.8.0) vmstat (~> 2.3.0) warning (~> 1.3.0) webauthn (~> 3.0) @@ -2310,4 +2331,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.5.22 + 2.5.11 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index d032f8bf0ba9..0d38783c9d3b 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -155,14 +155,14 @@ src: }; addressable = { dependencies = ["public_suffix"]; - groups = ["danger" "default" "development" "test"]; + groups = ["danger" "default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.7"; }; aes_key_wrap = { groups = ["default"]; @@ -253,10 +253,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11z3vnd8vh3ny1vx69bjrbck5b2g8zsbj94npyadpn7fdp8y3ldv"; + sha256 = "1wyxgwmnz9bw377r3lba26b090hbsq9qnbw8575a1prpy83qh82j"; type = "gem"; }; - version = "2.0.18"; + version = "2.0.23"; }; asciidoctor-include-ext = { dependencies = ["asciidoctor"]; @@ -400,10 +400,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b7qc3pfhiv052fgw8dj4fj7fwm9rp7mc627ax2nkq5zbbbqs6sz"; + sha256 = "1w1cqsh59c417359sj07wj5dkg0qlx5adz1m6r9knj6ax06z9zch"; type = "gem"; }; - version = "3.201.4"; + version = "3.206.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -422,10 +422,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1479h0jpjfkyj26h9hv8d6q8b9iw7v1x5yd0yk6af477d2icgq71"; + sha256 = "07nbpffq5ih9ig7lx3721a99as9agnpd99r15s578wwsqrkkssnl"; type = "gem"; }; - version = "1.157.0"; + version = "1.163.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -433,10 +433,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4"; + sha256 = "0yf396fxashbqn0drbnvd9srxfg7w06v70q8kqpzi04zqchf6lvp"; type = "gem"; }; - version = "1.8.0"; + version = "1.9.1"; }; axe-core-api = { dependencies = ["dumb_delegator" "virtus"]; @@ -1233,10 +1233,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r69vrhh72j6fq41ii99n4ncf0kgb82nhb7j8ia1pr94m4prc4i0"; + sha256 = "0yyggbmai6jhrndhs154vd6manng9fig7jak1x875l1iz64p1hjr"; type = "gem"; }; - version = "0.0.26.pre.alpha1"; + version = "0.0.28.pre.alpha1"; }; device_detector = { groups = ["default"]; @@ -1716,10 +1716,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "104s7n9505488p923cs0pl3jlgn4naam28clkm2885hrysizpjbb"; + sha256 = "00pd34pnfmij5iw1xv73f6d68zng63wyjhmk7dyi010kmb4x5sp6"; type = "gem"; }; - version = "2.10.1"; + version = "2.11.0"; }; faraday-follow_redirects = { dependencies = ["faraday"]; @@ -1840,14 +1840,14 @@ src: version = "2.23.0"; }; ffi = { - groups = ["default" "development" "kerberos" "puma" "test"]; + groups = ["default" "development" "kerberos" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; type = "gem"; }; - version = "1.15.5"; + version = "1.17.0"; }; ffi-compiler = { dependencies = ["ffi" "rake"]; @@ -1957,15 +1957,15 @@ src: version = "0.4.0"; }; fog-aws = { - dependencies = ["fog-core" "fog-json" "fog-xml"]; + dependencies = ["base64" "fog-core" "fog-json" "fog-xml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0127b2jx7lj82h96sm0rnmlgqzgiz5013m6z27vxnkmwrw78iigl"; + sha256 = "1f67gjmvpcdql5mh4z9z0i03snwx80q7y37nyp1bgryb61gic4vm"; type = "gem"; }; - version = "3.18.0"; + version = "3.27.0"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; @@ -2134,10 +2134,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gn1mzqx49i5zfmal499piij457r6jn82cz8w53wxqm965vq3i3a"; + sha256 = "1rlfmhhampvkzir32yqriry6rc6w66l36kb95lmfav4bjafp796l"; type = "gem"; }; - version = "1.12.0"; + version = "1.13.0"; }; git = { dependencies = ["addressable" "rchardet"]; @@ -2156,10 +2156,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rg8rkwjbm51kvnbmkmy6dyf7krr6iaf8hxvxn7jzfs37j4fivj8"; + sha256 = "1czp3492kpvpbxwgb7bpdlwmnldr64qvw5z0sa6yf6w7fzx9vikj"; type = "gem"; }; - version = "17.2.0"; + version = "17.4.0.pre.rc1"; }; gitlab = { dependencies = ["httparty" "terminal-table"]; @@ -2173,7 +2173,7 @@ src: version = "4.19.0"; }; gitlab-backup-cli = { - dependencies = ["activesupport" "google-cloud-storage_transfer" "googleauth" "rainbow" "thor"]; + dependencies = ["activesupport" "addressable" "concurrent-ruby" "faraday" "google-cloud-storage_transfer" "google-protobuf" "googleauth" "grpc" "json" "jwt" "logger" "minitest" "parallel" "rack" "rainbow" "rexml" "thor"]; groups = ["default"]; platforms = []; source = { @@ -2231,10 +2231,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09brm889i4xmr2ba8jyqk91yhya13qfa0kn16p3ipilcm6gh9k31"; + sha256 = "1p8bmbkfc0dkq663vxm9nx7kaajnqa5in1mcz0c8z31a86gcvgpm"; type = "gem"; }; - version = "2.0.1"; + version = "2.1.0"; }; gitlab-glfm-markdown = { dependencies = ["rb_sys"]; @@ -2242,10 +2242,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sdaq9av30761h9x7kjwmwri22265x1dnpq24law6w9sqmgm8ygk"; + sha256 = "0h1vsqblhy9bqw01nsyylmhz0b50n17r7p69c2s757ahpk0hm5nb"; type = "gem"; }; - version = "0.0.17"; + version = "0.0.21"; }; gitlab-housekeeper = { dependencies = ["activesupport" "awesome_print" "httparty" "rubocop"]; @@ -2267,6 +2267,17 @@ src: }; version = "0.1.0"; }; + gitlab-kas-grpc = { + dependencies = ["grpc"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jljmgkabr02645nd7f0zf936k4q2j3yfhap445q66z7lcsr8rrp"; + type = "gem"; + }; + version = "17.4.0.pre.rc1"; + }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; groups = ["default"]; @@ -2380,6 +2391,17 @@ src: }; version = "0.1.0"; }; + gitlab-security_report_schemas = { + dependencies = ["activesupport" "json_schemer"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bl0qrmb6xci719zxnaizja2pf0wabzi91b49y0immf9gr43f01h"; + type = "gem"; + }; + version = "0.1.2.min15.0.0.max15.2.1"; + }; gitlab-sidekiq-fetcher = { dependencies = ["json" "sidekiq"]; groups = ["default"]; @@ -2444,15 +2466,15 @@ src: version = "2.2.0"; }; gitlab_quality-test_tooling = { - dependencies = ["activesupport" "amatch" "gitlab" "http" "influxdb-client" "nokogiri" "parallel" "rainbow" "rspec-parameterized" "table_print" "zeitwerk"]; + dependencies = ["activesupport" "amatch" "fog-google" "gitlab" "http" "influxdb-client" "nokogiri" "parallel" "rainbow" "rspec-parameterized" "table_print" "zeitwerk"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dfsv3aqfmq318dirln6nlmxx8n1z4ncy03w2yi965nm2rwjf58y"; + sha256 = "0dgalsl4452fgbzkg8frgyyas6rp3zac055iihsv3db9bi4vhg1v"; type = "gem"; }; - version = "1.33.0"; + version = "1.39.0"; }; globalid = { dependencies = ["activesupport"]; @@ -2766,10 +2788,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03pg19m15aqw33q6an777735x4x8643xg17rb3jr9j4rkp599id1"; + sha256 = "0fanhdf3vzghma51w1hqpp8s585mwzxgqkwvxj5is4q9j0pgwcs3"; type = "gem"; }; - version = "3.25.4"; + version = "3.25.5"; }; googleapis-common-protos = { dependencies = ["google-protobuf" "googleapis-common-protos-types" "grpc"]; @@ -2810,10 +2832,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "010wr6nnifi952bx4v5c49q25yx1g8lhib5wiv2sg7bip3yvlyy8"; + sha256 = "0r1vmql7w7ka5xzj1aqf8pk2a4sv0znwj2zkg1fgvd5b89qcvv2k"; type = "gem"; }; - version = "2.0.23"; + version = "2.0.24"; }; grape = { dependencies = ["activesupport" "builder" "dry-types" "mustermann-grape" "rack" "rack-accept"]; @@ -2854,10 +2876,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07i1rl07ra81j4zhz7i8f34ja4dgaksdp5rjgmznk332040k2jxn"; + sha256 = "079wa3bn9drp9gysxfyjpvcxlazj1ssylv2nqm8aqv5f3nx8jkgm"; type = "gem"; }; - version = "2.1.0"; + version = "2.1.1"; }; grape-swagger-entity = { dependencies = ["grape-entity" "grape-swagger"]; @@ -2865,10 +2887,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wdmkdq907swkf5x8vgj4i166mqh7nnqp612x7768g2jwr6n9h9l"; + sha256 = "1rpcsyzagcmd6pjixvms7mq0nc0aky53aw9mb9vmc6jbjqlfp852"; type = "gem"; }; - version = "0.5.4"; + version = "0.5.5"; }; grape_logging = { dependencies = ["grape" "rack"]; @@ -2914,15 +2936,15 @@ src: version = "1.0.0"; }; graphql = { - dependencies = ["base64"]; + dependencies = ["base64" "fiber-storage"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w8ahq2sry3hw2p7lmq4sd9ybkky4qr1dn634h6nchb5z0sphdlw"; + sha256 = "1qsljlb2fm8qmd8169ijyrnfixd63jcpy7w222bws1xbz1dna0sy"; type = "gem"; }; - version = "2.3.5"; + version = "2.3.17"; }; graphql-client = { dependencies = ["activesupport" "graphql"]; @@ -3228,10 +3250,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03ki7wm2iqr3dv7mgrxv2b8vbh42c7yv55dc33a077n8jnxhhc8z"; + sha256 = "022nal50cxz0y3ylbgjndqf97wbhh6knmjyq43r6mb8r8b5cs3np"; type = "gem"; }; - version = "2.10.1"; + version = "2.10.2"; }; ice_cube = { groups = ["default"]; @@ -3485,17 +3507,6 @@ src: }; version = "1.2.2"; }; - kas-grpc = { - dependencies = ["grpc"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ydgam2c0c43wpzziz3hxif2xwj8nsdniqd4dilxal2xyi63dxs3"; - type = "gem"; - }; - version = "0.6.0"; - }; knapsack = { dependencies = ["rake"]; groups = ["development" "test"]; @@ -3556,20 +3567,20 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xdyvr5j0gjj7b10kgvh8ylxnwk3wx19my42wqn9h82r4p246hlm"; + sha256 = "06r43899384das2bkbrpsdxsafyyqa94il7111053idfalb4984a"; type = "gem"; }; - version = "2.5.0"; + version = "2.5.2"; }; lefthook = { groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wri6j02jkq75qgd4mpdmi2444lzcvyf63nvkfz9p31rvsj44v5n"; + sha256 = "1bswnpka6w3ph2v3bv1ixmxbszank2a0hkpg4d3qdai2vmnyy9qc"; type = "gem"; }; - version = "1.6.18"; + version = "1.7.18"; }; letter_opener = { dependencies = ["launchy"]; @@ -4517,10 +4528,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k4y30x7l29kgkydn966qcwvf35phx0c9n3c2zinw64pvrmcyl00"; + sha256 = "0saiiaf5bkg95fjcq6asz5w86s6zg76xb0r93dcffhvnz36z0r2v"; type = "gem"; }; - version = "0.27.0"; + version = "0.28.1"; }; opentelemetry-helpers-sql-obfuscation = { dependencies = ["opentelemetry-common"]; @@ -4561,10 +4572,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xfbqgw497k2f56f68k7zsvmrrk5jk69xhl56227dfxlw15p2z5w"; + sha256 = "17qild0js6rgv95rphhs19jhd6ixspv1qvpijchqxmxg8waxmwih"; type = "gem"; }; - version = "0.7.0"; + version = "0.7.2"; }; opentelemetry-instrumentation-active_job = { dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; @@ -4572,10 +4583,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12c0qr980zr4si2ps55aj3zj84zycg3zcf16nh6mizljkmn8096s"; + sha256 = "1a5afx39bf0pzi0w75ic8zs8447i96993h056ww4vr23zl585f2x"; type = "gem"; }; - version = "0.7.1"; + version = "0.7.7"; }; opentelemetry-instrumentation-active_record = { dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; @@ -4583,10 +4594,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wjfd1dmfzcnvss2jsnc2s3g6p0wfq5ay3vfnidkmisgyw7fphfk"; + sha256 = "1fq0i6rmxvgj56jafj8ka19j2nkpj2yvj7h0zi0hc4s6r1s2xmvx"; type = "gem"; }; - version = "0.7.2"; + version = "0.7.4"; }; opentelemetry-instrumentation-active_support = { dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; @@ -4594,10 +4605,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rjajgb7sj3mrw5d79xm7q3f4mns1fc3ngasjfw10i18x0kq7283"; + sha256 = "1q07nn9ipq2yd7xjj24hh00cbvlda269k1l0xfkc8d8iw8mixrsg"; type = "gem"; }; - version = "0.5.1"; + version = "0.6.0"; }; opentelemetry-instrumentation-aws_sdk = { dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; @@ -4605,10 +4616,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "191p0d0yvlwakppzhfq7nkakbz4psby0h0bgx8p5apdc7vz2mmmr"; + sha256 = "1fxk5jaliz93njgfmbl5ygsbzbwqbh0g48w4ar905xxsfg1dl18q"; type = "gem"; }; - version = "0.5.2"; + version = "0.5.4"; }; opentelemetry-instrumentation-base = { dependencies = ["opentelemetry-api" "opentelemetry-registry"]; @@ -4627,43 +4638,43 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xmx1rxdvf835kvad352rcavwkk3x758q0rznx2npay3mm8bbcbg"; + sha256 = "1khlhzwb37mqnzr1vr49ljhi4bplmq9w8ndm0k8xbfsr8h8wivq4"; type = "gem"; }; - version = "0.21.3"; + version = "0.21.4"; }; opentelemetry-instrumentation-ethon = { - dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; groups = ["opentelemetry"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h5sa5in4b5yh8xgsgpk2spzhvkakinyi81mccgfy39zvz1p1i1i"; + sha256 = "1s6ya4sr4w492qbd16b33qpk52wf3903l2ns6camv79kq1h7vahr"; type = "gem"; }; - version = "0.21.5"; + version = "0.21.8"; }; opentelemetry-instrumentation-excon = { - dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; groups = ["opentelemetry"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0im1ljdz4xd2498ss919gsqmv8r4ipk4rkwhf8ai0diw58qwa78p"; + sha256 = "14g6dvk31kz9v9qbr2w6ggxk96v3kaadm8wvnw3qsrsc4pd9ycns"; type = "gem"; }; - version = "0.22.2"; + version = "0.22.4"; }; opentelemetry-instrumentation-faraday = { - dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; groups = ["opentelemetry"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a3hx6linkdwmy5pax0khm64w68d2c7536yzc3svppivhxnfank9"; + sha256 = "0np6wnckn12df6mwcr695fvjy3x2s6541ywr7ahw8a8dszs0qjsh"; type = "gem"; }; - version = "0.24.3"; + version = "0.24.6"; }; opentelemetry-instrumentation-grape = { dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base" "opentelemetry-instrumentation-rack"]; @@ -4671,10 +4682,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c33cg6a2ykpc5215v1a1pqhvad5wld6pz0m32zxhai5psxj3110"; + sha256 = "1dhpapza8qw8clfp7pri6r6sbibrx07sj7xfk3myivmp05rms8m1"; type = "gem"; }; - version = "0.1.8"; + version = "0.2.0"; }; opentelemetry-instrumentation-graphql = { dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; @@ -4682,10 +4693,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13lbvcbszr20b7li8mm007rnm59np5y7zz5a36jchbz8503dhfai"; + sha256 = "0v6w0b3q0li5cq0xmc42ngqk9ahx60n5q31alka36ds4inxcrky2"; type = "gem"; }; - version = "0.28.2"; + version = "0.28.4"; }; opentelemetry-instrumentation-http = { dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; @@ -4693,32 +4704,32 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yncpv6i2cagjyq1srdqddf6mh0q9s04kfi9q1rh9qbsxqbp5cff"; + sha256 = "05mrlg8msp59bagpc18ycr9333760kqp780gw8fgqn1798dl02qr"; type = "gem"; }; - version = "0.23.3"; + version = "0.23.4"; }; opentelemetry-instrumentation-http_client = { - dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; groups = ["opentelemetry"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "038bpsg4bfix3ap7l9f8jqkb1acl3v0p7c2jd7bj1116v4ycdcvc"; + sha256 = "0g6f5zv0bq585ppgzhm6acrpkz32j1h7zyrcy1r8n3ha41daip1z"; type = "gem"; }; - version = "0.22.5"; + version = "0.22.7"; }; opentelemetry-instrumentation-net_http = { - dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; groups = ["opentelemetry"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gppqpy2c48xj2jlcd1lkmr3wh3qhwf14337wjk2w0qq77h11gcr"; + sha256 = "1l26f8sqsjjcc72a5xr9as3gibm4sgj8n004y15i5vbvdgzjfx60"; type = "gem"; }; - version = "0.22.5"; + version = "0.22.7"; }; opentelemetry-instrumentation-pg = { dependencies = ["opentelemetry-api" "opentelemetry-helpers-sql-obfuscation" "opentelemetry-instrumentation-base"]; @@ -4726,21 +4737,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k9m9v4i42y53s85b8y7vz4dj4y00v1gg8392rkrswl5f72fk2dn"; + sha256 = "1sv1bkmapkzyvivf50wjcmq7cv16g9capngzky8p1p2dai0f2794"; type = "gem"; }; - version = "0.27.3"; + version = "0.28.0"; }; opentelemetry-instrumentation-rack = { - dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; groups = ["opentelemetry"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dc2ds4vaqybfpzp98p79z9kgpdagljsgbjbhpi0i9jrlh2xnddy"; + sha256 = "1dmfxcc2xz2qa4zp0sks5zrqcfr4fbpbc9xdgvcv8ys0ipf7pwn0"; type = "gem"; }; - version = "0.24.4"; + version = "0.24.6"; }; 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"]; @@ -4748,10 +4759,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04isc412xin2xw11lccdxcg7i2yf4m8jsw9jlq7gcld5mwix1pa2"; + sha256 = "12k4s1k9wa257bqfny33byscb4ai86jw4q6ygrzsj3iv2bij07w9"; type = "gem"; }; - version = "0.30.2"; + version = "0.31.2"; }; opentelemetry-instrumentation-rake = { dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; @@ -4765,26 +4776,26 @@ src: version = "0.2.2"; }; opentelemetry-instrumentation-redis = { - dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; groups = ["opentelemetry"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mrkcd8mdvfgrqalnav4dh3hvd1f91yq718n1mdb56jkd607kknp"; + sha256 = "1qrgnk2x64sks9gqb7fycfa6sass6ddqzh5dms4hdbz1bzag581f"; type = "gem"; }; - version = "0.25.5"; + version = "0.25.7"; }; opentelemetry-instrumentation-sidekiq = { - dependencies = ["opentelemetry-api" "opentelemetry-common" "opentelemetry-instrumentation-base"]; + dependencies = ["opentelemetry-api" "opentelemetry-instrumentation-base"]; groups = ["opentelemetry"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18x3x06dfydaqqab4k6yykqhy2axppyf9q63sh2da893jphb5qac"; + sha256 = "0cfzw1avv52idxvq02y95g3byxsswccck78zch5hmnnzvp5f59nn"; type = "gem"; }; - version = "0.25.4"; + version = "0.25.7"; }; opentelemetry-registry = { dependencies = ["opentelemetry-api"]; @@ -4803,10 +4814,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ajf9igx63r6r2ds0f3hxd18iragvr88k2k9kzvamp1jkdna6gsi"; + sha256 = "0div7n5wac7x1l9fwdpb3bllw18cns93c7xccy27r4gmvv02f46s"; type = "gem"; }; - version = "1.4.1"; + version = "1.5.0"; }; opentelemetry-semantic_conventions = { dependencies = ["opentelemetry-api"]; @@ -4903,6 +4914,17 @@ src: }; version = "1.20.0"; }; + paper_trail = { + dependencies = ["activerecord" "request_store"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yd9kdyyg1wisxi9mx01ar9s6h50x9k2av95xam58v6jx6bwvg0d"; + type = "gem"; + }; + version = "15.1.0"; + }; parallel = { groups = ["development" "test"]; platforms = []; @@ -5035,10 +5057,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ps7lydh1jsqv02vmb1lgky80hi8wcvbv6lfybxgb9q80cx88b55"; + sha256 = "0ywvpskabdm0ckg6b3cf1jczg1jkjnb1mr0g73cy5l09xdlx5w25"; type = "gem"; }; - version = "0.29.0"; + version = "1.1.0"; }; proc_to_ast = { dependencies = ["coderay" "parser" "unparser"]; @@ -5118,14 +5140,14 @@ src: version = "0.6.4"; }; public_suffix = { - groups = ["danger" "default" "development" "test"]; + groups = ["danger" "default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; + sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; type = "gem"; }; - version = "5.0.0"; + version = "6.0.1"; }; puma = { dependencies = ["nio4r"]; @@ -5133,10 +5155,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y8jcw80zcxvdq0id329lzmp5pzx7hpac227d7sgjkblc89s3pfm"; + sha256 = "0gml1rixrfb0naciq3mrnqkpcvm9ahgps1c04hzxh4b801f69914"; type = "gem"; }; - version = "6.4.0"; + version = "6.4.3"; }; pyu-ruby-sasl = { groups = ["default"]; @@ -5472,10 +5494,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bb3yk2p12f1j4nr0grbadrwnr6gkzd7vn96jcnhswz2jsnbhhfr"; + sha256 = "15r2h7rfp4bi9i0bfmvgnmvmw0kl3byyac53rcakk4qsv7yv4caj"; type = "gem"; }; - version = "4.3.3"; + version = "4.3.4"; }; redis = { dependencies = ["redis-client"]; @@ -5483,10 +5505,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d1ng78dwbzgfg1sljf9bnx2km5y3p3jc42a9npwcrmiard9fsrk"; + sha256 = "1cbjvb61kx2p1mjg2z55mw80760h6d8dnxszqkq8g4c8mv2i1y3b"; type = "gem"; }; - version = "5.2.0"; + version = "5.3.0"; }; redis-actionpack = { dependencies = ["actionpack" "redis-rack" "redis-store"]; @@ -5516,10 +5538,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "107ban04brh3f6xwy4rcy83a6kgq0r71jdfyjz95ggg2hs51pv8w"; + sha256 = "1az0l2q11214gxbi8fcn7xfxj0m31d3wlxcqd0h8qjxqvsjcmrk3"; type = "gem"; }; - version = "0.8.2"; + version = "0.11.0"; }; redis-clustering = { dependencies = ["redis" "redis-cluster-client"]; @@ -5527,10 +5549,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13h3w100848y272vykm1bwyj29z749pa9sfcjqd0k0fx1f73hpv8"; + sha256 = "0ncqm43bcxwll4lkdw5fp34m8pc0fp9lqzhq4qcgn7ax68a90gvp"; type = "gem"; }; - version = "5.2.0"; + version = "5.3.0"; }; redis-namespace = { dependencies = ["redis"]; @@ -5714,14 +5736,14 @@ src: }; rspec = { dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; - groups = ["default" "development" "test"]; + groups = ["default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c"; + sha256 = "14xrp8vq6i9zx37vh0yp4h9m0anx9paw200l1r5ad9fmq559346l"; type = "gem"; }; - version = "3.12.0"; + version = "3.13.0"; }; rspec-benchmark = { dependencies = ["benchmark-malloc" "benchmark-perf" "benchmark-trend" "rspec"]; @@ -5740,10 +5762,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l95bnjxdabrn79hwdhn2q1n7mn26pj7y1w5660v5qi81x458nqm"; + sha256 = "0s688wfw77fjldzayvczg8bgwcgh6bh552dw7qcj1rhjk3r4zalx"; type = "gem"; }; - version = "3.12.2"; + version = "3.13.1"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -5751,10 +5773,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05j44jfqlv7j2rpxb5vqzf9hfv7w8ba46wwgxwcwd8p0wzi1hg89"; + sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf"; type = "gem"; }; - version = "3.12.3"; + version = "3.13.3"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -5762,10 +5784,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gq7gviwpck7fhp4y5ibljljvxgjklza18j62qf6zkm2icaa8lfy"; + sha256 = "1vxxkb2sf2b36d8ca2nq84kjf85fz4x7wqcvb8r6a5hfxxfk69r3"; type = "gem"; }; - version = "3.12.6"; + version = "3.13.2"; }; rspec-parameterized = { dependencies = ["rspec-parameterized-core" "rspec-parameterized-table_syntax"]; @@ -5806,10 +5828,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1clmx6qzdbpm1g8ycg38gjbqsbr8ccqi6hqyx88g8yckz1hrx55x"; + sha256 = "1ycjggcmzbgrfjk04v26b43c3fj5jq2qic911qk7585wvav2qaxd"; type = "gem"; }; - version = "6.1.1"; + version = "7.0.1"; }; rspec-retry = { dependencies = ["rspec-core"]; @@ -5823,14 +5845,14 @@ src: version = "0.6.2"; }; rspec-support = { - groups = ["default" "development" "test"]; + groups = ["default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx"; + sha256 = "03z7gpqz5xkw9rf53835pa8a9vgj4lic54rnix9vfwmp2m7pv1s8"; type = "gem"; }; - version = "3.12.0"; + version = "3.13.1"; }; rspec_junit_formatter = { dependencies = ["rspec-core"]; @@ -5959,10 +5981,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04z280c4mimfwpfgcw2j6b13g1vni0cnrfgwjs9bgkzm95m1vsj9"; + sha256 = "1vcc2jib05p8lf09mczxyd2rw89gybbk8lkc08ckzq53lqvzj4yh"; type = "gem"; }; - version = "0.17.4"; + version = "0.19.1"; }; ruby-lsp-rails = { dependencies = ["ruby-lsp"]; @@ -5970,10 +5992,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xd9d1h7m0bw05jykf0sx6sds01ymf0dffpb3j1r99ril703lzc4"; + sha256 = "1l8z5m81519ki6p33s8xxy3vbcvp71did91pzvhr129a7cqhxs14"; type = "gem"; }; - version = "0.3.8"; + version = "0.3.17"; }; ruby-lsp-rspec = { dependencies = ["ruby-lsp"]; @@ -5981,10 +6003,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r8i93fq4ijnxbh9pfh5df0d0pl8xr23s7whvwqjyk6w4xg7gzil"; + sha256 = "17dxzzywxy8x78nxm24czdc9jf75ghgqijj396q1mx0nknmd9vni"; type = "gem"; }; - version = "0.1.12"; + version = "0.1.15"; }; ruby-magic = { dependencies = ["mini_portile2"]; @@ -6203,10 +6225,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09qfh3pgjg92cjsn83zkp1vc234gm2j66rld09lfhlviavkzdbad"; + sha256 = "158rhsv547f3c31kfz8kdr7kpgm34sqm0bzbkxpqg3pazqim7bfl"; type = "gem"; }; - version = "5.18.2"; + version = "5.19.0"; }; sentry-ruby = { dependencies = ["bigdecimal" "concurrent-ruby"]; @@ -6214,10 +6236,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "168dq5i95aaps8bppc402qgd8xpxisdpx9z4cqr3zcn6s0dwn9fz"; + sha256 = "12w3w779dcab85x1i4aavd5fw8xdb7mvhs3cvx85q2l48vr8kpqd"; type = "gem"; }; - version = "5.18.2"; + version = "5.19.0"; }; sentry-sidekiq = { dependencies = ["sentry-ruby" "sidekiq"]; @@ -6225,10 +6247,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qajyyiwd035rwnxd2zdhh9y2rdx00812ya247nhqb6kqw1s7ml6"; + sha256 = "106bxqzi0mhvxm583mly7a95rv77m89dd51433fwnpdk2m5yq5hv"; type = "gem"; }; - version = "5.18.2"; + version = "5.19.0"; }; sexp_processor = { groups = ["default" "test"]; @@ -6266,11 +6288,10 @@ src: groups = ["default"]; platforms = []; source = { - remotes = ["https://rubygems.org"]; - sha256 = "18j3g31ps6ga9nzza0z0d00qjrn810fhkhx2pqi3rvxwsmkdlnbq"; - type = "gem"; + path = "${src}/vendor/gems/sidekiq-7.2.4"; + type = "path"; }; - version = "7.1.6"; + version = "7.2.4"; }; sidekiq-cron = { dependencies = ["fugit" "globalid" "sidekiq"]; @@ -6738,10 +6759,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lxik4ngvbphivyhss9i59c67zxkc0z7k0r683qshw1gdkfxzd8f"; + sha256 = "0x0gj68an9nkb8pvlzxs7m5n3ip3fizlw9s4kgkyj5kjqgpw6swn"; type = "gem"; }; - version = "1.3.3.1"; + version = "1.4.0"; }; test_file_finder = { dependencies = ["faraday"]; @@ -7158,10 +7179,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yqq8srliv2w960gxnfr5sn8dmcppcyd6wmkgq71d1qkymwn8vii"; + sha256 = "0333krs3kil7p1rr7cvfrsqr1plns7j6wca9mjgns9qdqkhnv0cn"; type = "gem"; }; - version = "3.13.0"; + version = "3.14.0"; }; virtus = { dependencies = ["axiom-types" "coercible" "descendants_tracker"]; @@ -7191,10 +7212,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fgpwlvmasj10kx5929xyb4fysqlfb3iixbci68170k6bslssd2a"; + sha256 = "1fcharh45xwi2cx96m695v9gccny3hgvdkkhcbkhplk1bc6ldwgk"; type = "gem"; }; - version = "3.7.0"; + version = "3.8.2"; }; vmstat = { groups = ["default"]; diff --git a/pkgs/by-name/gi/gitaly/git.nix b/pkgs/by-name/gi/gitaly/git.nix index 2610c39ca711..a4da27381df0 100644 --- a/pkgs/by-name/gi/gitaly/git.nix +++ b/pkgs/by-name/gi/gitaly/git.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "gitaly-git"; - version = "2.45.2"; + version = "2.46.2"; # `src` attribute for nix-update src = fetchFromGitLab { owner = "gitlab-org"; repo = "git"; rev = "v${version}"; - hash = "sha256-R4K5b4d1DQw+pwoOCAK4EJtVPXQDPossTUmVv0LJtUs="; + hash = "sha256-LQqb3lmYIqtwIHR5KHg/Cm568CxQqeGOBAQeXphqSXo="; }; # we actually use the gitaly build system diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix index a6d01e5a061f..c25073eb0570 100644 --- a/pkgs/by-name/gi/gitaly/package.nix +++ b/pkgs/by-name/gi/gitaly/package.nix @@ -6,7 +6,7 @@ }: let - version = "17.3.7"; + version = "17.5.2"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -20,10 +20,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-H//vwXzpUh1a8Lez5HTmwkF8TQVPVSefyabnEM4Wo4E="; + hash = "sha256-jEgw66aNJdLW6twU/oqJN/pxyGsJh/UOFaNEzfVjdCY="; }; - vendorHash = "sha256-3Gwpf4zLg9KsmGr2bYmcHATsouKXe3W/vppGHT2B048="; + vendorHash = "sha256-VN+d6jMX3f4ua+YEF6LmqEOTRm2q4zxZ/X73hhA4fNs="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; diff --git a/pkgs/by-name/gi/gitlab-container-registry/package.nix b/pkgs/by-name/gi/gitlab-container-registry/package.nix index 0d5410207e4c..09c6477f52e1 100644 --- a/pkgs/by-name/gi/gitlab-container-registry/package.nix +++ b/pkgs/by-name/gi/gitlab-container-registry/package.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "4.13.0"; + version = "4.14.0"; rev = "v${version}-gitlab"; # nixpkgs-update: no auto update @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - hash = "sha256-V58UjlIlGllbPBTZMY5EoGNC+toy11xLCnnLHXqJUVU="; + hash = "sha256-FOytsMFiaVqHQrwdWpmDbzWGddD4R1rClXWVD2EpUk8="; }; - vendorHash = "sha256-LSl94y1g0sfqXWddF7f8z2YRC5D6zJP1t+gsXqdVHww="; + vendorHash = "sha256-8TQMMRKyg5bQ3www79V1ejGJ81D0ZMwiXyIhx8+fdec="; postPatch = '' # Disable flaky inmemory storage driver test diff --git a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix index e04809a59a83..976d46c69651 100644 --- a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix +++ b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gitlab-elasticsearch-indexer"; - version = "5.2.0"; + version = "5.3.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-elasticsearch-indexer"; rev = "v${version}"; - hash = "sha256-pkZWIsPWUDkjZo48mJ9N8LbMJJAHNI2Wf6X0F5+K23s="; + hash = "sha256-upbVe78HLRWXf8knxsVX6mGbXHfMTPa7yQ7/XMTgGLo="; }; - vendorHash = "sha256-hFTvNh/N3z99O7dtAEiksonJcTn7Zj7Ijp68vfXEBw8="; + vendorHash = "sha256-sws1r6W6tYJI/zOWFFp2hry9ToXuE4fezIL1XPgp0EM="; buildInputs = [ icu ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix index b529d3164e67..0f38dbb8b2bd 100644 --- a/pkgs/by-name/gi/gitlab-pages/package.nix +++ b/pkgs/by-name/gi/gitlab-pages/package.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "17.3.7"; + version = "17.5.2"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-ZViBwStBDqnR9SMeqZz1HSzL5OVSp2An/9hj4FBTmGs="; + hash = "sha256-fjoby/fTh1wAidyOQSqx7VolxzSB0TQYvltJhYduDSY="; }; - vendorHash = "sha256-O8kWiOpgVCUD6DdM95F1b+j4Gv9LTLRdBjByqXWV7Pk="; + vendorHash = "sha256-M2RQPkLWsi9rHXI3lSb9w9nxiklTkV8wpC9VoH0SP6M="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/by-name/gi/gitlab-shell/package.nix b/pkgs/by-name/gi/gitlab-shell/package.nix index 53614d3a39e9..88e7eeaf71de 100644 --- a/pkgs/by-name/gi/gitlab-shell/package.nix +++ b/pkgs/by-name/gi/gitlab-shell/package.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.38.0"; + version = "14.39.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - hash = "sha256-oYvsSjdzfJn4ujy1qbMmqZyEQFbYTSke8t3KBqjr/Vc="; + hash = "sha256-HSieVAYuqv5zYN6CMAo86s/Df17PdIXzDIZ2pM4Sqlw="; }; buildInputs = [ ruby libkrb5 ]; @@ -18,12 +18,17 @@ buildGoModule rec { ./remove-hardcoded-locations.patch ]; - vendorHash = "sha256-YOShgZv0zdfXgKi//IENt6wE2m0S1Kqa+2ndvCwKDLQ="; + vendorHash = "sha256-wlxHaPstdXjMWV+qHxahAukk/Lc07kq37SlnCU3KO4o="; + + subPackages = [ + "cmd/gitlab-shell" + "cmd/gitlab-sshd" + "cmd/gitlab-shell-check" + "cmd/gitlab-shell-authorized-principals-check" + "cmd/gitlab-shell-authorized-keys-check" + ]; postInstall = '' - cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin - mv $out/bin/install $out/bin/gitlab-shell-install - mv $out/bin/check $out/bin/gitlab-shell-check cp -r "$NIX_BUILD_TOP/source"/{support,VERSION} $out/ ''; doCheck = false; From 326602a98369c669e751564d308a6c4ebde13e8a Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 29 Nov 2024 12:38:38 -0500 Subject: [PATCH 17/33] mate.mate-calc: fix cross compilation, format with nixfmt --- pkgs/desktops/mate/mate-calc/default.nix | 28 ++++++++++++++---------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index 2c11bbef52a3..96cf3ec8394e 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -1,15 +1,16 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, gettext -, itstool -, gtk3 -, libmpc -, libxml2 -, mpfr -, wrapGAppsHook3 -, mateUpdateScript +{ + lib, + stdenv, + fetchurl, + pkg-config, + gettext, + itstool, + gtk3, + libmpc, + libxml2, + mpfr, + wrapGAppsHook3, + mateUpdateScript, }: stdenv.mkDerivation rec { @@ -21,9 +22,12 @@ stdenv.mkDerivation rec { sha256 = "gEsSXR4oZLHnSvgW2psquLGUcrmvl0Q37nNVraXmKPU="; }; + strictDeps = true; + nativeBuildInputs = [ gettext itstool + libxml2 # xmllint pkg-config wrapGAppsHook3 ]; From bf50468b8f4a8f0ca29e47f95022d9923cc63ed8 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 29 Nov 2024 12:39:00 -0500 Subject: [PATCH 18/33] mate.mate-system-monitor: fix cross compilation, format with nixfmt --- .../mate/mate-system-monitor/default.nix | 34 +++++++++++-------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index f6b38ddec47f..72c0070c7617 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -1,18 +1,19 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, gettext -, itstool -, gtkmm3 -, libxml2 -, libgtop -, librsvg -, polkit -, systemd -, wrapGAppsHook3 -, mate-desktop -, mateUpdateScript +{ + lib, + stdenv, + fetchurl, + pkg-config, + gettext, + itstool, + gtkmm3, + libxml2, + libgtop, + librsvg, + polkit, + systemd, + wrapGAppsHook3, + mate-desktop, + mateUpdateScript, }: stdenv.mkDerivation rec { @@ -24,10 +25,13 @@ stdenv.mkDerivation rec { sha256 = "QtZj1rkPtTYevBP2VHmD1vHirHXcKuTxysbqYymWWiU="; }; + strictDeps = true; + nativeBuildInputs = [ pkg-config gettext itstool + libxml2 # xmllint wrapGAppsHook3 ]; From 2eaa53ac8ceb7556dd4c82c37a1c458ef5424dd9 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 29 Nov 2024 13:25:32 -0500 Subject: [PATCH 19/33] mate.mate-terminal: fix cross compilation, format with nixfmt --- pkgs/desktops/mate/mate-terminal/default.nix | 33 +++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index fa08aa326411..0007d5e0b40d 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,17 +1,18 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, gettext -, itstool -, libxml2 -, mate-desktop -, dconf -, vte -, pcre2 -, wrapGAppsHook3 -, mateUpdateScript -, nixosTests +{ + lib, + stdenv, + fetchurl, + pkg-config, + gettext, + itstool, + libxml2, + mate-desktop, + dconf, + vte, + pcre2, + wrapGAppsHook3, + mateUpdateScript, + nixosTests, }: stdenv.mkDerivation rec { @@ -23,16 +24,18 @@ stdenv.mkDerivation rec { sha256 = "8TXrGp4q4ieY7LLcGRT9tM/XdOa7ZcAVK+N8xslGnpI="; }; + strictDeps = true; + nativeBuildInputs = [ gettext itstool pkg-config + libxml2 # xmllint wrapGAppsHook3 ]; buildInputs = [ dconf - libxml2 mate-desktop pcre2 vte From b3e8e251f3087eaa971a087f9948bbf21ae3d14d Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 30 Nov 2024 02:01:34 +0100 Subject: [PATCH 20/33] workflows/eval: Make sure to compare against the push run For PRs whose commits end up as HEAD of master like https://github.com/NixOS/nixpkgs/commit/bcc5c141bf43460909b83740e96ceeea6d0f7e12, there might be workflow runs associated with both PRs and pushes. Only the push event is the one that will run fully and should be used to compare against. So far it didn't distinguish between the two events, causing it to sometimes pick the wrong one and then fail to download non-existent artifacts: https://github.com/NixOS/nixpkgs/actions/runs/12092053414/job/33721377179 This commit fixes that by ensuring that the push event result is compared against --- .github/workflows/eval.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 90be4670e414..1494d97141bb 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -168,7 +168,7 @@ jobs: run: | # Get the latest eval.yml workflow run for the PR's base commit if ! run=$(gh api --method GET /repos/"$REPOSITORY"/actions/workflows/eval.yml/runs \ - -f head_sha="$BASE_SHA" \ + -f head_sha="$BASE_SHA" -f event=push \ --jq '.workflow_runs | sort_by(.run_started_at) | .[-1]') \ || [[ -z "$run" ]]; then echo "Could not find an eval.yml workflow run for $BASE_SHA, cannot make comparison" From ea65e3038a72e0fc5700c40e45ae4b8642401c59 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 30 Nov 2024 02:49:40 +0100 Subject: [PATCH 21/33] workflows/eval: Clear unnecessary rebuild labels Previously the labels would never be removed, even if the number of rebuilds changed --- .github/workflows/eval.yml | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 90be4670e414..2ff4ee4dd304 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -237,9 +237,33 @@ jobs: - name: Tagging pull request run: | + # Get all currently set rebuild labels gh api \ - --method POST \ - /repos/${{ github.repository }}/issues/${{ github.event.number }}/labels \ - --input <(jq -c '{ labels: .labels }' comparison/changed-paths.json) + /repos/"$REPOSITORY"/issues/"$NUMBER"/labels \ + --jq '.[].name | select(startswith("10.rebuild"))' \ + | sort > before + + # And the labels that should be there + jq -r '.labels[]' comparison/changed-paths.json \ + | sort > after + + # Remove the ones not needed anymore + while read -r toRemove; do + echo "Removing label $toRemove" + gh api \ + --method DELETE \ + /repos/"$REPOSITORY"/issues/"$NUMBER"/labels/"$toRemove" + done < <(comm -23 before after) + + # And add the ones that aren't set already + while read -r toAdd; do + echo "Adding label $toAdd" + gh api \ + --method POST \ + /repos/"$REPOSITORY"/issues/"$NUMBER"/labels \ + -f "labels[]=$toAdd" + done < <(comm -13 before after) env: GH_TOKEN: ${{ github.token }} + REPOSITORY: ${{ github.repository }} + NUMBER: ${{ github.event.number }} From a162fd2c8360b80907866dc03c1c8215b3396940 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 04:56:46 +0000 Subject: [PATCH 22/33] oxipng: 9.1.2 -> 9.1.3 --- pkgs/by-name/ox/oxipng/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ox/oxipng/package.nix b/pkgs/by-name/ox/oxipng/package.nix index d0715d8f1aa3..da64973fd17e 100644 --- a/pkgs/by-name/ox/oxipng/package.nix +++ b/pkgs/by-name/ox/oxipng/package.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchCrate, rustPlatform }: rustPlatform.buildRustPackage rec { - version = "9.1.2"; + version = "9.1.3"; pname = "oxipng"; src = fetchCrate { inherit version pname; - hash = "sha256-uP4wLqL0c/dLiczumsq+Ad5ljNvi85RwoYS24fg8kFo="; + hash = "sha256-kzN4YNsFqv/KUxpHao++oqc90Us6VllyFYkpdVUigD0="; }; - cargoHash = "sha256-LZ3YIosDpjDYVACWQsr/0XhgX4fyo8CyZG58WfLSzCs="; + cargoHash = "sha256-4PCLtBJliK3uteL8EVKLBVR2YZW1gwQOiSLQok+rqug="; doCheck = !stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isDarwin; From 18cf9ad14b9592f1b8e07ee4e115a32cdfad76a9 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 30 Nov 2024 07:08:18 +0100 Subject: [PATCH 23/33] nixos/networkd: fix eval Broken by #330662. --- nixos/modules/system/boot/networkd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 8ac6fda6a875..2ff79f1cdc85 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -733,7 +733,7 @@ let (assertValueOneOf "IPv4AcceptLocal" boolValues) (assertValueOneOf "IPv4RouteLocalnet" boolValues) (assertValueOneOf "IPv4ProxyARP" boolValues) - (assertValueOneof "IPv4ProxyARPPrivateVLAN" boolValues) + (assertValueOneOf "IPv4ProxyARPPrivateVLAN" boolValues) (assertValueOneOf "IPv6ProxyNDP" boolValues) (assertValueOneOf "IPv6SendRA" boolValues) (assertValueOneOf "DHCPPrefixDelegation" boolValues) From b9274aa7a594d22b665c350b84a5ad0978caf36c Mon Sep 17 00:00:00 2001 From: Athene Noctua Date: Sat, 30 Nov 2024 07:49:01 +0100 Subject: [PATCH 24/33] libcamera: re-sign IPA modules after fixup (#353336) --- pkgs/by-name/li/libcamera/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/li/libcamera/package.nix b/pkgs/by-name/li/libcamera/package.nix index f576c74cc824..cd056cbf3074 100644 --- a/pkgs/by-name/li/libcamera/package.nix +++ b/pkgs/by-name/li/libcamera/package.nix @@ -51,6 +51,10 @@ stdenv.mkDerivation rec { install -D ${./ipa-priv-key.pem} src/ipa-priv-key.pem ''; + postFixup = '' + ../src/ipa/ipa-sign-install.sh src/ipa-priv-key.pem $out/lib/libcamera/ipa_*.so + ''; + strictDeps = true; buildInputs = [ From 923e2e59ccdadfc476063689980c074fe2173f86 Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Fri, 22 Nov 2024 19:22:38 +0100 Subject: [PATCH 25/33] redlib: 0.35.1-unstable-2024-11-01 -> 0.35.1-unstable-2024-11-27 The current version of redlib in nixpkgs is already 20 days old and does no longer work because of a change on reddit's side, see: https://github.com/redlib-org/redlib/issues/324. --- pkgs/by-name/re/redlib/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/re/redlib/package.nix b/pkgs/by-name/re/redlib/package.nix index 72a1f1abd9b7..a921ac29033b 100644 --- a/pkgs/by-name/re/redlib/package.nix +++ b/pkgs/by-name/re/redlib/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage rec { pname = "redlib"; - version = "0.35.1-unstable-2024-11-01"; + version = "0.35.1-unstable-2024-11-27"; src = fetchFromGitHub { owner = "redlib-org"; repo = "redlib"; - rev = "f03bdcf472d32d51a1093528071dc329b348379d"; - hash = "sha256-fbk0m20NpaUCWvH/l9hfmx+VKw4U3pkTkXdAeHL7bHs="; + rev = "9f6b08cbb2d0f43644a34f5d0210ac32b9add30c"; + hash = "sha256-lFvlrVFzMk6igH/h/3TZnkl8SooanVyIRYbSyleb2OU="; }; - cargoHash = "sha256-PNqecQSx0Q+K3bBfbOJYWPdl7JdUTDQ4f95RUuW0vPw="; + cargoHash = "sha256-BorE3wcT8eCgIatHyNr3p9ewj7cX8yYer0vPEuBYPj4="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security @@ -44,6 +44,8 @@ rustPlatform.buildRustPackage rec { "--skip=test_private_sub" "--skip=test_banned_sub" "--skip=test_gated_sub" + "--skip=test_default_subscriptions" + "--skip=test_rate_limit_check" # subreddit.rs "--skip=test_fetching_subreddit" From c989da7576d55b98a70ea144bb49db60df34e2e1 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 28 Nov 2024 16:00:06 +0100 Subject: [PATCH 26/33] qgis: 3.38.3 -> 3.40.1 --- pkgs/applications/gis/qgis/unwrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 9b01df56622d..484b61b9acda 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -80,14 +80,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.38.3"; + version = "3.40.1"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-yJFYq4t0LzBr+O2bmtBSeehQ2vfUaZIQfOY68WZcHG4="; + hash = "sha256-C86RwyeIZrflC5F2VQCw1LwF9VM4/OBEsLbGPiWKeco="; }; passthru = { From 9fc2250e80ee0308d66c252bcdbc1e206b1333c8 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 28 Nov 2024 16:25:36 +0100 Subject: [PATCH 27/33] qgis-ltr: build with same pyqt version as qgis --- pkgs/applications/gis/qgis/unwrapped-ltr.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index af4fdd4abb68..30836c4ed609 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -54,6 +54,7 @@ let packageOverrides = self: super: { pyqt5 = super.pyqt5.override { withLocation = true; + withSerialPort = true; }; }; }; From 395d59f54be1e1de061c99ea653b0e512380040a Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Thu, 28 Nov 2024 16:26:03 +0100 Subject: [PATCH 28/33] qgis-ltr: 3.34.11 -> 3.34.13 --- pkgs/applications/gis/qgis/unwrapped-ltr.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 30836c4ed609..7ebf46bb840a 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -80,14 +80,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.34.11"; + version = "3.34.13"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-VNgUMEA7VKZXsLG1ZYUIlYvjwRrH8LsliGiVRMnXOM0="; + hash = "sha256-eNncDIRfFYFxyc5a2tZijmVpx/LNm/roak84guFvldg="; }; passthru = { From 397b693e76632e8909d5b8c05cf626b9fe576dbf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 09:45:34 +0000 Subject: [PATCH 29/33] magic-wormhole-rs: 0.7.3 -> 0.7.4 --- pkgs/tools/networking/magic-wormhole-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/magic-wormhole-rs/default.nix b/pkgs/tools/networking/magic-wormhole-rs/default.nix index b8e6a3da8ac3..7e62d1d78af3 100644 --- a/pkgs/tools/networking/magic-wormhole-rs/default.nix +++ b/pkgs/tools/networking/magic-wormhole-rs/default.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage rec { pname = "magic-wormhole-rs"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "magic-wormhole"; repo = "magic-wormhole.rs"; rev = version; - sha256 = "sha256-R5TUZZE+cgSMGR+kNgjaqppXbWM0cELE7jyI4fSNIVM="; + sha256 = "sha256-cPFstE442xuNnW8PQZ8y+0sXTaWk3QYjTn3HG+zWzY0="; }; - cargoHash = "sha256-Q6S7iTV8kCDyV3FdXCKA2vcg3x64BrXOIfrRUc06nI4="; + cargoHash = "sha256-+OcjILDwGg0eybzBgVIZeVelnQatPU6rgd/b6buvTRQ="; buildInputs = [ libxcb ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security AppKit ]; From 0dd1c943d7036bf915341148000a342f67eeccc8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Nov 2024 10:13:14 +0000 Subject: [PATCH 30/33] jwx: 2.1.1 -> 2.1.3 --- pkgs/by-name/jw/jwx/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/jw/jwx/package.nix b/pkgs/by-name/jw/jwx/package.nix index addd3f15bcb6..411256dec35b 100644 --- a/pkgs/by-name/jw/jwx/package.nix +++ b/pkgs/by-name/jw/jwx/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "jwx"; - version = "2.1.1"; + version = "2.1.3"; src = fetchFromGitHub { owner = "lestrrat-go"; repo = pname; rev = "v${version}"; - hash = "sha256-cYNqe5BZJSYWD7XegVEm5prQjC6uX+JZtJ7AZdFbPu4="; + hash = "sha256-CuxBfR+q+2JCe7F1gruGrVM+UBkrmz5dEyrDtFdmbhM="; }; vendorHash = "sha256-ZS7xliFymXTE8hlc3GEMNonP5sJTZGirw5YQNzPCl3Y="; From 77a34c1488ed153aac1f89ea9bf4777fc8ae34d0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 30 Nov 2024 11:33:59 +0100 Subject: [PATCH 31/33] ntirpc: 6.0.1 -> 6.3 --- pkgs/by-name/nt/ntirpc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nt/ntirpc/package.nix b/pkgs/by-name/nt/ntirpc/package.nix index e7100e66f384..c584e1d0b685 100644 --- a/pkgs/by-name/nt/ntirpc/package.nix +++ b/pkgs/by-name/nt/ntirpc/package.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "ntirpc"; - version = "6.0.1"; + version = "6.3"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "ntirpc"; rev = "v${version}"; - sha256 = "sha256-Txtc0Oyt/WfZiMe26uMzx3HFq/YaeU6cYfjPQwh0uQg="; + sha256 = "sha256-e4eF09xwX2Qf/y9YfOGy7p6yhDFnKGI5cnrQy3o8c98="; }; outputs = [ "out" "dev" ]; From ffdc0742421f22be5e055a77118427793b4eb541 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 30 Nov 2024 11:57:38 +0100 Subject: [PATCH 32/33] linuxKernel.packages.linux_6_12.evdi: add support for kernel >= 6.12 --- pkgs/os-specific/linux/evdi/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index e65790ef2608..411eef88eb76 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, kernel, libdrm, python3, @@ -16,15 +17,22 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "evdi"; - version = "1.14.7"; + version = "1.14.7-unstable-2024-11-30"; src = fetchFromGitHub { owner = "DisplayLink"; repo = "evdi"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-z3GawjaokbmmUC1LihwGSnF3tUp9n/FO+kDiWvBq+mY="; + rev = "59a3a864f7476cd61d9c65bfd012d1e9ed90e2b1"; + hash = "sha256-0xEh0Tb5QFReW5lXO/Mb3gn1z87+baR8Tix+dQjUZMw="; }; + patches = [ + (fetchpatch { + url = "https://github.com/DisplayLink/evdi/commit/e41240cf62d7188643bc95e5d69e1c4cfa6ddb84.patch?full_index=1"; + hash = "sha256-6V3QJZMAhXqfGLW2eWkIzJnOdBPvLLNVzg6DW1M3IaA="; + }) + ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error" "-Wno-error=discarded-qualifiers" # for Linux 4.19 compatibility @@ -60,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; meta = { - broken = kernel.kernelOlder "4.19" || kernel.kernelAtLeast "6.12"; + broken = kernel.kernelOlder "4.19"; changelog = "https://github.com/DisplayLink/evdi/releases/tag/v${finalAttrs.version}"; description = "Extensible Virtual Display Interface"; homepage = "https://www.displaylink.com/"; From 73710fe751768edda8f5736bfb97aa8766574c4c Mon Sep 17 00:00:00 2001 From: Ivan Dimitrov <80976541+ivandimitrov8080@users.noreply.github.com> Date: Sat, 30 Nov 2024 12:23:19 +0100 Subject: [PATCH 33/33] linux_latest-libre: 19663 -> 19675 (#359464) Fixes build. --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 06adab0e0ac9..e8df0375b038 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19663"; - sha256 = "126b05v6hcdag3pfaxwbabfwkrp4c7010v52rk2dqh9i631ykavd"; + rev = "19675"; + sha256 = "sha256-vlWY3e9uf+a+I003CjFFw9e3suY059KlIqDf86LGmHM="; } , ... } @ args: