diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-09-05 18:11:41 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-09-08 03:40:56 +0300 |
| commit | 6f7b62e0385fcd2b0ee008152ef3395e972bd2a6 (patch) | |
| tree | 30f859278ea918f07b40b890889f8838e80ed415 /pkgs/development | |
| parent | 721aba33b41fab0eebe713b1a9a628e8bcba4657 (diff) | |
| download | nixpkgs-6f7b62e0385fcd2b0ee008152ef3395e972bd2a6.tar nixpkgs-6f7b62e0385fcd2b0ee008152ef3395e972bd2a6.tar.gz nixpkgs-6f7b62e0385fcd2b0ee008152ef3395e972bd2a6.tar.bz2 nixpkgs-6f7b62e0385fcd2b0ee008152ef3395e972bd2a6.tar.lz nixpkgs-6f7b62e0385fcd2b0ee008152ef3395e972bd2a6.tar.xz nixpkgs-6f7b62e0385fcd2b0ee008152ef3395e972bd2a6.tar.zst nixpkgs-6f7b62e0385fcd2b0ee008152ef3395e972bd2a6.zip | |
protobuf: default to 3.4
Diffstat (limited to 'pkgs/development')
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix index e13796229ce..9aea42082c5 100644 --- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix +++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, protobuf3_2, automake +{ stdenv, lib, fetchFromGitHub, pkgconfig, protobuf, automake , autoreconfHook, zlib , enableGrpc ? false }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - protobuf3_2 zlib + protobuf zlib ]; meta = with lib; { diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 69f0ce929d1..f6811b13717 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -8,7 +8,7 @@ , enableJPEG2K ? true, jasper , enableIpp ? false -, enableContrib ? false, protobuf3_1 +, enableContrib ? false, protobuf , enablePython ? false, pythonPackages , enableGtk2 ? false, gtk2 , enableGtk3 ? false, gtk3 @@ -146,7 +146,7 @@ stdenv.mkDerivation rec { # tesseract & leptonica. ++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optionals enableCuda [ cudatoolkit gcc5 ] - ++ lib.optional buildContrib protobuf3_1 + ++ lib.optional buildContrib protobuf ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit ]; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix index e54ed52d9c5..3e58e9e3e03 100644 --- a/pkgs/development/python-modules/keepkey/default.nix +++ b/pkgs/development/python-modules/keepkey/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchPypi, buildPythonPackage, ecdsa -, mnemonic, protobuf3_2, hidapi }: +, mnemonic, protobuf, hidapi }: buildPythonPackage rec { name = "${pname}-${version}"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "14d2r8dlx997ypgma2k8by90acw7i3l7hfq4gar9lcka0lqfj714"; }; - propagatedBuildInputs = [ protobuf3_2 hidapi ]; + propagatedBuildInputs = [ protobuf hidapi ]; buildInputs = [ ecdsa mnemonic ]; diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 72d73022cab..c473403f53d 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, protobuf3_2, hidapi, ecdsa, mnemonic +{ lib, fetchPypi, buildPythonPackage, protobuf, hidapi, ecdsa, mnemonic , requests }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "6bdb69fc125ba705854e21163be6c7da3aa17c2a3a84f40b6d8a3f6e4a8cb314"; }; - propagatedBuildInputs = [ protobuf3_2 hidapi requests ]; + propagatedBuildInputs = [ protobuf hidapi requests ]; buildInputs = [ ecdsa mnemonic ]; |