diff options
author | Ben Gamari <ben@smart-cactus.org> | 2019-03-29 11:52:03 -0400 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2019-03-29 11:53:07 -0400 |
commit | 50a4de732684a818e8231ee02d2972af0b690626 (patch) | |
tree | e49325a2cae44f9d7a1c4ed7beb661f9b17087a7 /pkgs/applications/version-management/gitlab | |
parent | d984875aff3db0da17b36b1b75dd0c3277732060 (diff) | |
download | nixlib-50a4de732684a818e8231ee02d2972af0b690626.tar nixlib-50a4de732684a818e8231ee02d2972af0b690626.tar.gz nixlib-50a4de732684a818e8231ee02d2972af0b690626.tar.bz2 nixlib-50a4de732684a818e8231ee02d2972af0b690626.tar.lz nixlib-50a4de732684a818e8231ee02d2972af0b690626.tar.xz nixlib-50a4de732684a818e8231ee02d2972af0b690626.tar.zst nixlib-50a4de732684a818e8231ee02d2972af0b690626.zip |
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.
Diffstat (limited to 'pkgs/applications/version-management/gitlab')
-rw-r--r-- | pkgs/applications/version-management/gitlab/gitaly/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index d84406e23b3d..d476e7c9038f 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" ]; |