Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-05-28 22:03:48 +02:00
186 changed files with 1059 additions and 613 deletions
+8
View File
@@ -3621,6 +3621,10 @@ in {
SPARQLWrapper = callPackage ../development/python-modules/sparqlwrapper { };
duckdb = callPackage ../development/python-modules/duckdb {
duckdb = pkgs.duckdb;
};
dulwich = callPackage ../development/python-modules/dulwich {
inherit (pkgs) git glibcLocales;
};
@@ -5083,6 +5087,8 @@ in {
polib = callPackage ../development/python-modules/polib {};
ponywhoosh = callPackage ../development/python-modules/ponywhoosh { };
posix_ipc = callPackage ../development/python-modules/posix_ipc { };
portend = callPackage ../development/python-modules/portend { };
@@ -6983,6 +6989,8 @@ in {
ansi = callPackage ../development/python-modules/ansi { };
pygments-better-html = callPackage ../development/python-modules/pygments-better-html { };
pygments-markdown-lexer = callPackage ../development/python-modules/pygments-markdown-lexer { };
telegram = callPackage ../development/python-modules/telegram { };