Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-03-24 06:05:54 +00:00
committed by GitHub
21 changed files with 5557 additions and 35 deletions
+2
View File
@@ -6156,6 +6156,8 @@ in {
pyrad = callPackage ../development/python-modules/pyrad { };
pyradios = callPackage ../development/python-modules/pyradios { };
py-radix = callPackage ../development/python-modules/py-radix { };
pyramid_beaker = callPackage ../development/python-modules/pyramid_beaker { };