gitlab-ee: Add ee rubyEnv, fixes regression introduced by 11.3.0 in #…

…45574
NixOS · Oct 8, 2018 · 0083ca1 · 0083ca1
1 parent d837338
commit 0083ca1
Show file tree

Hide file tree

Showing 7 changed files with 5,382 additions and 1 deletion.
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
@@ -7,7 +7,7 @@ let
   rubyEnv = bundlerEnv {
     name = "gitlab-env-${version}";
     inherit ruby;
-    gemdir = ./.;
+    gemdir = ./rubyEnv- + "${if gitlabEnterprise then "ee" else "ce"}";
     groups = [ "default" "unicorn" "ed25519" "metrics" ];
   };
 

diff --git a/...cations/version-management/gitlab/Gemfile → ...sion-management/gitlab/rubyEnv-ce/Gemfile b/...cations/version-management/gitlab/Gemfile → ...sion-management/gitlab/rubyEnv-ce/Gemfile
diff --git a/...ns/version-management/gitlab/Gemfile.lock → ...management/gitlab/rubyEnv-ce/Gemfile.lock b/...ns/version-management/gitlab/Gemfile.lock → ...management/gitlab/rubyEnv-ce/Gemfile.lock
diff --git a/...ions/version-management/gitlab/gemset.nix → ...n-management/gitlab/rubyEnv-ce/gemset.nix b/...ions/version-management/gitlab/gemset.nix → ...n-management/gitlab/rubyEnv-ce/gemset.nix