diff options
| author | talyz <kim.lindberger@gmail.com> | 2022-10-04 14:32:25 +0200 |
|---|---|---|
| committer | Yureka <yuka@yuka.dev> | 2022-10-09 08:12:19 +0200 |
| commit | bee6e1dafa55df37ac4a6199cd8b0c00ac73ed07 (patch) | |
| tree | b45aaa8f7984d48175ffa896ce28fff6e1cbdb4b /nixos | |
| parent | 0211edd1ff005575c5b2061f25d73fccb6271252 (diff) | |
| download | nixpkgs-bee6e1dafa55df37ac4a6199cd8b0c00ac73ed07.tar nixpkgs-bee6e1dafa55df37ac4a6199cd8b0c00ac73ed07.tar.gz nixpkgs-bee6e1dafa55df37ac4a6199cd8b0c00ac73ed07.tar.bz2 nixpkgs-bee6e1dafa55df37ac4a6199cd8b0c00ac73ed07.tar.lz nixpkgs-bee6e1dafa55df37ac4a6199cd8b0c00ac73ed07.tar.xz nixpkgs-bee6e1dafa55df37ac4a6199cd8b0c00ac73ed07.tar.zst nixpkgs-bee6e1dafa55df37ac4a6199cd8b0c00ac73ed07.zip | |
nixos/gitlab: Deduplicate runtime dependency listing
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/gitlab.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 77039baa4e2..34c20cb83b7 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -190,6 +190,16 @@ let MALLOC_ARENA_MAX = "2"; } // cfg.extraEnv; + runtimeDeps = with pkgs; [ + nodejs + gzip + git + gnutar + postgresqlPackage + coreutils + procps + ]; + gitlab-rake = pkgs.stdenv.mkDerivation { name = "gitlab-rake"; buildInputs = [ pkgs.makeWrapper ]; @@ -199,7 +209,7 @@ let mkdir -p $out/bin makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rake $out/bin/gitlab-rake \ ${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' \ --chdir '${cfg.packages.gitlab}/share/gitlab' ''; @@ -214,7 +224,7 @@ let 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 postgresqlPackage pkgs.coreutils pkgs.procps ]}:$PATH' \ + --set PATH '${lib.makeBinPath runtimeDeps}:$PATH' \ --chdir '${cfg.packages.gitlab}/share/gitlab' ''; }; |