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-12-31 12:00:36 +01:00
parent ec1f78d1cb 42575040fc
commit 070290bda7
172 changed files with 2734 additions and 2541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/top-level/python-packages.nix
View File

@@ -615,6 +615,13 @@ in {
pythonPackages = self;
};
/*
`pyqt5_with_qtwebkit` should not be used by python libraries in
pkgs/development/python-modules/*. Putting this attribute in
`propagatedBuildInputs` may cause collisions.
*/
pyqt5_with_qtwebkit = self.pyqt5.override { withWebKit = true; };
pysc2 = callPackage ../development/python-modules/pysc2 { };
pyscard = callPackage ../development/python-modules/pyscard { inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; };
@@ -2416,6 +2423,10 @@ in {
cudaSupport = pkgs.config.cudaSupport or false;
};
pyro-ppl = callPackage ../development/python-modules/pyro-ppl {};
opt-einsum = callPackage ../development/python-modules/opt-einsum {};
pytorchWithCuda = self.pytorch.override {
cudaSupport = true;
};
@@ -3226,6 +3237,8 @@ in {
ordereddict = callPackage ../development/python-modules/ordereddict { };
od = callPackage ../development/python-modules/od { };
orderedset = callPackage ../development/python-modules/orderedset { };
python-otr = callPackage ../development/python-modules/python-otr { };
@@ -4060,6 +4073,8 @@ in {
update_checker = callPackage ../development/python-modules/update_checker {};
update-copyright = callPackage ../development/python-modules/update-copyright {};
uritemplate = callPackage ../development/python-modules/uritemplate { };
uproot = callPackage ../development/python-modules/uproot {};
@@ -4382,6 +4397,8 @@ in {
unicodecsv = callPackage ../development/python-modules/unicodecsv { };
unidiff = callPackage ../development/python-modules/unidiff { };
unittest2 = callPackage ../development/python-modules/unittest2 { };
unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { };
@@ -5090,6 +5107,8 @@ in {
simpy = callPackage ../development/python-modules/simpy { };
x256 = callPackage ../development/python-modules/x256 { };
yattag = callPackage ../development/python-modules/yattag { };
z3 = (toPythonModule (pkgs.z3.override {