diff options
| author | talyz <kim.lindberger@gmail.com> | 2019-12-23 00:39:33 +0100 |
|---|---|---|
| committer | talyz <kim.lindberger@gmail.com> | 2019-12-23 00:39:33 +0100 |
| commit | ff28cfa6d327d7b1dca4f330b068fa036836a73d (patch) | |
| tree | 39f510469064f66d0587d35993c932bae7a8df2b /pkgs/applications/version-management/gitlab/default.nix | |
| parent | a3c72e66a674b74e3ac0294f294d4ca1579f27fa (diff) | |
gitlab: 12.5.5 -> 12.6.0
Diffstat (limited to 'pkgs/applications/version-management/gitlab/default.nix')
| -rw-r--r-- | pkgs/applications/version-management/gitlab/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 60035990ed02e..fa2154c4472fc 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -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 |