diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/version-management/gitlab/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/version-management/gitlab/default.nix | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/default.nix index 6ac1a9d68616..a386d3e63221 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/default.nix @@ -4,11 +4,26 @@ }: let - rubyEnv = bundlerEnv { + rubyEnv = bundlerEnv rec { name = "gitlab-env-${version}"; inherit ruby; gemdir = ./rubyEnv- + "${if gitlabEnterprise then "ee" else "ce"}"; - groups = [ "default" "unicorn" "ed25519" "metrics" ]; + gemset = + let x = import (gemdir + "/gemset.nix"); + in x // { + # grpc expects the AR environment variable to contain `ar rpc`. See the + # discussion in nixpkgs #63056. + grpc = x.grpc // { + patches = [ ./fix-grpc-ar.patch ]; + dontBuild = false; + }; + }; + groups = [ + "default" "unicorn" "ed25519" "metrics" "development" "puma" "test" + ]; + # N.B. omniauth_oauth2_generic and apollo_upload_server both provide a + # `console` executable. + ignoreCollisions = true; }; flavour = if gitlabEnterprise then "ee" else "ce"; |