Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-04-04 00:20:45 +00:00
committed by GitHub
18 changed files with 197 additions and 106 deletions
+2
View File
@@ -6927,6 +6927,8 @@ in {
pytun = callPackage ../development/python-modules/pytun { };
pyturbojpeg = callPackage ../development/python-modules/pyturbojpeg { };
pytz = callPackage ../development/python-modules/pytz { };
pytzdata = callPackage ../development/python-modules/pytzdata { };