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

2016-11-30 00:34:23 +02:00
parent 56366b5e66 2587611ed5
commit 8a4d6516ee
102 changed files with 417 additions and 361 deletions
--- a/pkgs/servers/web-apps/pump.io/composition.nix
+++ b/pkgs/servers/web-apps/pump.io/composition.nix
@@ -6,11 +6,11 @@

 let
  nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python utillinux runCommand writeTextFile;
+    inherit (pkgs) stdenv utillinux runCommand writeTextFile;
    inherit nodejs;
  };
 in
 import ./node-packages.nix {
  inherit (pkgs) fetchurl fetchgit;
  inherit nodeEnv;
-}
+}