public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #126959 from NixOS/backport-126380-to-release-21.05 

[Backport release-21.05] gitlab: Make sure the FOSS version isn't identified as EE
This commit is contained in:
Kim Lindberger 2021-06-15 18:00:01 +02:00 committed by GitHub
parent e6d907f59e d3d1674b3f
commit ddc012dbea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/misc/gitlab.nix
View File

@ -145,7 +145,7 @@ let
}; };
}; };
gitlabEnv = { gitlabEnv = cfg.packages.gitlab.gitlabEnv // {
HOME = "${cfg.statePath}/home"; HOME = "${cfg.statePath}/home";
PUMA_PATH = "${cfg.statePath}/"; PUMA_PATH = "${cfg.statePath}/";
GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/"; GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/";

2
pkgs/applications/version-management/gitlab/default.nix
View File

@ -131,6 +131,7 @@ stdenv.mkDerivation {
${lib.optionalString (!gitlabEnterprise) '' ${lib.optionalString (!gitlabEnterprise) ''
# Remove all proprietary components # Remove all proprietary components
rm -rf ee rm -rf ee
sed -i 's/-ee//' ./VERSION
''} ''}
# For reasons I don't understand "bundle exec" ignores the # 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_PAGES_VERSION = data.passthru.GITLAB_PAGES_VERSION;
GITLAB_SHELL_VERSION = data.passthru.GITLAB_SHELL_VERSION; GITLAB_SHELL_VERSION = data.passthru.GITLAB_SHELL_VERSION;
GITLAB_WORKHORSE_VERSION = data.passthru.GITLAB_WORKHORSE_VERSION; GITLAB_WORKHORSE_VERSION = data.passthru.GITLAB_WORKHORSE_VERSION;
gitlabEnv.FOSS_ONLY = lib.boolToString (!gitlabEnterprise);
tests = { tests = {
nixos-test-passes = nixosTests.gitlab; nixos-test-passes = nixosTests.gitlab;
}; };