Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-05-11 06:20:33 +00:00
committed by GitHub
57 changed files with 533 additions and 339 deletions
+4
View File
@@ -5416,6 +5416,10 @@ in {
pycfdns = callPackage ../development/python-modules/pycfdns { };
pycflow2dot = callPackage ../development/python-modules/pycflow2dot {
inherit (pkgs) graphviz;
};
pychannels = callPackage ../development/python-modules/pychannels { };
pychart = callPackage ../development/python-modules/pychart { };