gitlab: 13.6.1 -> 13.7.1 (#107558)

This commit is contained in:
Jeff Slight
2020-12-26 22:06:22 +01:00
committed by GitHub
parent 9e5bb1566e
commit e86efbc48b
14 changed files with 9344 additions and 151 deletions
@@ -4,6 +4,18 @@
, libgit2, openssl, zlib, pcre, http-parser }:
let
# libgit2 was updated to 1.1.0 in nixpkgs, but gitlab doesn't support that yet.
# See https://github.com/NixOS/nixpkgs/pull/106909
libgit = libgit2.overrideAttrs (attrs: rec {
version = "1.0.0";
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
sha256 = "06cwrw93ycpfb5kisnsa5nsy95pm11dbh0vvdjg1jn25h9q5d3vc";
};
});
rubyEnv = bundlerEnv rec {
name = "gitaly-env";
inherit ruby;
@@ -21,17 +33,17 @@ let
};
};
in buildGoModule rec {
version = "13.6.1";
version = "13.7.1";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "02w7pf7l9sr2nk8ky9b0d5b4syx3d9my65h2kzvh2afk7kv35h5y";
sha256 = "1zmjll7sdan8kc7bq5vjaiyqwzlh5zmx1g4ql4dqmnwscpn1avjb";
};
vendorSha256 = "15mx5g2wa93sajbdwh58wcspg0n51d1ciwb7f15d0nm5hspz3w9r";
vendorSha256 = "15i1ajvrff1bfpv3kmb1wm1mmriswwfw2v4cml0nv0zp6a5n5187";
passthru = {
inherit rubyEnv;
@@ -39,7 +51,7 @@ in buildGoModule rec {
buildFlags = [ "-tags=static,system_libgit2" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ];
buildInputs = [ rubyEnv.wrappedRuby libgit openssl zlib pcre http-parser ];
doCheck = false;
postInstall = ''