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

protobuf: default to 3.4

This commit is contained in:
Nikolay Amiantov 2017-09-05 18:11:41 +03:00
parent 721aba33b4
commit 6f7b62e038
11 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/electrum-dash/default.nix
View File

@ -13,7 +13,7 @@ python2Packages.buildPythonApplication rec {
dns dns
ecdsa ecdsa
pbkdf2 pbkdf2
protobuf3_2 protobuf
pyasn1 pyasn1
pyasn1-modules pyasn1-modules
pycrypto pycrypto

2
pkgs/applications/misc/electrum-ltc/default.nix
View File

@ -20,7 +20,7 @@ python2Packages.buildPythonApplication rec {
requests requests
qrcode qrcode
ltc_scrypt ltc_scrypt
protobuf3_2 protobuf
dns dns
jsonrpclib jsonrpclib
]; ];

2
pkgs/applications/misc/electrum/default.nix
View File

@ -14,7 +14,7 @@ python2Packages.buildPythonApplication rec {
ecdsa ecdsa
jsonrpclib jsonrpclib
pbkdf2 pbkdf2
protobuf3_2 protobuf
pyaes pyaes
pycrypto pycrypto
pyqt4 pyqt4

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

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ]; nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ];
buildInputs = [ libuuid cppunit protobuf zlib avahi libmicrohttpd python3 ]; buildInputs = [ libuuid cppunit protobuf zlib avahi libmicrohttpd python3 ];
propagatedBuildInputs = with python3Packages; [ protobuf3_2 numpy ]; propagatedBuildInputs = with python3Packages; [ protobuf numpy ];
configureFlags = [ "--enable-python-libs" ]; configureFlags = [ "--enable-python-libs" ];

4
pkgs/development/libraries/lightstep-tracer-cpp/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, protobuf3_2, automake { stdenv, lib, fetchFromGitHub, pkgconfig, protobuf, automake
, autoreconfHook, zlib , autoreconfHook, zlib
, enableGrpc ? false , enableGrpc ? false
}: }:
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
protobuf3_2 zlib protobuf zlib
]; ];
meta = with lib; { meta = with lib; {

4
pkgs/development/libraries/opencv/3.x.nix
View File

@ -8,7 +8,7 @@
, enableJPEG2K ? true, jasper , enableJPEG2K ? true, jasper
, enableIpp ? false , enableIpp ? false
, enableContrib ? false, protobuf3_1 , enableContrib ? false, protobuf
, enablePython ? false, pythonPackages , enablePython ? false, pythonPackages
, enableGtk2 ? false, gtk2 , enableGtk2 ? false, gtk2
, enableGtk3 ? false, gtk3 , enableGtk3 ? false, gtk3
@ -146,7 +146,7 @@ stdenv.mkDerivation rec {
# tesseract & leptonica. # tesseract & leptonica.
++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optionals enableTesseract [ tesseract leptonica ]
++ lib.optionals enableCuda [ cudatoolkit gcc5 ] ++ lib.optionals enableCuda [ cudatoolkit gcc5 ]
++ lib.optional buildContrib protobuf3_1 ++ lib.optional buildContrib protobuf
++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit ]; ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit ];
propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy; propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;

4
pkgs/development/python-modules/keepkey/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchPypi, buildPythonPackage, ecdsa { stdenv, fetchPypi, buildPythonPackage, ecdsa
, mnemonic, protobuf3_2, hidapi }: , mnemonic, protobuf, hidapi }:
buildPythonPackage rec { buildPythonPackage rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -11,7 +11,7 @@ buildPythonPackage rec {
sha256 = "14d2r8dlx997ypgma2k8by90acw7i3l7hfq4gar9lcka0lqfj714"; sha256 = "14d2r8dlx997ypgma2k8by90acw7i3l7hfq4gar9lcka0lqfj714";
}; };
propagatedBuildInputs = [ protobuf3_2 hidapi ]; propagatedBuildInputs = [ protobuf hidapi ];
buildInputs = [ ecdsa mnemonic ]; buildInputs = [ ecdsa mnemonic ];

4
pkgs/development/python-modules/trezor/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchPypi, buildPythonPackage, protobuf3_2, hidapi, ecdsa, mnemonic { lib, fetchPypi, buildPythonPackage, protobuf, hidapi, ecdsa, mnemonic
, requests , requests
}: }:
@ -12,7 +12,7 @@ buildPythonPackage rec {
sha256 = "6bdb69fc125ba705854e21163be6c7da3aa17c2a3a84f40b6d8a3f6e4a8cb314"; sha256 = "6bdb69fc125ba705854e21163be6c7da3aa17c2a3a84f40b6d8a3f6e4a8cb314";
}; };
propagatedBuildInputs = [ protobuf3_2 hidapi requests ]; propagatedBuildInputs = [ protobuf hidapi requests ];
buildInputs = [ ecdsa mnemonic ]; buildInputs = [ ecdsa mnemonic ];

6
pkgs/tools/networking/envoy/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, bazel, c-ares, backward-cpp { stdenv, lib, fetchFromGitHub, pkgconfig, bazel, c-ares, backward-cpp
, libevent, gtest, gperftools, http-parser, lightstep-tracer-cpp , libevent, gtest, gperftools, http-parser, lightstep-tracer-cpp
, nghttp2, protobuf3_2, tclap, rapidjson, spdlog, boringssl, buildEnv , nghttp2, protobuf, tclap, rapidjson, spdlog, boringssl, buildEnv
}: }:
let let
@ -85,7 +85,7 @@ let
}; };
protobuf = { protobuf = {
pkg = protobuf3_2; pkg = protobuf;
srcs = ''glob(["lib/libproto*.so"])''; srcs = ''glob(["lib/libproto*.so"])'';
hdrs = ''glob(["include/google/protobuf/**/*.h"])''; hdrs = ''glob(["include/google/protobuf/**/*.h"])'';
includes = ''["include"]''; includes = ''["include"]'';
@ -201,7 +201,7 @@ let
http-parser http-parser
lightstep-tracer-cpp lightstep-tracer-cpp
nghttp2 nghttp2
protobuf3_2 protobuf
tclap tclap
rapidjson rapidjson
spdlog spdlog

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

@ -1451,7 +1451,7 @@ with pkgs;
clangStdenv = libcxxStdenv; # workaround for https://github.com/NixOS/nixpkgs/issues/28223 clangStdenv = libcxxStdenv; # workaround for https://github.com/NixOS/nixpkgs/issues/28223
python = python2; python = python2;
inherit (python2Packages) gyp; inherit (python2Packages) gyp;
protobuf = protobuf3_2.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });
}; };
table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { table = callPackage ../tools/inputmethods/ibus-engines/ibus-table {
@ -1938,7 +1938,7 @@ with pkgs;
clangStdenv = libcxxStdenv; # workaround for https://github.com/NixOS/nixpkgs/issues/28223 clangStdenv = libcxxStdenv; # workaround for https://github.com/NixOS/nixpkgs/issues/28223
python = python2; python = python2;
inherit (python2Packages) gyp; inherit (python2Packages) gyp;
protobuf = protobuf3_2.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });
}; };
table-other = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-other { }; table-other = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-other { };
@ -9987,7 +9987,7 @@ with pkgs;
postgis = callPackage ../development/libraries/postgis { }; postgis = callPackage ../development/libraries/postgis { };
protobuf = protobuf2_6; protobuf = protobuf3_4;
protobuf3_0 = lowPrio (callPackage ../development/libraries/protobuf/3.0.nix { }); protobuf3_0 = lowPrio (callPackage ../development/libraries/protobuf/3.0.nix { });
protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { }; protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { };
protobuf3_2 = callPackage ../development/libraries/protobuf/3.2.nix { }; protobuf3_2 = callPackage ../development/libraries/protobuf/3.2.nix { };

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

@ -228,9 +228,7 @@ in {
pycryptodomex = callPackage ../development/python-modules/pycryptodomex { }; pycryptodomex = callPackage ../development/python-modules/pycryptodomex { };
PyChromecast = callPackage ../development/python-modules/pychromecast { PyChromecast = callPackage ../development/python-modules/pychromecast { };
protobuf = self.protobuf3_2;
};
pyexiv2 = if (!isPy3k) then callPackage ../development/python-modules/pyexiv2 {} else throw "pyexiv2 not supported for interpreter ${python.executable}"; pyexiv2 = if (!isPy3k) then callPackage ../development/python-modules/pyexiv2 {} else throw "pyexiv2 not supported for interpreter ${python.executable}";
@ -5917,7 +5915,7 @@ in {
validictory validictory
decorator decorator
mutagen mutagen
protobuf3_0 protobuf
setuptools setuptools
requests requests
dateutil dateutil
@ -7537,7 +7535,7 @@ in {
sha256 = "09bf5gfip9x2wr0ij43p39ac6z2iqzn7kgpi2jjbwpnhs0vwkycs"; sha256 = "09bf5gfip9x2wr0ij43p39ac6z2iqzn7kgpi2jjbwpnhs0vwkycs";
}; };
propagatedBuildInputs = with self; [ python-axolotl-curve25519 protobuf3_0 pycrypto ]; propagatedBuildInputs = with self; [ python-axolotl-curve25519 protobuf pycrypto ];
# IV == 0 in tests is not supported by pycrytpodom (our pycrypto drop-in) # IV == 0 in tests is not supported by pycrytpodom (our pycrypto drop-in)
doCheck = !isPy3k; doCheck = !isPy3k;
@ -16343,8 +16341,7 @@ in {
}); });
protobuf = self.protobuf2_6; protobuf = self.protobuf3_4;
# only required by tensorflow
protobuf3_4 = callPackage ../development/python-modules/protobuf.nix { protobuf3_4 = callPackage ../development/python-modules/protobuf.nix {
disabled = isPyPy; disabled = isPyPy;
doCheck = !isPy3k; doCheck = !isPy3k;
@ -23898,9 +23895,7 @@ EOF
inherit (pkgs) libasyncns pkgconfig; inherit (pkgs) libasyncns pkgconfig;
}; };
libarcus = callPackage ../development/python-modules/libarcus { libarcus = callPackage ../development/python-modules/libarcus { };
protobuf = self.protobuf3_0;
};
pybrowserid = buildPythonPackage rec { pybrowserid = buildPythonPackage rec {
name = "PyBrowserID-${version}"; name = "PyBrowserID-${version}";
@ -24182,7 +24177,7 @@ EOF
''; '';
buildInputs = with self; [ nose ]; buildInputs = with self; [ nose ];
propagatedBuildInputs = with self; [ noise numpy pyplatec protobuf3_2 purepng argparse h5py gdal ]; propagatedBuildInputs = with self; [ noise numpy pyplatec protobuf purepng argparse h5py gdal ];
prePatch = '' prePatch = ''
substituteInPlace setup.py \ substituteInPlace setup.py \