Merge master into staging-next

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

@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, netifaces
+, isPy27
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "aiozeroconf";
+  version = "0.1.8";
+  disabled = isPy27;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "074plydm7sd113p3k0siihwwz62d3r42q3g83vqaffp569msknqh";
+  };
+
+  propagatedBuildInputs = [ netifaces ];
+
+  meta = with stdenv.lib; {
+    description = "A pure python implementation of multicast DNS service discovery";
+    homepage = https://github.com/jstasiak/python-zeroconf;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ obadz ];
+  };
+}

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

@@ -18,11 +18,11 @@
 
 buildPythonPackage rec {
   pname = "ansible";
-  version = "2.7.9";
+  version = "2.8.1";
 
   src = fetchurl {
     url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
-    sha256 = "19vyf60zfmnv7frwm96bzqzvia69dysy9apk8bl84vr03ib9vrbf";
+    sha256 = "0ia4x17ywym3r1m96ar4h0wc2xlylhbjp6x4wzwkh4p2i0x1vmg1";
   };
 
   prePatch = ''

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

@@ -1,4 +1,4 @@
-{ lib, fetchPypi, buildPythonPackage, astroid, six, coverage
+{ lib, fetchPypi, buildPythonPackage, fetchpatch, astroid, six, coverage
 , lazy-object-proxy, nose, wrapt
 }:
 
@@ -11,6 +11,14 @@ buildPythonPackage rec {
     sha256 = "1vd4djlxmgznz84gzakkv45avnrcpgl1kir92l1pxyp0z5c0dh2m";
   };
 
+  patches = [
+    # Fix tests for astroid 2.2 in python 3. Remove with the next release
+    (fetchpatch {
+      url = "https://github.com/gristlabs/asttokens/commit/21caaaa74105c410b3d84c3d8ff0dc2f612aac9a.patch";
+      sha256 = "182xfr0cx4pxx0dv1l50a1c281h8ywir8vvd1zh5iicflivim1nv";
+    })
+  ];
+
   propagatedBuildInputs = [ lazy-object-proxy six wrapt astroid ];
 
   checkInputs = [ coverage nose ];

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

@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "bjoern";
-  version = "2.2.3";
+  version = "3.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1lbwqmqrl32jlfzhffxsb1fm7xbbjgbhjr21imk656agvpib2wx2";
+    sha256 = "1ajmmfzr6fm8h8s7m69f2ffx0wk6snjvdx527hhj00bzn7zybnmn";
   };
 
   buildInputs = [ libev ];

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

@@ -1,12 +1,12 @@
 { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k }:
 
 buildPythonPackage rec {
-  version = "4.12.0";
+  version = "4.13.0";
   pname = "breathe";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1wmxppzyvfd5gab72qi3gainibrdk4xi8nsfp5z5h49xgzi84mnq";
+    sha256 = "08xs1cqpvcv7735j19c35br34gbwzfn89rkg12n2yfz4af0x3xfp";
   };
 
   propagatedBuildInputs = [ docutils six sphinx ];

pkgs/development/python-modules/cld2-cffi/default.nix

@@ -13,7 +13,7 @@ buildPythonPackage rec {
   checkInputs = [ nose ];
 
   # gcc doesn't approve of this code, so disable -Werror
-  NIX_CFLAGS_COMPILE = "-w";
+  NIX_CFLAGS_COMPILE = [ "-w" ] ++ stdenv.lib.optional stdenv.cc.isClang "-Wno-error=c++11-narrowing";
 
   checkPhase = "nosetests -v";
 

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

@@ -0,0 +1,33 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, requests
+, flake8
+, mock
+, pytest
+, mystem
+}:
+
+buildPythonPackage rec {
+  pname = "pymystem3";
+  version = "0.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "15gv78m17g958gfka6rr3rg230g6b5ssgk8bfpsp7k2iajhxdbhs";
+  };
+
+  propagatedBuildInputs = [ requests ];
+  checkInputs = [ flake8 mock pytest ];
+
+  postPatch = ''
+    sed -i 's#^_mystem_info = .*#_mystem_info = ["${mystem}/bin", "${mystem}/bin/mystem"]#' pymystem3/constants.py
+  '';
+
+  meta = with lib; {
+    description = "Python wrapper for the Yandex MyStem 3.1 morpholocial analyzer of the Russian language";
+    homepage = https://github.com/nlpub/pymystem3;
+    license = licenses.mit;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}

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

@@ -0,0 +1,19 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "rfc3987";
+  version = "1.3.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "d3c4d257a560d544e9826b38bc81db676890c79ab9d7ac92b39c7a253d5ca733";
+  };
+
+  doCheck = false;
+  meta = with stdenv.lib; {
+    homepage = "https://pypi.python.org/pypi/rfc3987";
+    license = licenses.gpl3Plus;
+    description = "Parsing and validation of URIs (RFC 3986) and IRIs (RFC 3987)";
+    maintainers = with maintainers; [ vanschelven ];
+  };
+}

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

@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, python, coverage, lsof, glibcLocales }:
+{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, python, coverage, lsof, glibcLocales }:
 
 buildPythonPackage rec {
   pname = "sh";
@@ -9,9 +9,17 @@ buildPythonPackage rec {
     sha256 = "1z2hx357xp3v4cv44xmqp7lli3frndqpyfmpbxf7n76h7s1zaaxm";
   };
 
-  # Disable tests that fail on Darwin
-  # Some of the failures are due to Nix using GNU coreutils
-  patches = [ ./disable-broken-tests-darwin.patch ];
+  patches = [
+    # Disable tests that fail on Darwin
+    # Some of the failures are due to Nix using GNU coreutils
+    ./disable-broken-tests-darwin.patch
+    # Fix tests for Python 3.7. See: https://github.com/amoffat/sh/pull/468
+    (fetchpatch {
+      url = "https://github.com/amoffat/sh/commit/b6202f75706473f02084d819e0765056afa43664.patch";
+      sha256 = "1kzxyxcc88zhgn2kmfg9yrbs4n405b2jq7qykb453l52hy10vi94";
+      excludes = [ ".travis.yml" ];
+    })
+  ];
 
   postPatch = ''
     sed -i 's#/usr/bin/env python#${python.interpreter}#' test.py

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

@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pkgs
+, pbr
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "ssdp";
+  version = "1.0.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0yhjqs9jyvwmba8fi72xfi9k8pxy11wkz4iywayrg71ka3la49bk";
+  };
+
+  buildInputs = [ pbr ];
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/codingjoe/ssdp;
+    description = "Python asyncio library for Simple Service Discovery Protocol (SSDP).";
+    license = licenses.mit;
+  };
+}

pkgs/development/python-modules/strict-rfc3339/default.nix

@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "strict-rfc3339";
+  version = "0.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "5cad17bedfc3af57b399db0fed32771f18fc54bbd917e85546088607ac5e1277";
+  };
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/danielrichman/strict-rfc3339";
+    license = licenses.gpl3;
+    description = "Strict, simple, lightweight RFC3339 functions";
+    maintainers = with maintainers; [ vanschelven ];
+  };
+}