public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitlab: 14.1.2 -> 14.2.1

Browse Source 
(cherry picked from commit 99387372d5af951fa7ab1cad970b7bef83b6b91c)
This commit is contained in:
talyz
2021-08-28 16:03:12 +02:00
committed by Yuka
parent 7d46ea4c96
commit 2572e2550a
14 changed files with 263 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/version-management/gitlab/gitaly/Gemfile
+2 -2
View File
@@ -7,7 +7,7 @@ gem 'activesupport', '~> 6.1.3.2'
gem 'rdoc', '~> 6.0'
gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false
gem 'grpc', '~> 1.30.2'
gem 'grpc', '~> 1.38.0'
gem 'sentry-raven', '~> 3.0', require: false
gem 'faraday', '~> 1.0'
gem 'rbtrace', require: false
@@ -29,5 +29,5 @@ group :development, :test do
gem 'factory_bot', require: false
gem 'pry', '~> 0.12.2', require: false
gem 'grpc-tools', '= 1.30.2'
gem 'grpc-tools', '= 1.38.0'
end
pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
+8 -8
View File
@@ -75,12 +75,12 @@ GEM
redis (> 3.0.0, < 5.0.0)
gitlab-markup (1.7.1)
google-protobuf (3.17.3)
googleapis-common-protos-types (1.0.5)
google-protobuf (~> 3.11)
grpc (1.30.2)
google-protobuf (~> 3.12)
googleapis-common-protos-types (1.1.0)
google-protobuf (~> 3.14)
grpc (1.38.0)
google-protobuf (~> 3.15)
googleapis-common-protos-types (~> 1.0)
grpc-tools (1.30.2)
grpc-tools (1.38.0)
i18n (1.8.10)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
@@ -146,7 +146,7 @@ GEM
ffi (>= 1.0.6)
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
rdoc (6.2.0)
rdoc (6.3.2)
redis (4.2.5)
regexp_parser (1.8.1)
reverse_markdown (1.4.0)
@@ -225,8 +225,8 @@ DEPENDENCIES
gitlab-labkit (~> 0.20.0)
gitlab-markup (~> 1.7.1)
google-protobuf (~> 3.17.0)
grpc (~> 1.30.2)
grpc-tools (= 1.30.2)
grpc (~> 1.38.0)
grpc-tools (= 1.38.0)
licensee (~> 9.14.1)
pry (~> 0.12.2)
rbtrace
pkgs/applications/version-management/gitlab/gitaly/default.nix
+3 -13
View File
@@ -9,29 +9,19 @@ let
inherit ruby;
copyGemFiles = true;
gemdir = ./.;
gemset =
let x = import (gemdir + "/gemset.nix");
in x // {
# grpc expects the AR environment variable to contain `ar rpc`. See the
# discussion in nixpkgs #63056.
grpc = x.grpc // {
patches = [ ../fix-grpc-ar.patch ];
dontBuild = false;
};
};
};
in buildGoModule rec {
version = "14.1.2";
version = "14.2.1";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-7OqTOJDQJ/ojHevj/ld8VLjm5ZRQgCGZKchPrAlOSO8=";
sha256 = "sha256-B3NtdS1UcT+nYIdoXs+tW2gnXZ0ew+NiIcCNi5z5fOc=";
};
vendorSha256 = "sha256-/SZJGRUg0qV7RYCUSGDE/HL9CmzGVffhL6BmZ316tU0=";
vendorSha256 = "sha256-WhkNK+V7yXK+le1u8StAKajZIBzVKqV/WIau27oZBXE=";
passthru = {
inherit rubyEnv;
pkgs/applications/version-management/gitlab/gitaly/gemset.nix
+8 -8
View File
@@ -300,10 +300,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1aava1b75n056s24gn7ajrkmm6s3xa3swl62dl5q9apw4marghji";
sha256 = "1949w1lcd3iyiy4n6zgnrhdp78k9khbh2pbkrpkv263bbpmw8llg";
type = "gem";
};
version = "1.0.5";
version = "1.1.0";
};
grpc = {
dependencies = ["google-protobuf" "googleapis-common-protos-types"];
@@ -311,20 +311,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rsglf7ag17n465iff7vlw83pn2rpl4kv9sb1rpf17nx6xpi7yl5";
sha256 = "16qxl287kkf34h71djlf9x3wxmd5ylcm83y2zhnrv81gbrhn8k12";
type = "gem";
};
version = "1.30.2";
version = "1.38.0";
};
grpc-tools = {
groups = ["development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0k9zhsqhamp02ryzgfb4y2bbick151vlhrhj0kqbbz9lyhms0bd4";
sha256 = "0sfbf5s19nfgznlb7m2sfw9l0ppvypj46ijjvq5p35fc6b8by5aq";
type = "gem";
};
version = "1.30.2";
version = "1.38.0";
};
i18n = {
dependencies = ["concurrent-ruby"];
@@ -672,10 +672,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gh7sc3xd4rgl9z90181cq580r1xqn063mmv51wdrhhsrkkw2bi9";
sha256 = "19h5g3g7k7wggy9amfx8b3m09ss7wrakbrva2xnda9sw4chagx6y";
type = "gem";
};
version = "6.2.0";
version = "6.3.2";
};
redis = {
groups = ["default"];