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

Conflicts:
	pkgs/development/libraries/libclc/default.nix
	pkgs/top-level/all-packages.nix

10 files changed, 189 insertions, 23 deletions

diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix
index 8f8d91c64d2..99cc4c3eab8 100644
--- a/pkgs/development/python-modules/Nikola/default.nix
+++ b/pkgs/development/python-modules/Nikola/default.nix
@@ -6,7 +6,7 @@
 , glibcLocales
 , pytest
 , pytestcov
-, pytest-mock
+, mock
 , pygments
 , pillow
 , dateutil
@@ -28,7 +28,6 @@
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "Nikola";
   version = "7.8.11";
 
@@ -37,7 +36,7 @@ buildPythonPackage rec {
   # other hand doesn't support Python 3.3). So, just disable Python 2.
   disabled = !isPy3k;
 
-  buildInputs = [ pytest pytestcov pytest-mock glibcLocales ];
+  checkInputs = [ pytest pytestcov mock glibcLocales ];
 
   propagatedBuildInputs = [
     pygments pillow dateutil docutils Mako unidecode lxml Yapsy PyRSS2Gen
diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix
new file mode 100644
index 00000000000..b865b565496
--- /dev/null
+++ b/pkgs/development/python-modules/aioconsole/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+# This package provides a binary "apython" which sometimes invokes
+# [sys.executable, '-m', 'aioconsole'] as a subprocess. If apython is
+# run directly out of this derivation, it won't work, because
+# sys.executable will point to a Python binary that is not wrapped to
+# be able to find aioconsole.
+# However, apython will work fine when using python##.withPackages,
+# because with python##.withPackages the sys.executable is already
+# wrapped to be able to find aioconsole and any other packages.
+buildPythonPackage rec {
+  pname = "aioconsole";
+  version = "0.1.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "17bnfcp0gacnmpdam6byb7rwhqibw57f736bbgk45w4cy2lglj3y";
+  };
+
+  # hardcodes a test dependency on an old version of pytest-asyncio
+  doCheck = false;
+
+  meta = {
+    description = "Asynchronous console and interfaces for asyncio";
+    homepage = https://github.com/vxgmichel/aioconsole;
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.catern ];
+  };
+}
diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix
new file mode 100644
index 00000000000..44613dd4e5b
--- /dev/null
+++ b/pkgs/development/python-modules/celery/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildPythonPackage, fetchPypi, iana-etc, libredirect,
+  pytest, case, kombu, billiard, pytz, anyjson, amqp, eventlet
+}: 
+buildPythonPackage rec {
+  pname = "celery";
+  version = "4.1.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0dcb0s6kdcd3vc9pwvazngppkdbhwpmpjmghq6rifsld34q3gzvp";
+  };
+
+  # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox
+  preCheck = ''
+    export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \
+      LD_PRELOAD=${libredirect}/lib/libredirect.so
+  '';
+  postCheck = ''
+    unset NIX_REDIRECTS LD_PRELOAD
+  '';
+
+  buildInputs = [ pytest case ];
+  propagatedBuildInputs = [ kombu billiard pytz anyjson amqp eventlet ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/celery/celery/;
+    description = "Distributed task queue";
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch b/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch
deleted file mode 100644
index 27caa80dd4c..00000000000
--- a/pkgs/development/python-modules/celery/fix_endless_python3.6_loop_logger_isa.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix endless loop in logger_isa (Python 3.6)
-Author: George Psarakis <giwrgos.psarakis@gmail.com>
-Origin: upstream, https://github.com/celery/celery/commit/9c950b47eca2b4e93fd2fe52cf80f158e6cf97ad
-Forwarded: not-needed
-Reviewed-By: Nishanth Aravamudan <nish.aravamudan@canonical.com>
-Last-Update: 2017-06-12
-
---- celery-4.0.2.orig/celery/utils/log.py
-+++ celery-4.0.2/celery/utils/log.py
-@@ -82,7 +82,7 @@ def logger_isa(l, p, max=1000):
-         else:
-             if this in seen:
-                 raise RuntimeError(
--                    'Logger {0!r} parents recursive'.format(l),
-+                    'Logger {0!r} parents recursive'.format(l.name),
-                 )
-             seen.add(this)
-             this = this.parent
diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix
new file mode 100644
index 00000000000..492c4da6fcc
--- /dev/null
+++ b/pkgs/development/python-modules/i3ipc/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, enum-compat
+, xorgserver, pytest, i3, python
+}:
+
+buildPythonPackage rec {
+  pname = "i3ipc";
+  version = "1.4.0";
+
+  src = fetchFromGitHub {
+    owner  = "acrisci";
+    repo   = "i3ipc-python";
+    rev    = "v${version}";
+    sha256 = "15drq16ncmjrgsri6gjzp0qm8abycm92nicm78q3k7vy7rqpvfnh";
+  };
+
+  propagatedBuildInputs = [ enum-compat ];
+
+  checkInputs = [ xorgserver pytest i3 ];
+
+  checkPhase = ''${python.interpreter} run-tests.py'';
+
+  meta = with stdenv.lib; {
+    description = "An improved Python library to control i3wm";
+    homepage    = https://github.com/acrisci/i3ipc-python;
+    license     = licenses.bsd3;
+    maintainers = with maintainers; [ vanzef ];
+  };
+}
diff --git a/pkgs/development/python-modules/platformio/default.nix b/pkgs/development/python-modules/platformio/default.nix
index 6ac9b7eacfc..01d47b45860 100644
--- a/pkgs/development/python-modules/platformio/default.nix
+++ b/pkgs/development/python-modules/platformio/default.nix
@@ -3,6 +3,7 @@
 , lockfile, pyserial, requests
 , semantic-version
 , isPy3k, isPyPy
+, git
 }:
 buildPythonPackage rec {
   disabled = isPy3k || isPyPy;
@@ -17,7 +18,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs =  [
-    bottle click_5 colorama lockfile
+    bottle click_5 colorama git lockfile
     pyserial requests semantic-version
   ];
 
diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix
new file mode 100644
index 00000000000..c23a90c095b
--- /dev/null
+++ b/pkgs/development/python-modules/pynacl/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, coverage, libsodium, cffi, six, hypothesis}:
+
+buildPythonPackage rec {
+  pname = "pynacl";
+  version = "1.2.1";
+
+  src = fetchFromGitHub {
+    owner = "pyca";
+    repo = pname;
+    rev = version;
+    sha256 = "0z9i1z4hjzmp23igyhvg131gikbrr947506lwfb3fayf0agwfv8f";
+  };
+
+  #remove deadline from tests, see https://github.com/pyca/pynacl/issues/370
+  preCheck = ''
+    sed -i 's/deadline=1500, //' tests/test_pwhash.py
+    sed -i 's/deadline=1500, //' tests/test_aead.py
+  '';
+
+  checkInputs = [ pytest coverage hypothesis ];
+  propagatedBuildInputs = [ libsodium cffi six ];
+
+  checkPhase = ''
+    coverage run --source nacl --branch -m pytest
+  '';
+  
+  meta = with stdenv.lib; {
+    maintainers = with maintainers; [ va1entin ];
+    description = "Python binding to the Networking and Cryptography (NaCl) library";
+    homepage = https://github.com/pyca/pynacl/;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix
new file mode 100644
index 00000000000..7cb5224c60b
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-mock/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchPypi, isPy3k, pytest, mock, setuptools_scm }:
+
+buildPythonPackage rec {
+  pname = "pytest-mock";
+  version = "1.6.3";
+ 
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "920d1167af5c2c2ad3fa0717d0c6c52e97e97810160c15721ac895cac53abb1c";
+  };
+
+  propagatedBuildInputs = [ pytest ] ++ lib.optional (!isPy3k) mock;
+  nativeBuildInputs = [ setuptools_scm ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with lib; {
+    description = "Thin-wrapper around the mock package for easier use with py.test.";
+    homepage    = https://github.com/pytest-dev/pytest-mock;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ nand0p ];
+  };
+}
diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix
new file mode 100644
index 00000000000..b71e4d3a4ff
--- /dev/null
+++ b/pkgs/development/python-modules/weboob/default.nix
@@ -0,0 +1,38 @@
+{ buildPythonPackage, fetchurl, stdenv, isPy27
+, nose, pillow, prettytable, pyyaml, dateutil, gdata
+, requests, mechanize, feedparser, lxml, gnupg, pyqt5
+, libyaml, simplejson, cssselect, futures, pdfminer
+, termcolor, google_api_python_client, html2text
+, unidecode
+}:
+
+buildPythonPackage rec {
+  pname = "weboob";
+  version = "1.3";
+  disabled = ! isPy27;
+
+  src = fetchurl {
+    url = "https://symlink.me/attachments/download/356/${pname}-${version}.tar.gz";
+    sha256 = "0m5yh49lplvb57dfilczh65ky35fshp3g7ni31pwfxwqi1f7i4f9";
+  };
+
+  setupPyBuildFlags = ["--qt" "--xdg"];
+
+  checkInputs = [ nose ];
+
+  propagatedBuildInputs = [ pillow prettytable pyyaml dateutil
+    gdata requests mechanize feedparser lxml gnupg pyqt5 libyaml
+    simplejson cssselect futures pdfminer termcolor google_api_python_client
+    html2text unidecode ];
+
+  checkPhase = ''
+    nosetests
+  '';
+
+  meta = {
+    homepage = http://weboob.org;
+    description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser";
+    license = stdenv.lib.licenses.agpl3;
+  };
+}
+
diff --git a/pkgs/development/python-modules/yolk/default.nix b/pkgs/development/python-modules/yolk/default.nix
index 5e8c412ce52..958fcd72f84 100644
--- a/pkgs/development/python-modules/yolk/default.nix
+++ b/pkgs/development/python-modules/yolk/default.nix
@@ -17,7 +17,7 @@ buildPythonApplication rec {
   meta = {
     description = "Command-line tool for querying PyPI and Python packages installed on your system";
     homepage = https://github.com/cakebread/yolk;
-    maintainer = with maintainers; [ profpatsch ];
+    maintainer = with maintainers; [];
     license = licenses.bsd3;
   };
 }