mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 15:11:25 +00:00
python.pkgs.protobuf3_1: drop
Using the specific version of protobuf can be achieved by a simple `python.pkgs.protobuf.override { protobuf = protobuf3_1; }`.
This commit is contained in:
parent
090bd931e1
commit
b230ad0e29
@ -16,7 +16,10 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ];
|
nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ];
|
||||||
buildInputs = [ libuuid cppunit protobuf3_1 zlib avahi libmicrohttpd python3 ];
|
buildInputs = [ libuuid cppunit protobuf3_1 zlib avahi libmicrohttpd python3 ];
|
||||||
propagatedBuildInputs = [ python3Packages.protobuf3_1 python3Packages.numpy ];
|
propagatedBuildInputs = [
|
||||||
|
(python3Packages.protobuf.override { protobuf = protobuf3_1; })
|
||||||
|
python3Packages.numpy
|
||||||
|
];
|
||||||
|
|
||||||
configureFlags = [ "--enable-python-libs" ];
|
configureFlags = [ "--enable-python-libs" ];
|
||||||
|
|
||||||
|
@ -21679,14 +21679,14 @@ with pkgs;
|
|||||||
inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo;
|
inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo;
|
||||||
};
|
};
|
||||||
|
|
||||||
caffe2 = callPackage ../development/libraries/science/math/caffe2 {
|
caffe2 = callPackage ../development/libraries/science/math/caffe2 (rec {
|
||||||
eigen3 = eigen3_3;
|
eigen3 = eigen3_3;
|
||||||
inherit (python3Packages) python future six numpy pydot;
|
inherit (python3Packages) python future six numpy pydot;
|
||||||
protobuf = protobuf3_1;
|
protobuf = protobuf3_1;
|
||||||
python-protobuf = python3Packages.protobuf3_1;
|
python-protobuf = python3Packages.protobuf.override { inherit protobuf; };
|
||||||
# Used only for image loading.
|
# Used only for image loading.
|
||||||
opencv3 = opencv3WithoutCuda;
|
opencv3 = opencv3WithoutCuda;
|
||||||
};
|
});
|
||||||
|
|
||||||
cntk = callPackage ../applications/science/math/cntk rec {
|
cntk = callPackage ../applications/science/math/cntk rec {
|
||||||
cudaSupport = pkgs.config.cudaSupport or false;
|
cudaSupport = pkgs.config.cudaSupport or false;
|
||||||
|
@ -3771,12 +3771,6 @@ in {
|
|||||||
protobuf = pkgs.protobuf;
|
protobuf = pkgs.protobuf;
|
||||||
};
|
};
|
||||||
|
|
||||||
protobuf3_1 = callPackage ../development/python-modules/protobuf {
|
|
||||||
disabled = isPyPy;
|
|
||||||
doCheck = !isPy3k;
|
|
||||||
protobuf = pkgs.protobuf3_1;
|
|
||||||
};
|
|
||||||
|
|
||||||
psd-tools = callPackage ../development/python-modules/psd-tools { };
|
psd-tools = callPackage ../development/python-modules/psd-tools { };
|
||||||
|
|
||||||
psutil = callPackage ../development/python-modules/psutil { };
|
psutil = callPackage ../development/python-modules/psutil { };
|
||||||
|
Loading…
Reference in New Issue
Block a user