Merge master into staging-next

2019-02-24 09:19:12 +01:00
parent 917f6f987a d7ba376435
commit c2eac6741b
265 changed files with 4145 additions and 1230 deletions
--- a/pkgs/development/python-modules/pyside/shiboken.nix
+++ b/pkgs/development/python-modules/pyside/shiboken.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
    description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code";
    license = lib.licenses.gpl2;
    homepage = http://www.pyside.org/docs/shiboken/;
-    maintainers = [ lib.maintainers.chaoflow ];
+    maintainers = [ ];
    platforms = lib.platforms.all;
  };
 }