Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-03-24 18:10:39 +00:00
committed by GitHub
32 changed files with 207 additions and 98 deletions
+1 -3
View File
@@ -4716,8 +4716,6 @@ in {
numpy-stl = callPackage ../development/python-modules/numpy-stl { };
numtraits = callPackage ../development/python-modules/numtraits { };
nunavut = callPackage ../development/python-modules/nunavut { };
nvchecker = callPackage ../development/python-modules/nvchecker { };
@@ -7877,7 +7875,7 @@ in {
sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { };
sphinx-autobuild = callPackage ../development/python-modules/sphinx-argparse { };
sphinx-autobuild = callPackage ../development/python-modules/sphinx-autobuild { };
sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { };