diff --git a/pkgs/applications/version-management/gitaly/Gemfile b/pkgs/applications/version-management/gitaly/Gemfile
index 88b7120d6f9a..7e8f9f2b2557 100644
--- a/pkgs/applications/version-management/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitaly/Gemfile
@@ -3,3 +3,7 @@ source 'https://rubygems.org'
gem 'github-linguist', '~> 4.7.0', require: 'linguist'
gem 'gitaly-proto', '~> 0.37.0', require: 'gitaly'
gem 'activesupport'
+
+group :development, :test do
+ gem 'gitlab-styles', '~> 2.0.0', require: false
+end
diff --git a/pkgs/applications/version-management/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitaly/Gemfile.lock
index 68433fc6878e..5ea14855b97f 100644
--- a/pkgs/applications/version-management/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitaly/Gemfile.lock
@@ -8,6 +8,7 @@ GEM
tzinfo (~> 1.1)
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
+ ast (2.3.0)
charlock_holmes (0.7.5)
concurrent-ruby (1.0.5)
escape_utils (1.1.1)
@@ -21,6 +22,10 @@ GEM
escape_utils (~> 1.1.0)
mime-types (>= 1.19)
rugged (>= 0.23.0b)
+ gitlab-styles (2.0.0)
+ rubocop (~> 0.49)
+ rubocop-gitlab-security (~> 0.1.0)
+ rubocop-rspec (~> 1.15)
google-protobuf (3.4.0.2)
googleauth (0.5.3)
faraday (~> 0.12)
@@ -47,7 +52,26 @@ GEM
multi_json (1.12.1)
multipart-post (2.0.0)
os (0.9.6)
+ parallel (1.12.0)
+ parser (2.4.0.0)
+ ast (~> 2.2)
+ powerpack (0.1.1)
public_suffix (2.0.5)
+ rainbow (2.2.2)
+ rake
+ rake (12.1.0)
+ rubocop (0.50.0)
+ parallel (~> 1.10)
+ parser (>= 2.3.3.1, < 3.0)
+ powerpack (~> 0.1)
+ rainbow (>= 2.2.2, < 3.0)
+ ruby-progressbar (~> 1.7)
+ unicode-display_width (~> 1.0, >= 1.0.1)
+ rubocop-gitlab-security (0.1.0)
+ rubocop (>= 0.47.1)
+ rubocop-rspec (1.17.0)
+ rubocop (>= 0.50.0)
+ ruby-progressbar (1.8.3)
rugged (0.26.0)
signet (0.7.3)
addressable (~> 2.3)
@@ -57,6 +81,7 @@ GEM
thread_safe (0.3.6)
tzinfo (1.2.2)
thread_safe (~> 0.1)
+ unicode-display_width (1.3.0)
PLATFORMS
ruby
@@ -65,6 +90,7 @@ DEPENDENCIES
activesupport
gitaly-proto (~> 0.37.0)
github-linguist (~> 4.7.0)
+ gitlab-styles (~> 2.0.0)
BUNDLED WITH
1.15.4
diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix
index ba8831d370c7..63e5758107f7 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.38.0";
+ version = "0.43.1";
name = "gitaly-${version}";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "02s5gjxbjvm990n4h5zkyqj71a9mp4yj83hfl8mma0g7gx00icsf";
+ sha256 = "19ggfc5nwv8q1wq739ab8qdfdngpi33431dgfa9593p6ad7v6hyq";
};
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 6dc3eb596665..57480f3f337e 100644
--- a/pkgs/applications/version-management/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitaly/gemset.nix
@@ -17,6 +17,14 @@
};
version = "2.5.1";
};
+ ast = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0pp82blr5fakdk27d1d21xq9zchzb6vmyb1zcsl520s3ygvprn8m";
+ type = "gem";
+ };
+ version = "2.3.0";
+ };
charlock_holmes = {
source = {
remotes = ["https://rubygems.org"];
@@ -68,6 +76,15 @@
};
version = "4.7.6";
};
+ gitlab-styles = {
+ dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1k8xrkjx8rcny8p0gsp18wskvn1qbw4rfgdp1f6x0p4xp6dlhjf4";
+ type = "gem";
+ };
+ version = "2.0.0";
+ };
google-protobuf = {
source = {
remotes = ["https://rubygems.org"];
@@ -184,6 +201,31 @@
};
version = "0.9.6";
};
+ parallel = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0qv2yj4sxr36ga6xdxvbq9h05hn10bwcbkqv6j6q1fiixhsdnnzd";
+ type = "gem";
+ };
+ version = "1.12.0";
+ };
+ parser = {
+ dependencies = ["ast"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "130rfk8a2ws2fyq52hmi1n0xakylw39wv4x1qhai4z17x2b0k9cq";
+ type = "gem";
+ };
+ version = "2.4.0.0";
+ };
+ powerpack = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43";
+ type = "gem";
+ };
+ version = "0.1.1";
+ };
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
@@ -192,6 +234,58 @@
};
version = "2.0.5";
};
+ rainbow = {
+ dependencies = ["rake"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "08w2ghc5nv0kcq5b257h7dwjzjz1pqcavajfdx2xjyxqsvh2y34w";
+ type = "gem";
+ };
+ version = "2.2.2";
+ };
+ rake = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0mfqgpp3m69s5v1rd51lfh5qpjwyia5p4rg337pw8c8wzm6pgfsw";
+ type = "gem";
+ };
+ version = "12.1.0";
+ };
+ rubocop = {
+ dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1hpd7zcv4y9y750wj630abvmcjwv39dsrj1fjff60ik7gfri0xlz";
+ type = "gem";
+ };
+ version = "0.50.0";
+ };
+ rubocop-gitlab-security = {
+ dependencies = ["rubocop"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0aw9qmyc6xj6fi0jxp8m4apk358rd91z492ragn6jp4rghkqj5cy";
+ type = "gem";
+ };
+ version = "0.1.0";
+ };
+ rubocop-rspec = {
+ dependencies = ["rubocop"];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1hf48ng67yswvshmv4cyysj1rs1z3fnvlycr50jdcgwlynpyxkhs";
+ type = "gem";
+ };
+ version = "1.17.0";
+ };
+ ruby-progressbar = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "029kv0q3kfq53rjyak4ypn7196l8z4hflfmv4p5787n78z7baiqf";
+ type = "gem";
+ };
+ version = "1.8.3";
+ };
rugged = {
source = {
remotes = ["https://rubygems.org"];
@@ -226,4 +320,12 @@
};
version = "1.2.2";
};
+ unicode-display_width = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "12pi0gwqdnbx1lv5136v3vyr0img9wr0kxcn4wn54ipq4y41zxq8";
+ type = "gem";
+ };
+ version = "1.3.0";
+ };
}
\ No newline at end of file