Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 281cb56a4873
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 34aeed1ca008
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 28, 2019

  1. nixos/gitlab: Package gitlab-rails 

    This utility (particularly `gitlab-rails console`) is packaged by GitLab
Omnibus and is used for diagnostics and maintenance operations.

(cherry picked from commit af909b3)
    @bgamari @flokli
    bgamari authored and flokli committed Mar 28, 2019
    Copy the full SHA
    34aeed1 View commit details
Showing with 15 additions and 1 deletion.
  1. +15 −1 nixos/modules/services/misc/gitlab.nix
16 changes: 15 additions & 1 deletion nixos/modules/services/misc/gitlab.nix
View file
Original file line number Diff line number Diff line change
@@ -160,6 +160,20 @@ let
'';
};

gitlab-rails = pkgs.stdenv.mkDerivation rec {
name = "gitlab-rails";
buildInputs = [ pkgs.makeWrapper ];
dontBuild = true;
unpackPhase = ":";
installPhase = ''
mkdir -p $out/bin
makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rails $out/bin/gitlab-rails \
${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \
--set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar config.services.postgresql.package pkgs.coreutils pkgs.procps ]}:$PATH' \
--run 'cd ${cfg.packages.gitlab}/share/gitlab'
'';
};

smtpSettings = pkgs.writeText "gitlab-smtp-settings.rb" ''
if Rails.env.production?
Rails.application.config.action_mailer.delivery_method = :smtp
@@ -439,7 +453,7 @@ in {

config = mkIf cfg.enable {

environment.systemPackages = [ pkgs.git gitlab-rake cfg.packages.gitlab-shell ];
environment.systemPackages = [ pkgs.git gitlab-rake gitlab-rails cfg.packages.gitlab-shell ];

# Redis is required for the sidekiq queue runner.
services.redis.enable = mkDefault true;