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

Merge pull request #29134 from abbradar/protobuf

Browse Source 
Update protobuf and remove old versions
This commit is contained in:
Frederik Rietdijk
2017-09-09 09:27:10 +02:00
committed by GitHub
parent 79770136ff 1f2a18d916
commit 6589ee83c2
23 changed files with 54 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+10 -28
View File
@@ -227,9 +227,7 @@ in {
pycryptodomex = callPackage ../development/python-modules/pycryptodomex { };
PyChromecast = callPackage ../development/python-modules/pychromecast {
protobuf = self.protobuf3_2;
};
PyChromecast = callPackage ../development/python-modules/pychromecast { };
pyexiv2 = if (!isPy3k) then callPackage ../development/python-modules/pyexiv2 {} else throw "pyexiv2 not supported for interpreter ${python.executable}";
@@ -5901,7 +5899,7 @@ in {
validictory
decorator
mutagen
protobuf3_0
protobuf
setuptools
requests
dateutil
@@ -7521,7 +7519,7 @@ in {
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)
doCheck = !isPy3k;
@@ -16327,30 +16325,16 @@ in {
});
protobuf = self.protobuf2_6;
protobuf3_3 = callPackage ../development/python-modules/protobuf.nix {
protobuf = callPackage ../development/python-modules/protobuf.nix {
disabled = isPyPy;
doCheck = !isPy3k;
protobuf = pkgs.protobuf3_3;
protobuf = pkgs.protobuf;
};
protobuf3_2 = callPackage ../development/python-modules/protobuf.nix {
protobuf3_1 = callPackage ../development/python-modules/protobuf.nix {
disabled = isPyPy;
doCheck = !isPy3k;
protobuf = pkgs.protobuf3_2;
};
protobuf3_0 = callPackage ../development/python-modules/protobuf.nix {
disabled = isPyPy;
doCheck = !isPy3k;
protobuf = pkgs.protobuf3_0;
};
protobuf2_6 = callPackage ../development/python-modules/protobuf.nix {
disabled = isPy3k || isPyPy;
doCheck = false;
protobuf = pkgs.protobuf2_6;
};
protobuf2_5 = callPackage ../development/python-modules/protobuf.nix {
disabled = isPy3k || isPyPy;
protobuf = pkgs.protobuf2_5;
protobuf = pkgs.protobuf3_1;
};
psd-tools = callPackage ../development/python-modules/psd-tools { };
@@ -23876,9 +23860,7 @@ EOF
inherit (pkgs) libasyncns pkgconfig;
};
libarcus = callPackage ../development/python-modules/libarcus {
protobuf = self.protobuf3_0;
};
libarcus = callPackage ../development/python-modules/libarcus { };
pybrowserid = buildPythonPackage rec {
name = "PyBrowserID-${version}";
@@ -24160,7 +24142,7 @@ EOF
'';
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 = ''
substituteInPlace setup.py \