Merge remote-tracking branch 'upstream/master' into HEAD

2017-09-02 23:29:04 +02:00
parent 891a1662aa d784b83005
commit 0156db2da5
4456 changed files with 84812 additions and 61072 deletions
@@ -490,6 +490,8 @@ in {
      environment.GITLAB_SHELL_CONFIG_PATH = gitlabEnv.GITLAB_SHELL_CONFIG_PATH;
      path = with pkgs; [
        gitAndTools.git
+        gnutar
+        gzip
        openssh
        gitlab-workhorse
      ];