Merge branch 'staging-next' into staging

Commits from master, conflict resolutions, etc.

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

@@ -27,4 +27,8 @@ buildPythonPackage rec {
   checkInputs = [ nose ];
 
   postUnpack = "sourceRoot=\${sourceRoot}/acme";
+
+  meta = certbot.meta // {
+    description = "ACME protocol implementation in Python";
+  };
 }

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

@@ -15,5 +15,6 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     homepage = http://code.google.com/p/py-amqplib/;
     description = "Python client for the Advanced Message Queuing Procotol (AMQP)";
+    license = licenses.lgpl21;
   };
 }

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

@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "ansi";
@@ -12,4 +12,10 @@ buildPythonPackage rec {
   checkPhase = ''
     python -c "import ansi.color"
   '';
+
+  meta = with lib; {
+    description = "ANSI cursor movement and graphics";
+    homepage = https://github.com/tehmaze/ansi/;
+    license = licenses.mit;
+  };
 }

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

@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi, isPy3k, nose }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, nose }:
 
 buildPythonPackage rec {
   pname = "anyjson";
@@ -14,8 +14,9 @@ buildPythonPackage rec {
 
   buildInputs = [ nose ];
 
-  meta = {
-    homepage = https://pypi.python.org/pypi/anyjson/;
+  meta = with lib; {
+    homepage = https://bitbucket.org/runeh/anyjson/;
     description = "Wrapper that selects the best available JSON implementation";
+    license = licenses.bsd2;
   };
 }

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

@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchdarcs, zope_interface, isPy3k }:
+{ lib, buildPythonPackage, fetchdarcs, zope_interface, isPy3k }:
 
 buildPythonPackage rec {
   pname = "python-application";
@@ -12,4 +12,10 @@ buildPythonPackage rec {
   };
 
   buildInputs = [ zope_interface ];
+
+  meta = with lib; {
+    description = "Basic building blocks for python applications";
+    homepage = https://github.com/AGProjects/python-application;
+    license = licenses.lgpl2Plus;
+  };
 }

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

@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchPypi
+{ lib, buildPythonPackage, fetchPypi
 , boto }:
 
 buildPythonPackage rec {
@@ -14,4 +14,10 @@ buildPythonPackage rec {
   doCheck = false;
 
   propagatedBuildInputs = [ boto ];
+
+  meta = with lib; {
+    description = "Python Interface to Route53";
+    homepage = https://github.com/mariusv/Area53;
+    license = licenses.unfree; # unspecified
+  };
 }

pkgs/development/python-modules/bitbucket-cli/default.nix

@@ -19,5 +19,6 @@ buildPythonPackage rec {
     description = "Bitbucket command line interface";
     homepage = https://bitbucket.org/zhemao/bitbucket-cli;
     maintainers = with maintainers; [ refnil ];
+    license = licenses.bsd2;
   };
 }

pkgs/development/python-modules/browser-cookie3/default.nix

@@ -0,0 +1,24 @@
+{ lib, fetchPypi, buildPythonPackage, isPy3k, keyring, pbkdf2, pyaes}:
+buildPythonPackage rec {
+  pname = "browser-cookie3";
+  version = "0.6.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "16nghwsrv08gz4iiyxsy5lgg5ljgrwkp471m7xnsvhhpb3axmnsc";
+  };
+
+  disabled = !isPy3k;
+
+  propagatedBuildInputs = [ keyring pbkdf2 pyaes ];
+
+  # No tests implemented
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Loads cookies from your browser into a cookiejar object";
+    maintainers = with maintainers; [ borisbabic ];
+    homepage = https://github.com/borisbabic/browser_cookie3;
+    license = licenses.gpl3;
+  };
+}

pkgs/development/python-modules/pyls-black/default.nix

@@ -0,0 +1,32 @@
+{ lib, buildPythonPackage, fetchFromGitHub
+, black, toml, pytest, python-language-server, isPy3k
+}:
+
+buildPythonPackage rec {
+  pname = "pyls-black";
+  version = "0.2.1";
+
+  src = fetchFromGitHub {
+    owner = "rupert";
+    repo = "pyls-black";
+    rev = "v${version}";
+    sha256 = "0xa3iv8nhnj0lw0dh41qb0dqp55sb6rdxalbk60v8jll6qyc0si8";
+  };
+
+  disabled = !isPy3k;
+
+  checkPhase = ''
+    pytest
+  '';
+
+  checkInputs = [ pytest ];
+
+  propagatedBuildInputs = [ black toml python-language-server ];
+
+  meta = with lib; {
+    homepage = https://github.com/rupert/pyls-black;
+    description = "Black plugin for the Python Language Server";
+    license = licenses.mit;
+    maintainers = [ maintainers.mic92 ];
+  };
+}

pkgs/development/python-modules/pyls-isort/default.nix

@@ -21,8 +21,8 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    homepage = https://github.com/palantir/python-language-server;
-    description = "An implementation of the Language Server Protocol for Python";
+    homepage = https://github.com/paradoxxxzero/pyls-isort;
+    description = "Isort plugin for python-language-server";
     license = licenses.mit;
     maintainers = [ maintainers.mic92 ];
   };

pkgs/development/python-modules/pyls-mypy/default.nix

@@ -1,29 +1,21 @@
-{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch
+{ lib, buildPythonPackage, fetchFromGitHub
 , future, python-language-server, mypy, configparser
 , pytest, mock, isPy3k, pytestcov, coverage
 }:
 
 buildPythonPackage rec {
   pname = "pyls-mypy";
-  version = "0.1.2";
+  version = "0.1.3";
 
   src = fetchFromGitHub {
     owner = "tomv564";
     repo = "pyls-mypy";
     rev = version;
-    sha256 = "0wa038a8a8yj3wmrc7q909nj4b5d3lq70ysbw7rpsnyb0x06m826";
+    sha256 = "0v7ghcd1715lxlfq304b7xhchp31ahdd89lf6za4n0l59dz74swh";
   };
 
   disabled = !isPy3k;
 
-  patches = [
-    # also part of https://github.com/tomv564/pyls-mypy/pull/10
-    (fetchpatch {
-      url = "https://github.com/Mic92/pyls-mypy/commit/4c727120d2cbd8bf2825e1491cd55175f03266d2.patch";
-      sha256 = "1dgn5z742swpxwknmgvm65jpxq9zwzhggw4nl6ys7yw8r49kqgrl";
-    })
-  ];
-
   checkPhase = ''
     HOME=$TEMPDIR pytest
   '';
@@ -35,8 +27,8 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    homepage = https://github.com/palantir/python-language-server;
-    description = "An implementation of the Language Server Protocol for Python";
+    homepage = https://github.com/tomv564/pyls-mypy;
+    description = "Mypy plugin for the Python Language Server";
     license = licenses.mit;
     maintainers = [ maintainers.mic92 ];
   };

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

@@ -1,13 +1,13 @@
 { fetchPypi, buildPythonPackage, lib }:
 
 buildPythonPackage rec {
-  version = "3.9.2";
+  version = "3.9.4";
   pname = "thespian";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "aec9793fecf45bb91fe919dc61b5c48a4aadfb9f94b06cd92883df7952eacf95";
+    sha256 = "98766eb304ef922133baca12a75eedd8d9b709c58bd9af50bfa5593dc3ffe0e1";
   };
 
   # Do not run the test suite: it takes a long time and uses

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

@@ -20,6 +20,7 @@
 , pytestcov
 , requests-mock
 , tornado
+, attrs
 }:
 
 buildPythonPackage rec {
@@ -32,6 +33,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
+    attrs
     appdirs
     cached-property
     defusedxml