cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

gitaly: use buildGoModule

Browse source
This commit is contained in:
Milan Pässler 2020-11-26 13:41:18 +01:00
parent 9f36dd3d66
commit 0f344cc0db
2 changed files with 4 additions and 2303 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/applications/version-management/gitlab/gitaly/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitLab, fetchFromGitHub, buildGoPackage, ruby, { stdenv, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby,
bundlerEnv, pkgconfig, libgit2_0_27 }: bundlerEnv, pkgconfig, libgit2_0_27 }:
let let
@ -18,7 +18,7 @@ let
}; };
}; };
}; };
in buildGoPackage rec { in buildGoModule rec {
version = "13.6.0"; version = "13.6.0";
pname = "gitaly"; pname = "gitaly";
@ -29,7 +29,7 @@ in buildGoPackage rec {
sha256 = "1b3vjg5sxrg8cfxn1nh8j26h847kxrfnn2chbb5v3ivhp1kp6zh2"; sha256 = "1b3vjg5sxrg8cfxn1nh8j26h847kxrfnn2chbb5v3ivhp1kp6zh2";
}; };
goPackagePath = "gitlab.com/gitlab-org/gitaly"; vendorSha256 = "15mx5g2wa93sajbdwh58wcspg0n51d1ciwb7f15d0nm5hspz3w9r";
passthru = { passthru = {
inherit rubyEnv; inherit rubyEnv;
@ -37,8 +37,7 @@ in buildGoPackage rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ rubyEnv.wrappedRuby libgit2_0_27 ]; buildInputs = [ rubyEnv.wrappedRuby libgit2_0_27 ];
goDeps = ./deps.nix; doCheck = false;
preBuild = "rm -rf go/src/gitlab.com/gitlab-org/labkit/vendor";
postInstall = '' postInstall = ''
mkdir -p $ruby mkdir -p $ruby

2298
pkgs/applications/version-management/gitlab/gitaly/deps.nix generated
View file

File diff suppressed because it is too large Load diff