Merge branch 'master' into staging-next

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

@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "python-application";
-  version = "2.0.2";
+  version = "2.7.0";
   disabled = isPy3k;
 
   src = fetchdarcs {
     url = "http://devel.ag-projects.com/repositories/${pname}";
     rev = "release-${version}";
-    sha256 = "19dszv44py8qrq0jcjdycxpa7z2p8hi3ijq9gnqdsazbbjzf9svn";
+    sha256 = "1xpyk2v3naxkjhpyris58dxg1lxbraxgjd6f7w1sah5j0sk7psla";
   };
 
   buildInputs = [ zope_interface ];

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

@@ -23,6 +23,8 @@ buildPythonPackage rec {
     sha256 = "1hambr925ml2v2zcxnmnpi39395gl2928yac4p2kghk9xicymraw";
   };
 
+  dontUseCmakeConfigure = true;
+
   nativeBuildInputs = [ cmake cython ];
   checkInputs = [ pytest ];
   propagatedBuildInputs = [ spglib numpy scipy matplotlib ase netcdf4 ];

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

@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "python-eventlib";
-  version = "0.2.2";
+  version = "0.2.4";
   # Judging from SyntaxError
   disabled = isPy3k;
 
   src = fetchdarcs {
     url = "http://devel.ag-projects.com/repositories/${pname}";
     rev = "release-${version}";
-    sha256 = "1zxhpq8i4jwsk7wmfncqfm211hqikj3hp38cfv509924bi76wak8";
+    sha256 = "1w1axsm6w9bl2smzxmyk4in1lsm8gk8ma6y183m83cpj66aqxg4z";
   };
 
   propagatedBuildInputs = [ greenlet ];

pkgs/development/python-modules/iso-639/default.nix

@@ -1,4 +1,4 @@
-{ lib, fetchPypi, buildPythonPackage }:
+{ lib, fetchPypi, buildPythonPackage, setuptools }:
 
 buildPythonPackage rec {
   pname = "iso-639";
@@ -9,6 +9,8 @@ buildPythonPackage rec {
     sha256 = "dc9cd4b880b898d774c47fe9775167404af8a85dd889d58f9008035109acce49";
   };
 
+  propagatedBuildInputs = [ setuptools ];
+
   meta = with lib; {
     homepage = https://github.com/noumar/iso639;
     description = "ISO 639 library for Python";

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

@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, setuptools
 , nose
 , pyyaml
 }:
@@ -14,6 +15,8 @@ buildPythonPackage rec {
     sha256 = "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a";
   };
 
+  propagatedBuildInputs = [ setuptools ];
+
   checkInputs = [ nose pyyaml ];
 
   meta = {

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

@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "python-msrplib";
-  version = "0.19";
+  version = "0.19.2";
 
   src = fetchdarcs {
     url = "http://devel.ag-projects.com/repositories/${pname}";
     rev = "release-${version}";
-    sha256 = "0jqvvssbwzq7bwqn3wrjfnpj8zb558mynn2visnlrcma6b57yhwd";
+    sha256 = "0d0krwv4hhspjgppnvh0iz51bvdbz23cjasgrppip7x8b00514gz";
   };
 
   propagatedBuildInputs = [ eventlib application gnutls ];

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

@@ -3,6 +3,7 @@
 , fetchPypi
 , nose
 , decorator
+, setuptools
 }:
 
 buildPythonPackage rec {
@@ -17,7 +18,7 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ nose ];
-  propagatedBuildInputs = [ decorator ];
+  propagatedBuildInputs = [ decorator setuptools ];
 
   meta = {
     homepage = "https://networkx.github.io/";

pkgs/development/python-modules/scikitlearn/0.20.nix

@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "scikit-learn";
-  version = "0.20.3";
+  version = "0.20.4";
   # UnboundLocalError: local variable 'message' referenced before assignment
   disabled = stdenv.isi686;  # https://github.com/scikit-learn/scikit-learn/issues/5534
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c503802a81de18b8b4d40d069f5e363795ee44b1605f38bc104160ca3bfe2c41";
+    sha256 = "1z3w2c50dwwa297j88pr16pyrjysagsvdj7vrlq40q8777rs7a6z";
   };
 
   buildInputs = [ pillow gfortran glibcLocales ];

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

@@ -30,6 +30,9 @@ buildPythonPackage rec {
 
   checkInputs = [ nose mock PasteDeploy wsgiproxy2 pyquery ];
 
+  # Some of the tests use localhost networking.
+  __darwinAllowLocalNetworking = true;
+
   meta = with stdenv.lib; {
     description = "Helper to test WSGI applications";
     homepage = https://webtest.readthedocs.org/en/latest/;

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

@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "python-xcaplib";
-  version = "1.2.0";
+  version = "1.2.1";
   disabled = isPy3k;
 
   src = fetchdarcs {
     url = "http://devel.ag-projects.com/repositories/${pname}";
     rev = "release-${version}";
-    sha256 = "0vna5r4ihv7z1yx6r93954jqskcxky77znzy1m9dg9vna1dgwfdn";
+    sha256 = "15ww8f0a9zh37mypw5s4q1qk44cwf7jlhc9q1z4vjlpvnzimg54v";
   };
 
   propagatedBuildInputs = [ eventlib application ];