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

Conflicts:
	pkgs/build-support/fetchbower/default.nix
	pkgs/build-support/fetchdarcs/default.nix
	pkgs/build-support/fetchgx/default.nix
	pkgs/development/python-modules/botocore/default.nix
	pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
	pkgs/tools/admin/awscli/default.nix

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

@@ -12,11 +12,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "botocore";
-  version = "1.8.23";
+  version = "1.8.26";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cc5df29da7c3f523edfc6086e082204b80945b5c73bf82a181018b7f1a5d6975";
+    sha256 = "09j3b80l401hwc3ha0s2c2qq6z45x846an09ybc9y8cb1ky0kdlv";
   };
 
   propagatedBuildInputs = [

pkgs/development/python-modules/django/2_0.nix

@@ -7,13 +7,13 @@
 buildPythonPackage rec {
   pname = "Django";
   name = "${pname}-${version}";
-  version = "2.0";
+  version = "2.0.1";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0iqzqd1jrc4gg5qygxxzbddc8xzk85j0gikk5g9wpy3z98fqa54n";
+    sha256 = "0by1gswkrzxn594fa26llkzsc410999fq8s0b5d1598jwi5q0syr";
   };
 
   patches = stdenv.lib.optionals withGdal [

pkgs/development/python-modules/elasticsearch-curator/default.nix

@@ -16,7 +16,6 @@
 buildPythonPackage rec {
   pname   = "elasticsearch-curator";
   version = "5.4.1";
-  name    = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;

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

@@ -0,0 +1,29 @@
+{ buildPythonPackage
+, fetchPypi
+, urllib3, requests
+, nosexcover, mock
+, stdenv
+}:
+
+buildPythonPackage (rec {
+  pname = "elasticsearch";
+  version = "6.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "029q603g95fzkh87xkbxxmjfq5s9xkr9y27nfik6d4prsl0zxmlz";
+  };
+
+  # Check is disabled because running them destroy the content of the local cluster!
+  # https://github.com/elasticsearch/elasticsearch-py/tree/master/test_elasticsearch
+  doCheck = false;
+  propagatedBuildInputs = [ urllib3 requests ];
+  buildInputs = [ nosexcover mock ];
+
+  meta = with stdenv.lib; {
+    description = "Official low-level client for Elasticsearch";
+    homepage = https://github.com/elasticsearch/elasticsearch-py;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ desiderius ];
+  };
+})

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

@@ -7,23 +7,19 @@
 
 buildPythonPackage rec {
   pname = "grammalecte";
-  version = "0.5.18";
+  version = "0.6.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.dicollecte.org/grammalecte/zip/Grammalecte-fr-v${version}.zip";
-    sha256 = "0izfsqsj8w4awhmwmn4x8wwpqsmqbnfvfafzk93i6yj0l3fn3i97";
+    sha256 = "0y2ck6pkd2p3cbjlxxvz3x5rnbg3ghfx97n13302rnab66cy4zkh";
   };
 
   propagatedBuildInputs = [ bottle ];
 
   preBuild = "cd ..";
   postInstall = ''
-    mkdir $out/bin
-    cp $out/cli.py $out/bin/gramalecte
-    cp $out/server.py $out/bin/gramalected
-    chmod a+rx $out/bin/gramalecte
-    chmod a+rx $out/bin/gramalected
+    rm $out/bin/bottle.py
   '';
 
   disabled = !isPy3k;

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

@@ -1,22 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchPypi
-}:
-
-buildPythonPackage rec {
-  pname = "ltc_scrypt";
-  version = "1.0";
-  name = "${pname}-${version}";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1h90hh3iw4i7zs7jgskdjlk8gi97b3v2zqsxdfwdvhrrnhpvv856";
-  };
-
-  meta = with stdenv.lib; {
-    description = "Bindings for scrypt proof of work used by Litecoin";
-    homepage = https://pypi.python.org/pypi/ltc_scrypt;
-    maintainers = with maintainers; [ asymmetric ];
-    license = licenses.bsd2;
-  };
-}

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

@@ -0,0 +1,32 @@
+{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, requests, zeroconf, netifaces, pytest }:
+
+buildPythonPackage rec {
+  pname = "netdisco";
+  version = "1.2.3";
+
+  disabled = !isPy3k;
+
+  # PyPI is missing tests/ directory
+  src = fetchFromGitHub {
+    owner = "home-assistant";
+    repo = pname;
+    rev = version;
+    sha256 = "137p7qlv85mva96v6kav8xxca7i09k4giayag4cglrgjd7q3lk1r";
+  };
+
+  propagatedBuildInputs = [ requests zeroconf netifaces ];
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Python library to scan local network for services and devices";
+    homepage = https://github.com/home-assistant/netdisco/;
+    license = licenses.asl20;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}

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

@@ -0,0 +1,26 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, openssl
+}:
+
+buildPythonPackage rec {
+  pname = "scrypt";
+  version = "0.8.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0830r3q8f8mc4738ngcvwhv9kih5c6zf87mzkdifzf2h6kss99fl";
+  };
+
+  buildInputs = [ openssl ];
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Bindings for scrypt key derivation function library";
+    homepage = https://pypi.python.org/pypi/scrypt;
+    maintainers = with maintainers; [ asymmetric ];
+    license = licenses.bsd2;
+  };
+}

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

@@ -2,18 +2,16 @@
 
 buildPythonPackage rec {
   pname = "pyslurm";
-  version = "unstable-69e4f4f";
+  version = "20171102";
   name = pname + "-" + version;
 
   src = fetchFromGitHub {
     repo = "pyslurm";
     owner = "PySlurm";
-    rev = "69e4f4fd66003b98ddb7da25613fe641d4ae160d";
-    sha256 = "051kafkndbniklxyf0drb360aiblnqcf9rqjbvmqh66zrfya1m28";
+    rev = "a2acbc820da419e308c5817998d2abe78a7b75e6";
+    sha256 = "1wmlx5fh1xzjyksvmq7i083hmyvs7id61ysk2d9hbmf8rza498as";
   };
 
-  patches = [ ./pyslurm-dlfcn.patch ];
-
   buildInputs = [ cython slurm ];
   setupPyBuildFlags = [ "--slurm-lib=${slurm}/lib" "--slurm-inc=${slurm.dev}/include" ];
 

pkgs/development/python-modules/pyslurm/pyslurm-dlfcn.patch

@@ -1,18 +0,0 @@
-diff --git a/pyslurm/__init__.py b/pyslurm/__init__.py
-index 81643e1..e8b6836 100644
---- a/pyslurm/__init__.py
-+++ b/pyslurm/__init__.py
-@@ -11,8 +11,11 @@ import sys
- old_dlopen_flags = ''
- if hasattr(sys, "setdlopenflags"):
-     old_dlopen_flags = sys.getdlopenflags()
--    import DLFCN
--    sys.setdlopenflags(old_dlopen_flags | DLFCN.RTLD_GLOBAL)
-+    if sys.version_info >= (3,6):
-+        from os import RTLD_GLOBAL
-+    else:
-+        from DLFCN import RTLD_GLOBAL
-+    sys.setdlopenflags(old_dlopen_flags | RTLD_GLOBAL)
- 
- from .pyslurm import *
- 

pkgs/development/python-modules/pytest-rerunfailures/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, pytest, mock }:
+
+buildPythonPackage rec {
+  pname = "pytest-rerunfailures";
+  version = "4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "18lpy6d9b4ck8j3jwh4vmxj54is0fwanpmpg70qg4y0fycdqzwks";
+  };
+
+  checkInputs = [ pytest mock ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with stdenv.lib; {
+    description = "pytest plugin to re-run tests to eliminate flaky failures.";
+    homepage = https://github.com/pytest-dev/pytest-rerunfailures;
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ jgeerds ];
+  };
+}

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

@@ -14,6 +14,14 @@ buildPythonPackage rec {
 
   checkInputs = [ pytest pytestrunner pytestcov pytestflakes pytestpep8 sphinx ];
 
+  postPatch = ''
+    # pytest-runner is only actually required in checkPhase
+    substituteInPlace setup.py --replace "setup_requires=['pytest-runner']," ""
+  '';
+
+  # Tests failing
+  doCheck = false;
+
   checkPhase = ''
     rm nix_run_setup.py
     py.test

pkgs/development/python-modules/salmon-mail/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, nose, dnspython
+,  chardet, lmtpd, pythondaemon, six, jinja2, mock }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "salmon-mail";
+  version = "3.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1smggsnkwiqy8zjq604dkm5g0np27pdnj3szsbn8v4ja84nncq18";
+  };
+
+  checkInputs = [ nose jinja2 mock ];
+  propagatedBuildInputs = [ chardet dnspython lmtpd pythondaemon six ];
+
+  meta = with stdenv.lib; {
+    homepage = http://salmon-mail.readthedocs.org/;
+    description = "Pythonic mail application server";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}

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

@@ -1,29 +0,0 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, nose, dnspython
-,  chardet, lmtpd, pythondaemon, six, jinja2, mock }:
-
-buildPythonPackage rec {
-  pname = "salmon";
-  # NOTE: The latest release version 2 is over 3 years old. So let's use some
-  # recent commit from master. There will be a new release at some point, then
-  # one can change this to use PyPI. See:
-  # https://github.com/moggers87/salmon/issues/52
-  version = "bec795cdab744be4f103d8e35584dfee622ddab2";
-  name = "${pname}-${version}";
-
-  src = fetchFromGitHub {
-    owner = "moggers87";
-    repo = "salmon";
-    rev = version;
-    sha256 = "0nx8pyxy7n42nsqqvhd85ycm1i5wlacsi7lwb4rrs9d416bpd300";
-  };
-
-  checkInputs = [ nose jinja2 mock ];
-  propagatedBuildInputs = [ chardet dnspython lmtpd pythondaemon six ];
-
-  meta = with stdenv.lib; {
-    homepage = http://salmon-mail.readthedocs.org/;
-    description = "Pythonic mail application server";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ jluttine ];
-  };
-}

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

@@ -2,6 +2,8 @@
 , buildPythonPackage
 , fetchPypi
 , supervise
+, isPy3k
+, whichcraft
 }:
 
 buildPythonPackage rec {
@@ -15,7 +17,11 @@ buildPythonPackage rec {
     sha256 = "e6982633a924cb5192d2291d25b366ff311876a31b0f5961471b39d87397ef5b";
   };
 
-  propagatedBuildInputs = [ supervise ];
+  propagatedBuildInputs = [
+    supervise
+  ] ++ lib.optionals ( !isPy3k ) [
+    whichcraft
+  ];
 
   # no tests
   doCheck = false;

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

@@ -1,19 +1,19 @@
 { stdenv, fetchPypi, buildPythonPackage, lib }:
 
 buildPythonPackage rec {
-  version = "3.9.0";
+  version = "3.9.1";
   pname = "thespian";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "e698e3c5369d7b06de5c4ce7b877ea65991c99f7b0fabd09f29e91bc981c7d22";
+    sha256 = "0b303bv85176xd5mf3q5j549s28wi70ck2xxgj1cvpydh23dzipb";
   };
 
-  # Do not run the test suite: it takes a long type and uses
+  # Do not run the test suite: it takes a long time and uses
   # significant system resources, including requiring localhost
-  # network operations.  Thespian tests are performed via it's Travis
+  # network operations.  Thespian tests are performed via its Travis
   # CI configuration and do not need to be duplicated here.
   doCheck = false;
 

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

@@ -0,0 +1,28 @@
+{ lib, stdenv, fetchPypi, buildPythonPackage, isPy27, pythonOlder
+, numpy, nose, enum34, futures }:
+
+buildPythonPackage rec {
+  pname = "tifffile";
+  version = "0.13.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1rqx2bar6dcsbmzq68mjh5bsyjzhbkqxi2dsv7j0vdbnjs5dfq9q";
+  };
+
+  checkInputs = [ nose ];
+  checkPhase = ''
+    nosetests --exe -v --exclude="test_extension"
+  '';
+
+  propagatedBuildInputs = [ numpy ]
+    ++ lib.optional isPy27 futures
+    ++ lib.optional (pythonOlder "3.0") enum34;
+
+  meta = with stdenv.lib; {
+    description = "Read and write image data from and to TIFF files.";
+    homepage = https://github.com/blink1073/tifffile;
+    maintainers = [ maintainers.lebastr ];
+    license = licenses.bsd2;
+  };
+}

pkgs/development/python-modules/ua-parser/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi, pyyaml }:
+
+buildPythonPackage rec {
+  pname = "ua-parser";
+  version = "0.7.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1p8siba0rnb5nsl354fd5fc4751d5ybw7hgnd56yn8dncxdb1bqa";
+  };
+
+  buildInputs = [ pyyaml ];
+
+  doCheck = false; # requires files from uap-core
+
+  meta = with stdenv.lib; {
+    description = "A python implementation of the UA Parser";
+    homepage = https://github.com/ua-parser/uap-python;
+    license = licenses.asl20;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}

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

@@ -5,17 +5,17 @@ then throw "Uranium not supported for interpreter ${python.executable}"
 else
 
 stdenv.mkDerivation rec {
-  version = "3.0.3";
+  version = "3.1.0";
   pname = "uranium";
   name = "${pname}-${version}";
-  
+
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "Uranium";
     rev = version;
-    sha256 = "1pyzpcdb6kb0basvhgpjdiws8x0bwl71k7nkf3j3s9wk1dvyw824";
+    sha256 = "1wz2nk973g8227r9v6j7gry3m0b0ikirkws8sfhysvgj0vgak9yk";
   };
-  
+
   buildInputs = [ python gettext ];
   propagatedBuildInputs = [ pyqt5 numpy scipy libarcus ];
   nativeBuildInputs = [ cmake doxygen ];

pkgs/development/python-modules/user-agents/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, ua-parser }:
+
+buildPythonPackage rec {
+  pname = "user-agents";
+  version = "1.1.0";
+
+  # PyPI is missing devices.json
+  src = fetchFromGitHub {
+    owner = "selwin";
+    repo = "python-user-agents";
+    rev = "v${version}";
+    sha256 = "14kxd780zhp8718xr1z63xffaj3bvxgr4pldh9sv943m4hvi0gw5";
+  };
+
+  propagatedBuildInputs = [ ua-parser ];
+
+  meta = with stdenv.lib; {
+    description = "A Python library to identify devices by parsing user agent strings";
+    homepage = https://github.com/selwin/python-user-agents;
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}

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

@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+
+buildPythonPackage rec {
+
+  pname = "versioneer";
+  version = "0.18";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0dgkzg1r7mjg91xp81sv9z4mabyxl39pkd11jlc1200md20zglga";
+  };
+
+  # Couldn't get tests to work because, for instance, they used virtualenv and
+  # pip.
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Version-string management for VCS-controlled trees";
+    homepage = https://github.com/warner/python-versioneer;
+    license = licenses.publicDomain;
+    maintainers = with maintainers; [ jluttine ];
+  };
+
+}

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

@@ -3,7 +3,6 @@
 buildPythonPackage rec {
   pname = "voluptuous";
   version = "0.10.5";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;