From 59ad9933ff5065bbc14231d7a66c87bedfa0bad7 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 25 Apr 2018 19:55:12 +0200 Subject: gitaly: 0.81.0 -> 0.95.0 --- .../applications/version-management/gitaly/Gemfile | 12 +++++-- .../version-management/gitaly/Gemfile.lock | 31 +++++++++------- .../version-management/gitaly/default.nix | 4 +-- .../version-management/gitaly/gemset.nix | 42 +++++++++++++++------- 4 files changed, 60 insertions(+), 29 deletions(-) (limited to 'pkgs/applications/version-management') diff --git a/pkgs/applications/version-management/gitaly/Gemfile b/pkgs/applications/version-management/gitaly/Gemfile index 2b95446161b8..b300f27918c5 100644 --- a/pkgs/applications/version-management/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitaly/Gemfile @@ -1,13 +1,19 @@ source 'https://rubygems.org' -gem 'github-linguist', '~> 4.7.0', require: 'linguist' +gem 'rugged', '~> 0.27.0' +gem 'github-linguist', '~> 5.3.3', require: 'linguist' gem 'gitlab-markup', '~> 1.6.2' -gem 'gitaly-proto', '~> 0.83.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.95.0', require: 'gitaly' gem 'activesupport', '~> 5.0.2' gem 'rdoc', '~> 4.2' gem 'gollum-lib', '~> 4.2', require: false gem 'gollum-rugged_adapter', '~> 0.4.4', require: false -gem 'grpc', '~> 1.8.0' +gem 'grpc', '~> 1.10.0' +gem 'sentry-raven', '~> 2.7.2', require: false + +# Detects the open source license the repository includes +# This version needs to be in sync with GitLab CE/EE +gem 'licensee', '~> 8.7.0' # Locked until https://github.com/google/protobuf/issues/4210 is closed gem 'google-protobuf', '= 3.5.1' diff --git a/pkgs/applications/version-management/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitaly/Gemfile.lock index cb53bb10122a..2687952c805b 100644 --- a/pkgs/applications/version-management/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitaly/Gemfile.lock @@ -9,7 +9,7 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) ast (2.3.0) - charlock_holmes (0.7.5) + charlock_holmes (0.7.6) concurrent-ruby (1.0.5) diff-lcs (1.3) escape_utils (1.1.1) @@ -17,14 +17,14 @@ GEM multipart-post (>= 1.2, < 3) gemojione (3.3.0) json - gitaly-proto (0.83.0) + gitaly-proto (0.95.0) google-protobuf (~> 3.1) - grpc (~> 1.0) - github-linguist (4.7.6) - charlock_holmes (~> 0.7.3) + grpc (~> 1.10) + github-linguist (5.3.3) + charlock_holmes (~> 0.7.5) escape_utils (~> 1.1.0) mime-types (>= 1.19) - rugged (>= 0.23.0b) + rugged (>= 0.25.1) github-markup (1.6.1) gitlab-grit (2.8.2) charlock_holmes (~> 0.6) @@ -60,13 +60,15 @@ GEM multi_json (~> 1.11) os (~> 0.9) signet (~> 0.7) - grpc (1.8.7) + grpc (1.10.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) googleauth (>= 0.5.1, < 0.7) i18n (0.8.1) json (2.1.0) jwt (2.1.0) + licensee (8.7.0) + rugged (~> 0.24) little-plugger (1.1.4) logging (2.2.2) little-plugger (~> 1.1) @@ -87,7 +89,7 @@ GEM ast (~> 2.2) posix-spawn (0.3.13) powerpack (0.1.1) - public_suffix (3.0.1) + public_suffix (3.0.2) rainbow (2.2.2) rake rake (12.1.0) @@ -118,9 +120,11 @@ GEM rubocop-rspec (1.17.0) rubocop (>= 0.50.0) ruby-progressbar (1.8.3) - rugged (0.26.0) + rugged (0.27.0) sanitize (2.1.0) nokogiri (>= 1.4.4) + sentry-raven (2.7.2) + faraday (>= 0.7.6, < 1.0) signet (0.8.1) addressable (~> 2.3) faraday (~> 0.9) @@ -137,16 +141,19 @@ PLATFORMS DEPENDENCIES activesupport (~> 5.0.2) - gitaly-proto (~> 0.83.0) - github-linguist (~> 4.7.0) + gitaly-proto (~> 0.95.0) + github-linguist (~> 5.3.3) gitlab-markup (~> 1.6.2) gitlab-styles (~> 2.0.0) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.4) google-protobuf (= 3.5.1) - grpc (~> 1.8.0) + grpc (~> 1.10.0) + licensee (~> 8.7.0) rdoc (~> 4.2) rspec + rugged (~> 0.27.0) + sentry-raven (~> 2.7.2) BUNDLED WITH 1.16.1 diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix index 7a8ba0fda744..32884d0a1cc5 100644 --- a/pkgs/applications/version-management/gitaly/default.nix +++ b/pkgs/applications/version-management/gitaly/default.nix @@ -7,14 +7,14 @@ let gemdir = ./.; }; in buildGoPackage rec { - version = "0.81.0"; + version = "0.95.0"; name = "gitaly-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "01sw5y201xbd21k9r7xmzqiiypb924ac95nqqfhzplqnssa98n9y"; + sha256 = "0kadld8372vj0nm692mcn8j4ngph5gzzrzp8dmb4g26h10nq9k6a"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; diff --git a/pkgs/applications/version-management/gitaly/gemset.nix b/pkgs/applications/version-management/gitaly/gemset.nix index efe786216628..9e6f01e3679d 100644 --- a/pkgs/applications/version-management/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitaly/gemset.nix @@ -28,10 +28,10 @@ charlock_holmes = { source = { remotes = ["https://rubygems.org"]; - sha256 = "09dn56sx0kcw0k8ypiynhnhhiq7ff9m7b57l8wvnxj82wxsjb54y"; + sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5"; type = "gem"; }; - version = "0.7.5"; + version = "0.7.6"; }; concurrent-ruby = { source = { @@ -79,19 +79,19 @@ dependencies = ["google-protobuf" "grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z3asy104q36sshq9zhmgcm32sg8qr8jvy0mi19nakkq7prrkwqv"; + sha256 = "0xwgi3902c89kx0fa176wz289nh67qm9bmx0yykrg5xx1lwk8a2j"; type = "gem"; }; - version = "0.83.0"; + version = "0.95.0"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c8w92yzjfs7pjnm8bdjsgyd1jpisn10fb6dy43381k1k8pxsifd"; + sha256 = "0kgashbqpypv329m63b85ri1dx0gppwd0832hvwh124lk5b19drk"; type = "gem"; }; - version = "4.7.6"; + version = "5.3.3"; }; github-markup = { source = { @@ -184,10 +184,10 @@ dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "02b80pyg4rgkiafyh1jqnfh6xp9abpd1x0a9c2h98f0851scw28b"; + sha256 = "17wvqhjmldxph4li402rvfbyzi5455lzmfr2y19kq9ghrzjyad82"; type = "gem"; }; - version = "1.8.7"; + version = "1.10.0"; }; i18n = { source = { @@ -213,6 +213,15 @@ }; version = "2.1.0"; }; + licensee = { + dependencies = ["rugged"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nhj0vx30llqyb7q52bwmrgy9xpjk3q48k98h0dvq83ym4v216a2"; + type = "gem"; + }; + version = "8.7.0"; + }; little-plugger = { source = { remotes = ["https://rubygems.org"]; @@ -340,10 +349,10 @@ public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0mvzd9ycjw8ydb9qy3daq3kdzqs2vpqvac4dqss6ckk4rfcjc637"; + sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; type = "gem"; }; - version = "3.0.1"; + version = "3.0.2"; }; rainbow = { dependencies = ["rake"]; @@ -460,10 +469,10 @@ rugged = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1rqhg6g2q2av3fb6iyzfd3hfjxvr8hs32w7llil2kbx73crvc2dy"; + sha256 = "0q1krxgd0ql03x8m9m05x5sxizw5sc7lms7rkp44qf45grpdk3v3"; type = "gem"; }; - version = "0.26.0"; + version = "0.27.0"; }; sanitize = { dependencies = ["nokogiri"]; @@ -474,6 +483,15 @@ }; version = "2.1.0"; }; + sentry-raven = { + dependencies = ["faraday"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yf2gysjw6sy1xcp2jw35z9cp83pwx33lq0qyvaqbs969j4993r4"; + type = "gem"; + }; + version = "2.7.2"; + }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; source = { -- cgit 1.4.1