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

Merge branch 'staging-next' into staging

Browse Source 
In python-packages.nix, resolve conflict between 50d604314e and 187d0371ab.
This commit is contained in:
Jan Tojnar
2021-04-08 17:14:31 +02:00
parent 97490e6783 bf6abedefb
commit 625ce6c7f6
112 changed files with 2577 additions and 1772 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+25 -1
View File
@@ -237,6 +237,8 @@ in {
aiocontextvars = callPackage ../development/python-modules/aiocontextvars { };
aiodiscover = callPackage ../development/python-modules/aiodiscover { };
aiodns = callPackage ../development/python-modules/aiodns { };
aioeafm = callPackage ../development/python-modules/aioeafm { };
@@ -525,6 +527,8 @@ in {
async_generator = callPackage ../development/python-modules/async_generator { };
async-dns = callPackage ../development/python-modules/async-dns { };
asyncio-dgram = callPackage ../development/python-modules/asyncio-dgram { };
asyncio-mqtt = callPackage ../development/python-modules/asyncio_mqtt { };
@@ -635,6 +639,8 @@ in {
awsiotpythonsdk = callPackage ../development/python-modules/awsiotpythonsdk { };
awslambdaric = callPackage ../development/python-modules/awslambdaric { };
axis = callPackage ../development/python-modules/axis { };
azure-appconfiguration = callPackage ../development/python-modules/azure-appconfiguration { };
@@ -2959,6 +2965,8 @@ in {
homeassistant-pyozw = callPackage ../development/python-modules/homeassistant-pyozw { };
homepluscontrol = callPackage ../development/python-modules/homepluscontrol { };
hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue {
inherit python;
});
@@ -3775,6 +3783,8 @@ in {
lmtpd = callPackage ../development/python-modules/lmtpd { };
localimport = callPackage ../development/python-modules/localimport { };
localzone = callPackage ../development/python-modules/localzone { };
locket = callPackage ../development/python-modules/locket { };
@@ -3873,6 +3883,8 @@ in {
mail-parser = callPackage ../development/python-modules/mail-parser { };
makefun = callPackage ../development/python-modules/makefun { };
Mako = callPackage ../development/python-modules/Mako { };
managesieve = callPackage ../development/python-modules/managesieve { };
@@ -4319,6 +4331,8 @@ in {
nodeenv = callPackage ../development/python-modules/nodeenv { };
nodepy-runtime = callPackage ../development/python-modules/nodepy-runtime { };
node-semver = callPackage ../development/python-modules/node-semver { };
noise = callPackage ../development/python-modules/noise { };
@@ -6117,6 +6131,8 @@ in {
pytest-quickcheck = self.pytestquickcheck;
pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { };
pytest-raises = callPackage ../development/python-modules/pytest-raises { };
pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { };
pytest-randomly = callPackage ../development/python-modules/pytest-randomly { };
@@ -6849,6 +6865,8 @@ in {
roombapy = callPackage ../development/python-modules/roombapy { };
ronin = callPackage ../development/python-modules/ronin { };
rope = callPackage ../development/python-modules/rope { };
ROPGadget = callPackage ../development/python-modules/ROPGadget { };
@@ -7016,6 +7034,8 @@ in {
screeninfo = callPackage ../development/python-modules/screeninfo { };
screenlogicpy = callPackage ../development/python-modules/screenlogicpy { };
scripttest = callPackage ../development/python-modules/scripttest { };
scs = callPackage ../development/python-modules/scs { scs = pkgs.scs; };
@@ -7550,7 +7570,9 @@ in {
tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { };
tables = callPackage ../development/python-modules/tables { };
tables = callPackage ../development/python-modules/tables {
hdf5 = pkgs.hdf5_1_10;
};
tablib = callPackage ../development/python-modules/tablib { };
@@ -8406,6 +8428,8 @@ in {
yalesmartalarmclient = callPackage ../development/python-modules/yalesmartalarmclient { };
yalexs = callPackage ../development/python-modules/yalexs { };
yamale = callPackage ../development/python-modules/yamale { };
yamllint = callPackage ../development/python-modules/yamllint { };