Merge staging into python-unstable

2019-02-21 08:02:10 +01:00
parent eb22e4c775 e2cd07b997
commit 5871da418f
541 changed files with 16396 additions and 6981 deletions
--- a/pkgs/development/python-modules/requests-toolbelt/default.nix
+++ b/pkgs/development/python-modules/requests-toolbelt/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
  meta = {
    description = "A toolbelt of useful classes and functions to be used with python-requests";
    homepage = http://toolbelt.rtfd.org;
-    maintainers = with lib.maintainers; [ jgeerds ];
    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ matthiasbeyer jgeerds ];
  };
-}
+}