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
2019-02-18 14:18:04 +01:00
parent 97c05bda52 107215c1d0
commit 815b77cbe6
118 changed files with 9944 additions and 3179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -846,6 +846,8 @@ in {
webapp2 = callPackage ../development/python-modules/webapp2 { };
wrf-python = callPackage ../development/python-modules/wrf-python { };
pyunbound = callPackage ../tools/networking/unbound/python.nix { };
WazeRouteCalculator = callPackage ../development/python-modules/WazeRouteCalculator { };
@@ -1100,11 +1102,10 @@ in {
cached-property = callPackage ../development/python-modules/cached-property { };
caffe = pkgs.caffe.override {
python = self.python;
boost = self.boost;
numpy = self.numpy;
};
caffe = toPythonModule (pkgs.caffe.override {
pythonSupport = true;
inherit (self) python numpy boost;
});
capstone = callPackage ../development/python-modules/capstone { };