gitlab: 12.5.5 -> 12.6.0

2019-12-23 00:39:33 +01:00
parent a3c72e66a6
commit ff28cfa6d3
6 changed files with 341 additions and 261 deletions
@@ -43,7 +43,14 @@ let
    pname = "gitlab-assets";
    inherit version src;

-    nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn ];
+    nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn git ];
+
+    # Since version 12.6.0, the rake tasks need the location of git,
+    # so we have to apply the location patches here too.
+    patches = [ ./remove-hardcoded-locations.patch ];
+    # One of the patches uses this variable - if it's unset, execution
+    # of rake tasks fails.
+    GITLAB_LOG_PATH = "log";

    configurePhase = ''
      runHook preConfigure