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

Merge pull request #136572 from yu-re-ka/feature/gitaly-git2go-name-backport

Browse Source 
[21.05] gitaly: Fix gitaly-git2go binary name
This commit is contained in:
Kim Lindberger 2021-09-03 16:28:26 +02:00 committed by GitHub
commit 355b6d3675
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,9 +10,13 @@ let
copyGemFiles = true; copyGemFiles = true;
gemdir = ./.; gemdir = ./.;
}; };
in buildGoModule rec {
version = "14.2.1"; version = "14.2.1";
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
in
buildGoModule {
pname = "gitaly"; pname = "gitaly";
inherit version;
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
@ -27,6 +31,10 @@ in buildGoModule rec {
inherit rubyEnv; inherit rubyEnv;
}; };
buildFlagsArray = [
"-ldflags= -X ${gitaly_package}/internal/version.version=${version} -X ${gitaly_package}/internal/version.moduleVersion=${version}"
];
buildFlags = [ "-tags=static,system_libgit2" ]; buildFlags = [ "-tags=static,system_libgit2" ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ]; buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ];
@ -35,6 +43,7 @@ in buildGoModule rec {
postInstall = '' postInstall = ''
mkdir -p $ruby mkdir -p $ruby
cp -rv $src/ruby/{bin,lib,proto,git-hooks} $ruby cp -rv $src/ruby/{bin,lib,proto,git-hooks} $ruby
mv $out/bin/gitaly-git2go $out/bin/gitaly-git2go-${version}
''; '';
outputs = [ "out" "ruby" ]; outputs = [ "out" "ruby" ];