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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-03-28 21:15:15 +01:00
parent 48a137da73 7f4e4b279e
commit a36be028f5
639 changed files with 13721 additions and 10162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+38 -4
View File
@@ -492,6 +492,8 @@ in {
backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {};
bacpypes = callPackage ../development/python-modules/bacpypes {};
bap = callPackage ../development/python-modules/bap {
bap = pkgs.ocaml-ng.ocamlPackages_4_06.bap;
};
@@ -518,10 +520,14 @@ in {
boltons = callPackage ../development/python-modules/boltons { };
bravia-tv = callPackage ../development/python-modules/bravia-tv { };
braintree = callPackage ../development/python-modules/braintree { };
breezy = callPackage ../development/python-modules/breezy { };
ciso8601 = callPackage ../development/python-modules/ciso8601 { };
deepdiff = callPackage ../development/python-modules/deepdiff { };
django-sesame = callPackage ../development/python-modules/django-sesame { };
@@ -632,6 +638,8 @@ in {
diofant = callPackage ../development/python-modules/diofant { };
dipy = callPackage ../development/python-modules/dipy { };
docrep = callPackage ../development/python-modules/docrep { };
dominate = callPackage ../development/python-modules/dominate { };
@@ -913,6 +921,8 @@ in {
mpi = pkgs.openmpi;
};
pycognito = callPackage ../development/python-modules/pycognito { };
python-mpv-jsonipc = callPackage ../development/python-modules/python-mpv-jsonipc { };
msal = callPackage ../development/python-modules/msal { };
@@ -1305,6 +1315,8 @@ in {
pytest-tornado = callPackage ../development/python-modules/pytest-tornado { };
pytest-twisted = callPackage ../development/python-modules/pytest-twisted { };
pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { };
pytest-xvfb = callPackage ../development/python-modules/pytest-xvfb { };
@@ -2259,6 +2271,11 @@ in {
eth-utils = callPackage ../development/python-modules/eth-utils { };
gwyddion = disabledIf isPy3k (toPythonModule (pkgs.gwyddion.override {
pythonSupport = true;
pythonPackages = self;
}));
impacket = callPackage ../development/python-modules/impacket { };
jsonlines = callPackage ../development/python-modules/jsonlines { };
@@ -2271,6 +2288,10 @@ in {
jsonrpc-websocket = callPackage ../development/python-modules/jsonrpc-websocket { };
hepmc3 = toPythonModule (pkgs.hepmc3.override {
inherit python;
});
onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { };
tablib = callPackage ../development/python-modules/tablib { };
@@ -2362,8 +2383,6 @@ in {
pyhcl = callPackage ../development/python-modules/pyhcl { };
pyhepmc = callPackage ../development/python-modules/pyhepmc { };
pytest = if isPy3k then self.pytest_5 else self.pytest_4;
pytest_5 = callPackage ../development/python-modules/pytest {
@@ -2408,12 +2427,14 @@ in {
pytest-doctestplus = callPackage ../development/python-modules/pytest-doctestplus { };
pytest-faulthandler = callPackage ../development/python-modules/pytest-faulthandler { };
pytest-fixture-config = callPackage ../development/python-modules/pytest-fixture-config { };
pytest-forked = callPackage ../development/python-modules/pytest-forked { };
pytest-html = callPackage ../development/python-modules/pytest-html { };
pytest-metadata = callPackage ../development/python-modules/pytest-metadata { };
pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { };
pytest-relaxed = callPackage ../development/python-modules/pytest-relaxed { };
@@ -2526,6 +2547,7 @@ in {
libfdt = toPythonModule (pkgs.dtc.override {
inherit python;
pythonSupport = true;
});
libtmux = callPackage ../development/python-modules/libtmux { };
@@ -3948,6 +3970,8 @@ in {
colored = callPackage ../development/python-modules/colored { };
xdg = callPackage ../development/python-modules/xdg { };
xdis = callPackage ../development/python-modules/xdis { };
xnd = callPackage ../development/python-modules/xnd { };
@@ -4765,6 +4789,8 @@ in {
patch = callPackage ../development/python-modules/patch { };
patch-ng = callPackage ../development/python-modules/patch-ng { };
pathos = callPackage ../development/python-modules/pathos { };
patsy = callPackage ../development/python-modules/patsy { };
@@ -5075,6 +5101,8 @@ in {
pylint-plugin-utils = callPackage ../development/python-modules/pylint-plugin-utils { };
pymumble = callPackage ../development/python-modules/pymumble { };
pyomo = callPackage ../development/python-modules/pyomo { };
pyopencl = callPackage ../development/python-modules/pyopencl { };
@@ -5203,6 +5231,8 @@ in {
progressbar33 = callPackage ../development/python-modules/progressbar33 { };
protego = callPackage ../development/python-modules/protego {};
ldap = callPackage ../development/python-modules/ldap {
inherit (pkgs) openldap cyrus_sasl;
};
@@ -7051,6 +7081,10 @@ in {
qiskit = callPackage ../development/python-modules/qiskit { };
qiskit-aer = callPackage ../development/python-modules/qiskit-aer { };
qiskit-ibmq-provider = callPackage ../development/python-modules/qiskit-ibmq-provider { };
qiskit-terra = callPackage ../development/python-modules/qiskit-terra { };
qasm2image = callPackage ../development/python-modules/qasm2image { };