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

Merge pull request #51809 from samueldr/fix/caffe2-python36

Browse Source 
[WIP] caffe2: Use python36Packages explicitly.
This commit is contained in:
Robert Schütz 2018-12-11 14:59:16 +01:00 committed by GitHub
commit 4a6367e262
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/python-modules/protobuf/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchpatch, python, buildPythonPackage
{ stdenv, fetchpatch, python, buildPythonPackage, isPy37
, protobuf, google_apputils, pyext, libcxx
, disabled, doCheck ? true }:
@ -16,14 +16,14 @@ buildPythonPackage rec {
propagatedBuildInputs = [ protobuf google_apputils ];
buildInputs = [ google_apputils pyext ];
patches = [
patches = optional isPy37
# Python 3.7 compatibility (remove when protobuf 3.7 is released)
(fetchpatch {
url = "https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch";
sha256 = "09hw22y3423v8bbmc9xm07znwdxfbya6rp78d4zqw6fisdvjkqf1";
stripLen = 1;
})
];
;
prePatch = ''
while [ ! -d python ]; do

4
pkgs/top-level/all-packages.nix
View File

@ -21800,9 +21800,9 @@ in
};
caffe2 = callPackage ../development/libraries/science/math/caffe2 (rec {
inherit (python3Packages) python future six numpy pydot;
inherit (python36Packages) python future six numpy pydot;
protobuf = protobuf3_1;
python-protobuf = python3Packages.protobuf.override { inherit protobuf; };
python-protobuf = python36Packages.protobuf.override { inherit protobuf; };
# Used only for image loading.
opencv3 = opencv3WithoutCuda;
});