Merge recent master into staging

Hydra nixpkgs: ?compare=1156478
2014-10-23 17:40:41 +02:00
parent 3ecd4dcf72 8d67b707c7
commit 2cf17b0802
271 changed files with 5900 additions and 2711 deletions
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false
-, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, libX11 }:
+, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, libX11, self, callPackage }:

 assert zlibSupport -> zlib != null;

@@ -88,6 +88,7 @@ let
      inherit zlibSupport;
      isPy2 = true;
      isPy27 = true;
+      buildEnv = callPackage ../wrapper.nix { python = self; };
      libPrefix = "python${majorVersion}";
      executable = libPrefix;
      sitePackages = "lib/${libPrefix}/site-packages";