about summary refs log tree commit diff
path: root/pkgs/applications/version-management/gitlab/gitaly
diff options
context:
space:
mode:
authorYaya <mak@nyantec.com>2023-04-26 17:33:41 +0200
committerGitHub <noreply@github.com>2023-04-26 17:33:41 +0200
commit513e072bcc6f017df85a7db607568616fe53eeb1 (patch)
tree4755687f08b7080a4a0bdbbb299b32e42796509e /pkgs/applications/version-management/gitlab/gitaly
parent7a32a141db568abde9bc389845949dc2a454dfd3 (diff)
gitlab: 15.10.2 -> 15.11.0 (#227258)
Diffstat (limited to 'pkgs/applications/version-management/gitlab/gitaly')
-rw-r--r--pkgs/applications/version-management/gitlab/gitaly/Gemfile2
-rw-r--r--pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock6
-rw-r--r--pkgs/applications/version-management/gitlab/gitaly/default.nix6
-rw-r--r--pkgs/applications/version-management/gitlab/gitaly/gemset.nix4
4 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
index e5591cd5290b5..f247c46146a3d 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
@@ -18,7 +18,7 @@ gem 'gitlab-labkit', '~> 0.31', '>= 0.31.1'
 # This version needs to be in sync with GitLab CE/EE
 gem 'licensee', '~> 9.15'
 
-gem 'google-protobuf', '~> 3.22.2'
+gem 'google-protobuf', '~> 3.22.3'
 gem 'nokogiri', '~> 1.14'
 
 # Rails is currently blocked on the upgrade to the new major version for Redis,
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
index 43665f1e26634..bd66bc20a83d8 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
@@ -56,7 +56,7 @@ GEM
       with_env (= 1.1.0)
       xml-simple (~> 1.1.5)
     gitlab-markup (1.8.1)
-    google-protobuf (3.22.2)
+    google-protobuf (3.22.3)
     googleapis-common-protos-types (1.4.0)
       google-protobuf (~> 3.14)
     grpc (1.42.0)
@@ -190,7 +190,7 @@ DEPENDENCIES
   gitlab-labkit (~> 0.31, >= 0.31.1)
   gitlab-license_finder
   gitlab-markup (~> 1.8.0)
-  google-protobuf (~> 3.22.2)
+  google-protobuf (~> 3.22.3)
   grpc (~> 1.42.0)
   licensee (~> 9.15)
   nokogiri (~> 1.14)
@@ -204,4 +204,4 @@ DEPENDENCIES
   sentry-raven (~> 3.1)
 
 BUNDLED WITH
-   2.4.8
+   2.4.11
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index dbd5e9bf8a805..5a9a542c22f05 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -11,7 +11,7 @@ let
     gemdir = ./.;
   };
 
-  version = "15.10.2";
+  version = "15.11.0";
   package_version = "v${lib.versions.major version}";
   gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
 
@@ -22,10 +22,10 @@ let
       owner = "gitlab-org";
       repo = "gitaly";
       rev = "v${version}";
-      sha256 = "sha256-18BmECQqzwwxl7nY5+Bi4oyA2EPd5HqzJdgVPV8J1OM=";
+      sha256 = "sha256-kpqSDtj9ctS5PVWTJv5z/HVXYjIlP6CU/FGgueXwKic=";
     };
 
-    vendorSha256 = "sha256-knuUyJGz5JvYyKeDQ66cMQQSh2YKkkDB54iCir1QpEY=";
+    vendorSha256 = "sha256-gJelagGPogeCdJtRpj4RaYlqzZRhtU0EIhmj1aK4ZOk=";
 
     ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ];
 
diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
index d95e022a3b70c..7d37a3af1faa7 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
@@ -220,10 +220,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zqyy07ps6zh0gi9nppmnsngzv5nx1qjv726mzhv83sh90rc25nm";
+      sha256 = "1xcg53yz44cqhcpb85w3ay80kvnniy0v441c9p08wb6zzia2mnq9";
       type = "gem";
     };
-    version = "3.22.2";
+    version = "3.22.3";
   };
   googleapis-common-protos-types = {
     dependencies = ["google-protobuf"];