From 2f2cb4e276b85317c96b4a0d2c584d1b2ee1cff4 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 29 Mar 2019 11:52:03 -0400 Subject: [PATCH] nixos/gitlab: Install and fixup vendorised gitlab-shell gitaly now ships its own vendorised version of gitlab-shell. Previously we failed to install this, resulting in https://gitlab.com/gitlab-org/gitlab-ce/issues/59403. (cherry picked from commit 50a4de732684a818e8231ee02d2972af0b690626) --- .../version-management/gitlab/gitaly/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 2981f299e9248c..abdbffc810bc55 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -27,7 +27,14 @@ in buildGoPackage rec { postInstall = '' mkdir -p $ruby - cp -rv $src/ruby/{bin,lib} $ruby + cp -rv $src/ruby/{bin,lib,git-hooks,vendor} $ruby + + # gitlab-shell will try to read its config relative to the source + # code by default which doesn't work in nixos because it's a + # read-only filesystem + substituteInPlace $ruby/vendor/gitlab-shell/lib/gitlab_config.rb --replace \ + "File.join(ROOT_PATH, 'config.yml')" \ + "'/run/gitlab/shell-config.yml'" ''; outputs = [ "bin" "out" "ruby" ];