Merge branch 'master' into staging

Hydra nixpkgs: ?compare=1287298
2016-08-14 12:02:12 +02:00
parent 4bceaca196 329589c7fd
commit 4fbb37c517
314 changed files with 6648 additions and 3713 deletions
--- a/pkgs/development/python-modules/pyqt/4.x.nix
+++ b/pkgs/development/python-modules/pyqt/4.x.nix
@@ -28,9 +28,9 @@ stdenv.mkDerivation {
    ${python.executable} configure.py $configureFlags "''${configureFlagsArray[@]}"
  '';

-  buildInputs = [ python pkgconfig makeWrapper qt4 lndir ];
+  buildInputs = [ pkgconfig makeWrapper qt4 lndir ];

-  propagatedBuildInputs = [ pythonPackages.sip_4_16 ];
+  propagatedBuildInputs = [ pythonPackages.sip_4_16 python ];

  postInstall = ''
    for i in $out/bin/*; do
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -20,11 +20,11 @@ in stdenv.mkDerivation {
  };

  buildInputs = [
-    python pkgconfig makeWrapper lndir
+    pkgconfig makeWrapper lndir
    qtbase qtsvg qtwebkit qmakeHook
  ];

-  propagatedBuildInputs = [ sip ];
+  propagatedBuildInputs = [ sip python ];

  configurePhase = ''
    runHook preConfigure