From 9117f2a7d9480ce9b8b5e07b23efd2ea57e97aca Mon Sep 17 00:00:00 2001 From: Kim Lindberger Date: Fri, 3 Sep 2021 13:23:00 +0200 Subject: [PATCH] gitaly: Fix gitaly-git2go binary name (#136569) https://gitlab.com/gitlab-org/gitaly/-/commit/e7f8fe4f6759669c24b2fd216beaab4a477c5b3d 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. (cherry picked from commit d14e9188d1cd88f1b530bf860638c2de27486a6d) --- .../version-management/gitlab/gitaly/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index ec4d02a87fd..21dc5a95e87 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/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,10 @@ in buildGoModule rec { inherit rubyEnv; }; + buildFlagsArray = [ + "-ldflags= -X ${gitaly_package}/internal/version.version=${version} -X ${gitaly_package}/internal/version.moduleVersion=${version}" + ]; + buildFlags = [ "-tags=static,system_libgit2" ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ]; @@ -35,6 +43,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" ];