public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-08-11 10:26:35 +02:00
parent 19699d691c eac5ef8aa9
commit f707715136
533 changed files with 8751 additions and 1547 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+50 -4
View File
@@ -509,7 +509,9 @@ in {
baselines = callPackage ../development/python-modules/baselines { };
bash_kernel = callPackage ../development/python-modules/bash_kernel { };
bash_kernel = callPackage ../development/python-modules/bash_kernel {
inherit (pkgs) bash;
};
bashlex = callPackage ../development/python-modules/bashlex { };
@@ -547,6 +549,8 @@ in {
build = callPackage ../development/python-modules/build { };
bytecode = callPackage ../development/python-modules/bytecode { };
ciso8601 = callPackage ../development/python-modules/ciso8601 { };
deepdiff = callPackage ../development/python-modules/deepdiff { };
@@ -858,6 +862,8 @@ in {
hdmedians = callPackage ../development/python-modules/hdmedians { };
hdlparse = callPackage ../development/python-modules/hdlparse { };
hiyapyco = callPackage ../development/python-modules/hiyapyco { };
hocr-tools = callPackage ../development/python-modules/hocr-tools { };
@@ -924,6 +930,8 @@ in {
kconfiglib = callPackage ../development/python-modules/kconfiglib { };
kinparse = callPackage ../development/python-modules/kinparse { };
labelbox = callPackage ../development/python-modules/labelbox { };
lammps-cython = callPackage ../development/python-modules/lammps-cython {
@@ -1705,6 +1713,8 @@ in {
unifi = callPackage ../development/python-modules/unifi { };
uvcclient = callPackage ../development/python-modules/uvcclient { };
uvloop = callPackage ../development/python-modules/uvloop {
inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices CoreServices;
};
@@ -2460,14 +2470,24 @@ in {
cryptacular = callPackage ../development/python-modules/cryptacular { };
cryptography = callPackage ../development/python-modules/cryptography { };
cryptography = if isPy27 then
callPackage ../development/python-modules/cryptography/2.9.nix { }
else
callPackage ../development/python-modules/cryptography { };
cryptography_vectors = callPackage ../development/python-modules/cryptography/vectors.nix { };
cryptography_vectors = if isPy27 then
callPackage ../development/python-modules/cryptography/vectors-2.9.nix { }
else
callPackage ../development/python-modules/cryptography/vectors.nix { };
curtsies = callPackage ../development/python-modules/curtsies { };
envs = callPackage ../development/python-modules/envs { };
enaml = callPackage ../development/python-modules/enaml { };
enamlx = callPackage ../development/python-modules/enamlx { };
etelemetry = callPackage ../development/python-modules/etelemetry { };
eth-hash = callPackage ../development/python-modules/eth-hash { };
@@ -2739,6 +2759,12 @@ in {
dask = callPackage ../development/python-modules/dask { };
dask-gateway = callPackage ../development/python-modules/dask-gateway { };
dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server {
inherit (pkgs) go;
};
dask-glm = callPackage ../development/python-modules/dask-glm { };
dask-image = callPackage ../development/python-modules/dask-image { };
@@ -2870,6 +2896,8 @@ in {
dockerpty = callPackage ../development/python-modules/dockerpty {};
dockerspawner = callPackage ../development/python-modules/dockerspawner {};
docker_pycreds = callPackage ../development/python-modules/docker-pycreds {};
docloud = callPackage ../development/python-modules/docloud { };
@@ -3281,6 +3309,8 @@ in {
jupyter = callPackage ../development/python-modules/jupyter { };
jupyter-c-kernel = callPackage ../development/python-modules/jupyter-c-kernel { };
jupyter_console = if pythonOlder "3.5" then
callPackage ../development/python-modules/jupyter_console/5.nix { }
else
@@ -4457,10 +4487,16 @@ in {
pkgs-docker = pkgs.docker;
};
jupyter-telemetry = callPackage ../development/python-modules/jupyter-telemetry { };
jupyterhub = callPackage ../development/python-modules/jupyterhub { };
jupyterhub-ldapauthenticator = callPackage ../development/python-modules/jupyterhub-ldapauthenticator { };
jupyterhub-systemdspawner = callPackage ../development/python-modules/jupyterhub-systemdspawner {
inherit (pkgs) bash;
};
kaggle = callPackage ../development/python-modules/kaggle { };
keyring = if isPy3k then
@@ -4953,6 +4989,10 @@ in {
nitime = callPackage ../development/python-modules/nitime { };
nix-kernel = callPackage ../development/python-modules/nix-kernel {
inherit (pkgs) nix;
};
nixpkgs = callPackage ../development/python-modules/nixpkgs { };
nixpkgs-pytools = callPackage ../development/python-modules/nixpkgs-pytools { };
@@ -5376,7 +5416,9 @@ in {
protobuf = callPackage ../development/python-modules/protobuf {
disabled = isPyPy;
doCheck = !isPy3k;
protobuf = pkgs.protobuf3_12;
# If a protobuf upgrade causes many Python packages to fail, please pin it
# here to the previous version.
protobuf = pkgs.protobuf;
};
psd-tools = callPackage ../development/python-modules/psd-tools { };
@@ -5437,6 +5479,8 @@ in {
babelgladeextractor = callPackage ../development/python-modules/babelgladeextractor { };
batchspawner = callPackage ../development/python-modules/batchspawner { };
pybfd = callPackage ../development/python-modules/pybfd { };
pybigwig = callPackage ../development/python-modules/pybigwig { };
@@ -5831,6 +5875,8 @@ in {
qtpy = callPackage ../development/python-modules/qtpy { };
qreactor = callPackage ../development/python-modules/qreactor { };
quantities = callPackage ../development/python-modules/quantities { };
qutip = callPackage ../development/python-modules/qutip { };