Merge branch 'staging'

There are some Darwin regressions and a mysterious Lisp issue,
but also a security update of curl...

pkgs/development/python-modules/backports_functools_lru_cache/default.nix

@@ -2,9 +2,10 @@
 , buildPythonPackage
 , fetchPypi
 , setuptools_scm
+, pythonOlder
 }:
 
-buildPythonPackage rec {
+if !(pythonOlder "3.3") then null else buildPythonPackage rec {
   pname = "backports.functools_lru_cache";
   version = "1.4";
 

pkgs/development/python-modules/backports_lzma/default.nix

@@ -4,9 +4,10 @@
 , isPy3k
 , lzma
 , python
+, pythonOlder
 }:
 
-buildPythonPackage rec {
+if !(pythonOlder "3.3") then null else buildPythonPackage rec {
   pname = "backports.lzma";
   version = "0.0.9";
 

pkgs/development/python-modules/bootstrapped-pip/default.nix

@@ -46,7 +46,8 @@ in stdenv.mkDerivation rec {
     mkdir -p $out/bin
   '';
 
-  buildInputs = [ python makeWrapper unzip ];
+  nativeBuildInputs = [ makeWrapper unzip ];
+  buildInputs = [ python ];
 
   installPhase = ''
 

pkgs/development/python-modules/matplotlib/default.nix

@@ -8,6 +8,7 @@
 , enableQt ? false, pyqt4
 , libcxx
 , Cocoa
+, pythonOlder
 }:
 
 assert enableGhostscript -> ghostscript != null;
@@ -39,8 +40,8 @@ buildPythonPackage rec {
 
   propagatedBuildInputs =
     [ cycler dateutil nose numpy pyparsing tornado freetype
-      libpng pkgconfig mock pytz backports_functools_lru_cache
-    ]
+      libpng pkgconfig mock pytz ]
+    ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache
     ++ stdenv.lib.optional enableGtk2 pygtk
     ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ]
     ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]

pkgs/development/python-modules/setuptools/default.nix

@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
     sha256 = "6501fc32f505ec5b3ed36ec65ba48f1b975f52cf2ea101c7b73a08583fd12f75";
   };
 
-  buildInputs = [ python wrapPython unzip ];
+  nativeBuildInputs = [ unzip wrapPython ];
+  buildInputs = [ python ];
   doCheck = false;  # requires pytest
   installPhase = ''
       dst=$out/${python.sitePackages}

pkgs/development/python-modules/tornado/default.nix

@@ -6,6 +6,7 @@
 , backports_ssl_match_hostname
 , certifi
 , singledispatch
+, pythonOlder
 }:
 
 buildPythonPackage rec {
@@ -13,7 +14,8 @@ buildPythonPackage rec {
   version = "4.5.3";
   name = "${pname}-${version}";
 
-  propagatedBuildInputs = [ backports_abc backports_ssl_match_hostname certifi singledispatch ];
+  propagatedBuildInputs = [ backports_abc  certifi singledispatch ]
+    ++ lib.optional (pythonOlder "3.5") backports_ssl_match_hostname;
 
   # We specify the name of the test files to prevent
   # https://github.com/NixOS/nixpkgs/issues/14634