From 31298112f3ce56aa4a240ae2c6fd650bec98e47b Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sun, 9 Dec 2018 22:15:29 -0500 Subject: [PATCH] caffe2: Use python36Packages explicitly. Fallout from 0f38d9669ffd74991b65a9c40cdbcf2a98438d1f --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file 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; });