Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar
2020-12-06 03:28:13 +01:00
42 changed files with 1005 additions and 758 deletions
+4
View File
@@ -3790,6 +3790,8 @@ in {
mido = callPackage ../development/python-modules/mido { };
milc = callPackage ../development/python-modules/milc { };
milksnake = callPackage ../development/python-modules/milksnake { };
minidb = callPackage ../development/python-modules/minidb { };
@@ -4862,6 +4864,8 @@ in {
py-air-control = callPackage ../development/python-modules/py-air-control { };
py-air-control-exporter = callPackage ../development/python-modules/py-air-control-exporter { };
py2bit = callPackage ../development/python-modules/py2bit { };
py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { });