diff options
author | talyz <kim.lindberger@gmail.com> | 2021-06-09 17:50:45 +0200 |
---|---|---|
committer | talyz <kim.lindberger@gmail.com> | 2021-06-09 17:50:45 +0200 |
commit | 8f16b1629155ad0022bb7830739081532d1bae50 (patch) | |
tree | bdeeea09698f8ce48dc0fd8bbf90cc01f937f603 /pkgs/applications/version-management/gitlab | |
parent | 135ba31fa74c8f40bee9807e076c7b889c094c7c (diff) | |
download | nixpkgs-8f16b1629155ad0022bb7830739081532d1bae50.tar nixpkgs-8f16b1629155ad0022bb7830739081532d1bae50.tar.gz nixpkgs-8f16b1629155ad0022bb7830739081532d1bae50.tar.bz2 nixpkgs-8f16b1629155ad0022bb7830739081532d1bae50.tar.lz nixpkgs-8f16b1629155ad0022bb7830739081532d1bae50.tar.xz nixpkgs-8f16b1629155ad0022bb7830739081532d1bae50.tar.zst nixpkgs-8f16b1629155ad0022bb7830739081532d1bae50.zip |
gitlab: Make sure the FOSS version isn't identified as EE
Diffstat (limited to 'pkgs/applications/version-management/gitlab')
-rw-r--r-- | pkgs/applications/version-management/gitlab/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
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; }; |