Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-05-23 10:24:52 +02:00
390 changed files with 9141 additions and 5290 deletions
+4 -2
View File
@@ -738,8 +738,6 @@ in {
flufl_lock = callPackage ../development/python-modules/flufl/lock.nix { };
fluidasserts = callPackage ../development/python-modules/fluidasserts { };
foxdot = callPackage ../development/python-modules/foxdot { };
fsspec = callPackage ../development/python-modules/fsspec { };
@@ -2102,6 +2100,8 @@ in {
bleach = callPackage ../development/python-modules/bleach { };
bleak = callPackage ../development/python-modules/bleak { };
blinker = callPackage ../development/python-modules/blinker { };
blockdiag = callPackage ../development/python-modules/blockdiag { };
@@ -5966,6 +5966,8 @@ in {
txtorcon = callPackage ../development/python-modules/txtorcon { };
txdbus = callPackage ../development/python-modules/txdbus { };
tzlocal = callPackage ../development/python-modules/tzlocal { };
u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { };