nixos/gitlab: Deduplicate runtime dependency listing
This commit is contained in:
@@ -190,6 +190,16 @@ let
|
|||||||
MALLOC_ARENA_MAX = "2";
|
MALLOC_ARENA_MAX = "2";
|
||||||
} // cfg.extraEnv;
|
} // cfg.extraEnv;
|
||||||
|
|
||||||
|
runtimeDeps = with pkgs; [
|
||||||
|
nodejs
|
||||||
|
gzip
|
||||||
|
git
|
||||||
|
gnutar
|
||||||
|
postgresqlPackage
|
||||||
|
coreutils
|
||||||
|
procps
|
||||||
|
];
|
||||||
|
|
||||||
gitlab-rake = pkgs.stdenv.mkDerivation {
|
gitlab-rake = pkgs.stdenv.mkDerivation {
|
||||||
name = "gitlab-rake";
|
name = "gitlab-rake";
|
||||||
buildInputs = [ pkgs.makeWrapper ];
|
buildInputs = [ pkgs.makeWrapper ];
|
||||||
@@ -199,7 +209,7 @@ let
|
|||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rake $out/bin/gitlab-rake \
|
makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rake $out/bin/gitlab-rake \
|
||||||
${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \
|
${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \
|
||||||
--set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar postgresqlPackage pkgs.coreutils pkgs.procps ]}:$PATH' \
|
--set PATH '${lib.makeBinPath runtimeDeps}:$PATH' \
|
||||||
--set RAKEOPT '-f ${cfg.packages.gitlab}/share/gitlab/Rakefile' \
|
--set RAKEOPT '-f ${cfg.packages.gitlab}/share/gitlab/Rakefile' \
|
||||||
--chdir '${cfg.packages.gitlab}/share/gitlab'
|
--chdir '${cfg.packages.gitlab}/share/gitlab'
|
||||||
'';
|
'';
|
||||||
@@ -214,7 +224,7 @@ let
|
|||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rails $out/bin/gitlab-rails \
|
makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rails $out/bin/gitlab-rails \
|
||||||
${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \
|
${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \
|
||||||
--set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar postgresqlPackage pkgs.coreutils pkgs.procps ]}:$PATH' \
|
--set PATH '${lib.makeBinPath runtimeDeps}:$PATH' \
|
||||||
--chdir '${cfg.packages.gitlab}/share/gitlab'
|
--chdir '${cfg.packages.gitlab}/share/gitlab'
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user