diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2018-12-09 22:15:29 -0500 |
|---|---|---|
| committer | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2018-12-11 11:31:15 +0100 |
| commit | 31298112f3ce56aa4a240ae2c6fd650bec98e47b (patch) | |
| tree | 52b9ebc1c89ddeb2f2e9668250c0bfa90a137bde /pkgs/top-level/all-packages.nix | |
| parent | f9b16e60daa083496a640a062b4b552cf185ae92 (diff) | |
| download | nixpkgs-31298112f3ce56aa4a240ae2c6fd650bec98e47b.tar nixpkgs-31298112f3ce56aa4a240ae2c6fd650bec98e47b.tar.gz nixpkgs-31298112f3ce56aa4a240ae2c6fd650bec98e47b.tar.bz2 nixpkgs-31298112f3ce56aa4a240ae2c6fd650bec98e47b.tar.lz nixpkgs-31298112f3ce56aa4a240ae2c6fd650bec98e47b.tar.xz nixpkgs-31298112f3ce56aa4a240ae2c6fd650bec98e47b.tar.zst nixpkgs-31298112f3ce56aa4a240ae2c6fd650bec98e47b.zip | |
caffe2: Use python36Packages explicitly.
Fallout from 0f38d9669ffd74991b65a9c40cdbcf2a98438d1f
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ddb4755c32..6b63bd55e4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }); |