gitaly: fix gitlab-shell-config path patching

(cherry picked from commit 7060927)
NixOS · Jun 3, 2020 · 6bd20ee · 6bd20ee
1 parent d181fdf
commit 6bd20ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 323 deletions.
diff --git a/...-management/gitlab/gitaly/0001-Revert-Allow-gitlabshell-config-to-be-passed-in-thro.patch b/...-management/gitlab/gitaly/0001-Revert-Allow-gitlabshell-config-to-be-passed-in-thro.patch
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -33,7 +33,6 @@ in buildGoPackage rec {
   # owner.
   patches = [
     ./fix-executable-check.patch
-    ./0001-Revert-Allow-gitlabshell-config-to-be-passed-in-thro.patch
   ];
 
   goPackagePath = "gitlab.com/gitlab-org/gitaly";
@@ -55,8 +54,8 @@ in buildGoPackage rec {
     # code by default which doesn't work in nixos because it's a
     # read-only filesystem
     substituteInPlace $ruby/gitlab-shell/lib/gitlab_config.rb --replace \
-       "File.join(ROOT_PATH, 'config.yml')" \
-       "'/run/gitlab/shell-config.yml'"
+       "ROOT_PATH.join('config.yml')" \
+       "Pathname.new('/run/gitlab/shell-config.yml')"
   '';
 
   outputs = [ "bin" "out" "ruby" ];