gitaly: Fix gitaly-git2go binary name (#136569)

e7f8fe4f67
changed the binary name to always end with its module version. This
makes sure gitaly's internal version references are set to the package
version and renames the binary, postfixing it with the package
version.
launchpad/nixpkgs/master
Kim Lindberger 3 years ago committed by GitHub
parent 0a15fd6d74
commit d14e9188d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      pkgs/applications/version-management/gitlab/gitaly/default.nix

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

Loading…
Cancel
Save