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
2018-11-24 10:43:33 +01:00
parent 90720d0139 25c562e451
commit e41154d1ab
92 changed files with 1146 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+10 -2
View File
@@ -412,6 +412,8 @@ in {
mpi = pkgs.openmpi;
};
libmr = callPackage ../development/python-modules/libmr { };
lmtpd = callPackage ../development/python-modules/lmtpd { };
logster = callPackage ../development/python-modules/logster { };
@@ -609,6 +611,8 @@ in {
pystache = callPackage ../development/python-modules/pystache { };
pytesseract = callPackage ../development/python-modules/pytesseract { };
pytest-tornado = callPackage ../development/python-modules/pytest-tornado { };
python-binance = callPackage ../development/python-modules/python-binance { };
@@ -1345,10 +1349,10 @@ in {
pytest = self.pytest_39;
pytest_39 = callPackage ../development/python-modules/pytest {
inherit (callPackage ../development/python-modules/pytest {
# hypothesis tests require pytest that causes dependency cycle
hypothesis = self.hypothesis.override { doCheck = false; };
};
}) pytest_39 pytest_37;
pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { };
@@ -4991,6 +4995,10 @@ in {
scour = callPackage ../development/python-modules/scour { };
pymssql = callPackage ../development/python-modules/pymssql { };
nanoleaf = callPackage ../development/python-modules/nanoleaf { };
});
in fix' (extends overrides packages)