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

python.pkgs.protobuf3_1: drop

Browse Source 
Using the specific version of protobuf can be achieved by a simple
`python.pkgs.protobuf.override { protobuf = protobuf3_1; }`.
This commit is contained in:
Robert Schütz 2018-11-10 13:35:29 +01:00
parent 090bd931e1
commit b230ad0e29
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/misc/ola/default.nix
View File

@ -16,7 +16,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ];
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" ];

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

@ -21679,14 +21679,14 @@ with pkgs;
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;
inherit (python3Packages) python future six numpy pydot;
protobuf = protobuf3_1;
python-protobuf = python3Packages.protobuf3_1;
python-protobuf = python3Packages.protobuf.override { inherit protobuf; };
# Used only for image loading.
opencv3 = opencv3WithoutCuda;
};
});
cntk = callPackage ../applications/science/math/cntk rec {
cudaSupport = pkgs.config.cudaSupport or false;

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

@ -3771,12 +3771,6 @@ in {
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 { };
psutil = callPackage ../development/python-modules/psutil { };