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/default.nix
+++ b/pkgs/development/python-modules/pyside/default.nix
@@ -21,7 +21,6 @@ buildPythonPackage rec {
    description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework";
    license = lib.licenses.lgpl21;
    homepage = http://www.pyside.org;
-    maintainers = [ lib.maintainers.chaoflow ];
    broken = true;
  };
 }