diff options
| -rw-r--r-- | nixos/modules/services/misc/gitlab.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/version-management/gitlab/default.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 253d87537cf..b4fc4bf4b2c 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -145,7 +145,7 @@ let }; }; - gitlabEnv = { + gitlabEnv = cfg.packages.gitlab.gitlabEnv // { HOME = "${cfg.statePath}/home"; PUMA_PATH = "${cfg.statePath}/"; GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/"; diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 0e6aaa5912c..225b9f6c0cb 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -131,6 +131,7 @@ stdenv.mkDerivation { ${lib.optionalString (!gitlabEnterprise) '' # Remove all proprietary components rm -rf ee + sed -i 's/-ee//' ./VERSION ''} # For reasons I don't understand "bundle exec" ignores the @@ -181,6 +182,7 @@ stdenv.mkDerivation { GITLAB_PAGES_VERSION = data.passthru.GITLAB_PAGES_VERSION; GITLAB_SHELL_VERSION = data.passthru.GITLAB_SHELL_VERSION; GITLAB_WORKHORSE_VERSION = data.passthru.GITLAB_WORKHORSE_VERSION; + gitlabEnv.FOSS_ONLY = lib.boolToString (!gitlabEnterprise); tests = { nixos-test-passes = nixosTests.gitlab; }; |