Merge pull request #126380 from talyz/gitlab-foss
gitlab: Make sure the FOSS version isn't identified as EE
This commit is contained in:
commit
084456aecd
|
@ -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/";
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue