Merge branch 'master' into staging-next

This commit is contained in:
Martin Weinelt
2021-03-21 02:22:36 +01:00
committed by GitHub
88 changed files with 2381 additions and 1075 deletions
+22
View File
@@ -302,6 +302,8 @@ in {
aionotify = callPackage ../development/python-modules/aionotify { };
aionotion = callPackage ../development/python-modules/aionotion { };
aioprocessing = callPackage ../development/python-modules/aioprocessing { };
aiopulse = callPackage ../development/python-modules/aiopulse { };
@@ -1422,6 +1424,10 @@ in {
cmdtest = callPackage ../development/python-modules/cmdtest { };
cmigemo = callPackage ../development/python-modules/cmigemo {
inherit (pkgs) cmigemo;
};
cmsis-svd = callPackage ../development/python-modules/cmsis-svd { };
cntk = callPackage ../development/python-modules/cntk { };
@@ -1843,6 +1849,8 @@ in {
django-cache-url = callPackage ../development/python-modules/django-cache-url { };
django-cacheops = callPackage ../development/python-modules/django-cacheops { };
django_classytags = callPackage ../development/python-modules/django_classytags { };
django-cleanup = callPackage ../development/python-modules/django-cleanup { };
@@ -3565,6 +3573,8 @@ in {
jupyter_core = callPackage ../development/python-modules/jupyter_core { };
jupyter_server = callPackage ../development/python-modules/jupyter_server { };
jupyterhub = callPackage ../development/python-modules/jupyterhub { };
jupyterhub-ldapauthenticator = callPackage ../development/python-modules/jupyterhub-ldapauthenticator { };
@@ -3583,6 +3593,8 @@ in {
jupyterlab_server = callPackage ../development/python-modules/jupyterlab_server { };
jupyter-packaging = callPackage ../development/python-modules/jupyter-packaging { };
jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker {
pkgs-docker = pkgs.docker;
};
@@ -4365,6 +4377,8 @@ in {
mpi4py = callPackage ../development/python-modules/mpi4py { };
mplfinance = callPackage ../development/python-modules/mplfinance { };
mplleaflet = callPackage ../development/python-modules/mplleaflet { };
mpmath = callPackage ../development/python-modules/mpmath { };
@@ -4486,6 +4500,8 @@ in {
naturalsort = callPackage ../development/python-modules/naturalsort { };
nbclassic = callPackage ../development/python-modules/nbclassic { };
nbclient = callPackage ../development/python-modules/nbclient { };
nbconflux = callPackage ../development/python-modules/nbconflux { };
@@ -4838,6 +4854,8 @@ in {
oyaml = callPackage ../development/python-modules/oyaml { };
packageurl-python = callPackage ../development/python-modules/packageurl-python { };
packaging = if isPy3k
then callPackage ../development/python-modules/packaging { }
else callPackage ../development/python-modules/packaging/2.nix { };
@@ -5587,6 +5605,8 @@ in {
pydantic = callPackage ../development/python-modules/pydantic { };
pydash = callPackage ../development/python-modules/pydash { };
pydbus = callPackage ../development/python-modules/pydbus { };
pydenticon = callPackage ../development/python-modules/pydenticon { };
@@ -7629,6 +7649,8 @@ in {
simple-websocket-server = callPackage ../development/python-modules/simple-websocket-server { };
simplisafe-python = callPackage ../development/python-modules/simplisafe-python { };
simpy = callPackage ../development/python-modules/simpy { };
singledispatch = callPackage ../development/python-modules/singledispatch { };