Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-03-06 00:38:43 +00:00
committed by GitHub
21 changed files with 170 additions and 32 deletions
+3 -1
View File
@@ -6955,7 +6955,7 @@ in {
retrying = callPackage ../development/python-modules/retrying { };
retworkx = disabledIf (pythonOlder "3.5") (toPythonModule (callPackage ../development/python-modules/retworkx { }));
retworkx = callPackage ../development/python-modules/retworkx { };
rfc3986 = callPackage ../development/python-modules/rfc3986 { };
@@ -6973,6 +6973,8 @@ in {
rig = callPackage ../development/python-modules/rig { };
ring-doorbell = callPackage ../development/python-modules/ring-doorbell { };
ripser = callPackage ../development/python-modules/ripser { };
rising = callPackage ../development/python-modules/rising { };