Merge branch 'master' into staging-next

This commit is contained in:
Martin Weinelt
2021-02-14 00:40:47 +01:00
24 changed files with 3156 additions and 2572 deletions
-2
View File
@@ -4627,8 +4627,6 @@ in {
ovh = callPackage ../development/python-modules/ovh { };
ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { inherit python; });
owslib = callPackage ../development/python-modules/owslib { };
oyaml = callPackage ../development/python-modules/oyaml { };