gitlab: 12.8.10 -> 12.10.6

NixOS · May 18, 2020 · f613702 · f613702
1 parent 4a873aa
commit f613702
Show file tree

Hide file tree

Showing 14 changed files with 1,418 additions and 962 deletions.
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
@@ -1,13 +1,13 @@
 {
-  "version": "12.8.10",
-  "repo_hash": "1njkihj66d8fnk1l0r5pys38akf5srqlrgj2hzc68l5m8d51dk15",
+  "version": "12.10.6",
+  "repo_hash": "1819vaywir7yy170xqh7a1pr99jhscs6k62xz8b671k5bnissszl",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v12.8.10-ee",
+  "rev": "v12.10.6-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "12.8.10",
-    "GITLAB_PAGES_VERSION": "1.16.0",
-    "GITLAB_SHELL_VERSION": "11.0.0",
-    "GITLAB_WORKHORSE_VERSION": "8.21.2"
+    "GITALY_SERVER_VERSION": "12.10.6",
+    "GITLAB_PAGES_VERSION": "1.17.0",
+    "GITLAB_SHELL_VERSION": "12.2.0",
+    "GITLAB_WORKHORSE_VERSION": "8.30.1"
   }
 }
diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
@@ -8,9 +8,9 @@ gem 'github-linguist', '~> 7.5', require: 'linguist'
 gem 'gitlab-markup', '~> 1.7.0'
 gem 'activesupport', '6.0.2'
 gem 'rdoc', '~> 6.0'
-gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false
+gem 'gitlab-gollum-lib', '~> 4.2.7.8', require: false
 gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false
-gem 'grpc', '~> 1.24.0'
+gem 'grpc', '~> 1.27.0'
 gem 'sentry-raven', '~> 2.9.0', require: false
 gem 'faraday', '~> 0.12'
 gem 'rbtrace', require: false
@@ -22,7 +22,7 @@ gem 'gitlab-labkit', '~> 0.9.1'
 # This version needs to be in sync with GitLab CE/EE
 gem 'licensee', '~> 8.9.0'
 
-gem 'google-protobuf', '~> 3.8.0'
+gem 'google-protobuf', '~> 3.11.2'
 
 group :development, :test do
   gem 'rubocop', '~> 0.69', require: false

diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
@@ -56,22 +56,17 @@ GEM
       mini_mime (~> 1.0)
       rugged (>= 0.25.1)
     github-markup (1.7.0)
-    gitlab-gollum-lib (4.2.7.7)
+    gitlab-gollum-lib (4.2.7.8)
       gemojione (~> 3.2)
       github-markup (~> 1.6)
-      gollum-grit_adapter (~> 1.0)
+      gitlab-gollum-rugged_adapter (~> 0.4.4.2)
       nokogiri (>= 1.6.1, < 2.0)
       rouge (~> 3.1)
       sanitize (~> 4.6.4)
       stringex (~> 2.6)
     gitlab-gollum-rugged_adapter (0.4.4.2)
       mime-types (>= 1.15)
       rugged (~> 0.25)
-    gitlab-grit (2.8.2)
-      charlock_holmes (~> 0.6)
-      diff-lcs (~> 1.1)
-      mime-types (>= 1.16)
-      posix-spawn (~> 0.3)
     gitlab-labkit (0.9.1)
       actionpack (>= 5.0.0, < 6.1.0)
       activesupport (>= 5.0.0, < 6.1.0)
@@ -80,13 +75,11 @@ GEM
       opentracing (~> 0.4)
       redis (> 3.0.0, < 5.0.0)
     gitlab-markup (1.7.0)
-    gollum-grit_adapter (1.0.1)
-      gitlab-grit (~> 2.7, >= 2.7.1)
-    google-protobuf (3.8.0)
+    google-protobuf (3.11.4)
     googleapis-common-protos-types (1.0.4)
       google-protobuf (~> 3.0)
-    grpc (1.24.0)
-      google-protobuf (~> 3.8)
+    grpc (1.27.0)
+      google-protobuf (~> 3.11)
       googleapis-common-protos-types (~> 1.0)
     hashdiff (0.3.9)
     i18n (1.8.2)
@@ -121,9 +114,8 @@ GEM
     opentracing (0.5.0)
     optimist (3.0.0)
     parallel (1.17.0)
-    parser (2.6.3.0)
+    parser (2.7.0.5)
       ast (~> 2.4.0)
-    posix-spawn (0.3.13)
     proc_to_ast (0.1.0)
       coderay
       parser
@@ -148,7 +140,7 @@ GEM
       optimist (>= 3.0.0)
     rdoc (6.2.0)
     redis (4.1.3)
-    rouge (3.15.0)
+    rouge (3.18.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -196,13 +188,13 @@ GEM
     tzinfo (1.2.6)
       thread_safe (~> 0.1)
     unicode-display_width (1.6.0)
-    unparser (0.4.5)
+    unparser (0.4.7)
       abstract_type (~> 0.0.7)
       adamantium (~> 0.2.0)
       concord (~> 0.1.5)
       diff-lcs (~> 1.3)
       equalizer (~> 0.0.9)
-      parser (~> 2.6.3)
+      parser (>= 2.6.5)
       procto (~> 0.0.2)
     vcr (4.0.0)
     webmock (3.4.2)
@@ -220,12 +212,12 @@ DEPENDENCIES
   factory_bot
   faraday (~> 0.12)
   github-linguist (~> 7.5)
-  gitlab-gollum-lib (~> 4.2.7.7)
+  gitlab-gollum-lib (~> 4.2.7.8)
   gitlab-gollum-rugged_adapter (~> 0.4.4.2)
   gitlab-labkit (~> 0.9.1)
   gitlab-markup (~> 1.7.0)
-  google-protobuf (~> 3.8.0)
-  grpc (~> 1.24.0)
+  google-protobuf (~> 3.11.2)
+  grpc (~> 1.27.0)
   licensee (~> 8.9.0)
   listen (~> 0.5.0)
   pry (~> 0.12.2)

diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -28,14 +28,14 @@ let
     };
   });
 in buildGoPackage rec {
-  version = "12.8.10";
+  version = "12.10.6";
   pname = "gitaly";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitaly";
     rev = "v${version}";
-    sha256 = "1vhnpyggh2ch93i75np11rjzvq8d6pwv2kzvwh7ak3fa02w9qdfs";
+    sha256 = "1gpvay4ah239zp1k8zb9mg9nysb7d0wdr4rf3x9n1a2arfbbldsa";
   };
 
   # Fix a check which assumes that hook files are writeable by their