Merge branch 'master' into staging-next

This commit is contained in:
Martin Weinelt
2021-04-22 00:54:14 +02:00
committed by GitHub
18 changed files with 221 additions and 23 deletions
+10
View File
@@ -2031,6 +2031,8 @@ in {
ds-store = callPackage ../development/python-modules/ds-store { };
ds4drv = callPackage ../development/python-modules/ds4drv { };
dsmr-parser = callPackage ../development/python-modules/dsmr-parser { };
duckdb = callPackage ../development/python-modules/duckdb {
inherit (pkgs) duckdb;
@@ -3085,6 +3087,8 @@ in {
hyperframe = callPackage ../development/python-modules/hyperframe { };
hyperion-py = callPackage ../development/python-modules/hyperion-py { };
hyperkitty = callPackage ../servers/mail/mailman/hyperkitty.nix { };
hyperlink = callPackage ../development/python-modules/hyperlink { };
@@ -7711,6 +7715,8 @@ in {
tahoma-api = callPackage ../development/python-modules/tahoma-api { };
tailer = callPackage ../development/python-modules/tailer { };
tasklib = callPackage ../development/python-modules/tasklib { };
taskw = callPackage ../development/python-modules/taskw { };
@@ -8130,6 +8136,8 @@ in {
unifi = callPackage ../development/python-modules/unifi { };
unify = callPackage ../development/python-modules/unify { };
unifiled = callPackage ../development/python-modules/unifiled { };
units = callPackage ../development/python-modules/units { };
@@ -8148,6 +8156,8 @@ in {
untangle = callPackage ../development/python-modules/untangle { };
untokenize = callPackage ../development/python-modules/untokenize { };
upass = callPackage ../development/python-modules/upass { };
update_checker = callPackage ../development/python-modules/update_checker { };