Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-02-17 18:14:04 +00:00
committed by GitHub
123 changed files with 1033 additions and 826 deletions

View File

@@ -3548,6 +3548,8 @@ in {
labelbox = callPackage ../development/python-modules/labelbox { };
labgrid = callPackage ../development/python-modules/labgrid { };
lammps-cython = callPackage ../development/python-modules/lammps-cython { mpi = pkgs.mpi; };
langcodes = callPackage ../development/python-modules/langcodes { };
@@ -6168,6 +6170,8 @@ in {
pytest-httpserver = callPackage ../development/python-modules/pytest-httpserver { };
pytest-httpx = callPackage ../development/python-modules/pytest-httpx { };
pytest-instafail = callPackage ../development/python-modules/pytest-instafail { };
pytest-isort = callPackage ../development/python-modules/pytest-isort { };