nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 15:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

gitaly: 1.83.0 -> 12.8.1

Browse Source 
In order to build gitaly, this locally overrides the version of
libgit2, since gitaly is not compatible with the latest version.
This commit is contained in:
talyz 2020-03-02 21:21:35 +01:00 committed by Milan
parent 7d8a2004cf
commit facef28665
5 changed files with 85 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/version-management/gitlab/gitaly/Gemfile
View File

@ -6,7 +6,7 @@ gem 'bundler', '>= 1.17.3'
gem 'rugged', '~> 0.28'
gem 'github-linguist', '~> 7.5', require: 'linguist'
gem 'gitlab-markup', '~> 1.7.0'
gem 'activesupport', '~> 5.2.3'
gem 'activesupport', '6.0.2'
gem 'rdoc', '~> 6.0'
gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false
@ -16,7 +16,7 @@ gem 'faraday', '~> 0.12'
gem 'rbtrace', require: false
# Labkit provides observability functionality
gem 'gitlab-labkit', '~> 0.5.0'
gem 'gitlab-labkit', '~> 0.9.1'
# Detects the open source license the repository includes
# This version needs to be in sync with GitLab CE/EE

46
pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
View File

@ -2,24 +2,25 @@ GEM
remote: https://rubygems.org/
specs:
abstract_type (0.0.7)
actionpack (5.2.3)
actionview (= 5.2.3)
activesupport (= 5.2.3)
actionpack (6.0.2)
actionview (= 6.0.2)
activesupport (= 6.0.2)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.3)
activesupport (= 5.2.3)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (6.0.2)
activesupport (= 6.0.2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activesupport (5.2.3)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activesupport (6.0.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2)
adamantium (0.2.0)
ice_nine (~> 0.11.0)
memoizable (~> 0.4.0)
@ -27,7 +28,7 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
ast (2.4.0)
binding_ninja (0.2.3)
builder (3.2.3)
builder (3.2.4)
charlock_holmes (0.7.6)
coderay (1.1.2)
concord (0.1.5)
@ -36,11 +37,11 @@ GEM
concurrent-ruby (1.1.5)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.5)
crass (1.0.6)
diff-lcs (1.3)
docile (1.3.2)
equalizer (0.0.11)
erubi (1.8.0)
erubi (1.9.0)
escape_utils (1.2.1)
factory_bot (5.0.2)
activesupport (>= 4.2.0)
@ -71,9 +72,9 @@ GEM
diff-lcs (~> 1.1)
mime-types (>= 1.16)
posix-spawn (~> 0.3)
gitlab-labkit (0.5.2)
actionpack (~> 5)
activesupport (~> 5)
gitlab-labkit (0.9.1)
actionpack (>= 5.0.0, < 6.1.0)
activesupport (>= 5.0.0, < 6.1.0)
grpc (~> 1.19)
jaeger-client (~> 0.10)
opentracing (~> 0.4)
@ -88,7 +89,7 @@ GEM
google-protobuf (~> 3.8)
googleapis-common-protos-types (~> 1.0)
hashdiff (0.3.9)
i18n (1.6.0)
i18n (1.8.2)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
jaeger-client (0.10.0)
@ -110,7 +111,7 @@ GEM
mime-types-data (3.2019.0331)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.11.3)
minitest (5.14.0)
msgpack (1.3.1)
multipart-post (2.0.0)
nokogiri (1.10.7)
@ -132,7 +133,7 @@ GEM
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (3.0.3)
rack (2.0.7)
rack (2.1.2)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails-dom-testing (2.0.3)
@ -146,8 +147,8 @@ GEM
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
rdoc (6.2.0)
redis (4.1.2)
rouge (3.11.0)
redis (4.1.3)
rouge (3.15.0)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
@ -192,7 +193,7 @@ GEM
thread_safe (0.3.6)
thrift (0.11.0.0)
timecop (0.9.1)
tzinfo (1.2.5)
tzinfo (1.2.6)
thread_safe (~> 0.1)
unicode-display_width (1.6.0)
unparser (0.4.5)
@ -208,19 +209,20 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
zeitwerk (2.2.2)
PLATFORMS
ruby
DEPENDENCIES
activesupport (~> 5.2.3)
activesupport (= 6.0.2)
bundler (>= 1.17.3)
factory_bot
faraday (~> 0.12)
github-linguist (~> 7.5)
gitlab-gollum-lib (~> 4.2.7.7)
gitlab-gollum-rugged_adapter (~> 0.4.4.2)
gitlab-labkit (~> 0.5.0)
gitlab-labkit (~> 0.9.1)
gitlab-markup (~> 1.7.0)
google-protobuf (~> 3.8.0)
grpc (~> 1.24.0)

18
pkgs/applications/version-management/gitlab/gitaly/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchFromGitLab, buildGoPackage, ruby, bundlerEnv, pkgconfig, libgit2 }:
{ stdenv, fetchFromGitLab, fetchFromGitHub, buildGoPackage, ruby,
bundlerEnv, pkgconfig, libgit2 }:
let
rubyEnv = bundlerEnv rec {
@ -16,15 +17,24 @@ let
};
};
};
libgit2_0_27 = libgit2.overrideAttrs (oldAttrs: rec {
version = "0.27.8";
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
sha256 = "0wzx8nkyy9m7mx6cks58chjd4289vjsw97mxm9w6f1ggqsfnmbr9";
};
});
in buildGoPackage rec {
version = "1.83.0";
version = "12.8.1";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "1vwa38mhnxyncrrvp45d8s6fg94xaq8c71d7qh9ip77db0ak45kh";
sha256 = "0sjkh0j36dpakqmq7l5gd1ydmx1kxgij53bjvvn37r19liqdijnx";
};
# Fix a check which assumes that hook files are writeable by their
@ -38,7 +48,7 @@ in buildGoPackage rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ rubyEnv.wrappedRuby libgit2 ];
buildInputs = [ rubyEnv.wrappedRuby libgit2_0_27 ];
goDeps = ./deps.nix;
preBuild = "rm -r go/src/gitlab.com/gitlab-org/labkit/vendor";

8
pkgs/applications/version-management/gitlab/gitaly/deps.nix generated
View File

@ -1319,8 +1319,8 @@
fetch = {
type = "git";
url = "https://github.com/ugorji/go";
rev = "d75b2dcb6bc8";
sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps";
rev = "v1.1.4";
sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w";
};
}
{
@ -1670,8 +1670,8 @@
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
rev = "v2.2.5";
sha256 = "08smz8dfyxp02ha74my9iszqa5qzgl3ksi28ilyp8lqipssiq6fg";
rev = "v2.2.8";
sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw";
};
}
{

68
pkgs/applications/version-management/gitlab/gitaly/gemset.nix
View File

@ -13,10 +13,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1s2iay17i2k0xx36cmnpbrmr5w6x70jk7fq1d8w70xcdw5chm0w1";
sha256 = "0zg96vjjw1kbli6nk6cyk64zfh4lgpl7fqx38ncbgfacl4dq7y0b";
type = "gem";
};
version = "5.2.3";
version = "6.0.2";
};
actionview = {
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@ -24,21 +24,21 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1v49rgf8305grqf6gq7qa47qhamr369igyy0giycz60x86afyr4h";
sha256 = "1bfh9z3n98c76c6jdp6avh75wsckxyp74r59hmgnqdhfznbkppv4";
type = "gem";
};
version = "5.2.3";
version = "6.0.2";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8";
sha256 = "1brlp5pmawb2hqdybjb732zxxkamcmis6px3wyh09rjlc0gqnzzz";
type = "gem";
};
version = "5.2.3";
version = "6.0.2";
};
adamantium = {
dependencies = ["ice_nine" "memoizable"];
@ -83,10 +83,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1";
sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr";
type = "gem";
};
version = "3.2.3";
version = "3.2.4";
};
charlock_holmes = {
source = {
@ -137,10 +137,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "030sc98kjrb36rh7g21qsbdfxrj6knsjkx0mn3b7gig8zknwhp2f";
sha256 = "0pfl5c0pyqaparxaqxi6s4gfl21bdldwiawrc0aknyvflli60lfw";
type = "gem";
};
version = "1.0.5";
version = "1.0.6";
};
diff-lcs = {
source = {
@ -173,10 +173,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kagnf6ziahj0d781s6ryy6fwqwa3ad4xbzzj84p9m4nv4c2jir1";
sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x";
type = "gem";
};
version = "1.8.0";
version = "1.9.0";
};
escape_utils = {
source = {
@ -283,10 +283,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1j06gl4ksd83rycg3fb46bb77iw74i1ivs5li6pyf5klrxjq8k3h";
sha256 = "1s1cgnnzlnfglsh5r0iihgvyasa2zbqkyrrnbxshvnkddb10i94z";
type = "gem";
};
version = "0.5.2";
version = "0.9.1";
};
gitlab-markup = {
groups = ["default"];
@ -355,10 +355,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl";
sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm";
type = "gem";
};
version = "1.6.0";
version = "1.8.2";
};
ice_nine = {
source = {
@ -482,12 +482,14 @@
version = "2.4.0";
};
minitest = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz";
type = "gem";
};
version = "5.11.3";
version = "5.14.0";
};
msgpack = {
groups = ["default"];
@ -613,10 +615,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i";
sha256 = "04qa0ry26hxfwkmvhi0fjlvbm8irzg66ahnpx2pp3bl6qbdc0i8w";
type = "gem";
};
version = "2.0.7";
version = "2.1.2";
};
rack-test = {
dependencies = ["rack"];
@ -683,20 +685,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mymdx7s5sr4mablklaipz679ckczsiigswm1g2v5mc93yj5amw3";
sha256 = "08v2y91q1pmv12g9zsvwj66w3s8j9d82yrmxgyv4y4gz380j3wyh";
type = "gem";
};
version = "4.1.2";
version = "4.1.3";
};
rouge = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zsyv6abqrk7lpql5f1ja4m88bfy9qndi8xykpss6cpvjdmi3ydb";
sha256 = "1ipgdir89a6pp1zscl2fkb99pppa7c513pk4wvis157bn8p9hlrx";
type = "gem";
};
version = "3.11.0";
version = "3.15.0";
};
rspec = {
dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
@ -881,12 +883,14 @@
};
tzinfo = {
dependencies = ["thread_safe"];
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp";
type = "gem";
};
version = "1.2.5";
version = "1.2.6";
};
unicode-display_width = {
groups = ["default" "development" "test"];
@ -926,4 +930,14 @@
};
version = "3.4.2";
};
zeitwerk = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jywi63w1m2b2w9fj9rjb9n3imf6p5bfijfmml1xzdnsrdrjz0x1";
type = "gem";
};
version = "2.2.2";
};
}