pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #193416 from mweinelt/protobuffery

authored by

Martin Weinelt and committed by
GitHub 4539b695 18b770c0

+18 -12
unified split
+4
pkgs/development/python-modules/coqui-trainer/default.nix
··· 30 hash = "sha256-WBFsQuGnpqOiQW7VFfsk0t7qEBs1ScOChfQFpLmqTz4="; 31 }; 32 33 propagatedBuildInputs = [ 34 coqpit 35 fsspec
··· 30 hash = "sha256-WBFsQuGnpqOiQW7VFfsk0t7qEBs1ScOChfQFpLmqTz4="; 31 }; 32 33 + postPatch = '' 34 + sed -i 's/^protobuf.*/protobuf/' requirements.txt 35 + ''; 36 + 37 propagatedBuildInputs = [ 38 coqpit 39 fsspec
+9 -7
pkgs/development/python-modules/tensorboardx/default.nix
··· 8 , moto 9 , numpy 10 , pillow 11 - , protobuf3_8 12 , pytestCheckHook 13 , torch 14 , six ··· 19 20 buildPythonPackage rec { 21 pname = "tensorboardx"; 22 - version = "2.5"; 23 24 src = fetchFromGitHub { 25 owner = "lanpa"; 26 repo = "tensorboardX"; 27 - rev = "refs/tags/${version}"; 28 - sha256 = "sha256-g6x0yUpofeSNA4rKPidqOKC7/TrOICstcc98VnQcfDY="; 29 }; 30 31 # apparently torch API changed a bit at 1.6 ··· 39 sed -i -e "s/'protobuf[^']*'/'protobuf'/" setup.py 40 ''; 41 42 - # Wanted protobuf version is mentioned here: 43 - # https://github.com/lanpa/tensorboardX/blob/0d08112618a2bbda4c028a15a137fed3afe77401/compile.sh#L6 44 - nativeBuildInputs = [ which protobuf3_8 ]; 45 46 # required to make tests deterministic 47 PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
··· 8 , moto 9 , numpy 10 , pillow 11 + , protobuf 12 , pytestCheckHook 13 , torch 14 , six ··· 19 20 buildPythonPackage rec { 21 pname = "tensorboardx"; 22 + version = "2.5.1"; 23 + format = "setuptools"; 24 25 src = fetchFromGitHub { 26 owner = "lanpa"; 27 repo = "tensorboardX"; 28 + rev = "refs/tags/v${version}"; 29 + hash = "sha256-Np0Ibn51qL0ORwq1IY8lUle05MQDdb5XkI1uzGOKJno="; 30 }; 31 32 # apparently torch API changed a bit at 1.6 ··· 40 sed -i -e "s/'protobuf[^']*'/'protobuf'/" setup.py 41 ''; 42 43 + nativeBuildInputs = [ 44 + which 45 + protobuf 46 + ]; 47 48 # required to make tests deterministic 49 PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
+2 -2
pkgs/servers/rippled/default.nix
··· 1 { lib, stdenv, fetchgit, fetchurl, git, cmake, pkg-config 2 - , openssl, boost, grpc, abseil-cpp, protobuf3_8, libnsl }: 3 4 let 5 sqlite3 = fetchurl rec { ··· 130 cmakeFlags = ["-Dstatic=OFF" "-DBoost_NO_BOOST_CMAKE=ON"]; 131 132 nativeBuildInputs = [ pkg-config cmake git ]; 133 - buildInputs = [ openssl openssl.dev boostSharedStatic grpc abseil-cpp protobuf3_8 libnsl ]; 134 135 preConfigure = '' 136 export HOME=$PWD
··· 1 { lib, stdenv, fetchgit, fetchurl, git, cmake, pkg-config 2 + , openssl, boost, grpc, abseil-cpp, protobuf, libnsl }: 3 4 let 5 sqlite3 = fetchurl rec { ··· 130 cmakeFlags = ["-Dstatic=OFF" "-DBoost_NO_BOOST_CMAKE=ON"]; 131 132 nativeBuildInputs = [ pkg-config cmake git ]; 133 + buildInputs = [ openssl openssl.dev boostSharedStatic grpc abseil-cpp protobuf libnsl ]; 134 135 preConfigure = '' 136 export HOME=$PWD
+2 -2
pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
··· 8 src = fetchFromGitHub { 9 owner = "google"; 10 repo = "mozc"; 11 - rev = "063c41f1d7c1a877f44c1f8caad6be1897350336"; 12 - sha256 = "sha256-sgsfJZALpPHFB5bXu4OkRssViRDaPcgLfEyGhbqvJbI="; 13 fetchSubmodules = true; 14 }; 15
··· 8 src = fetchFromGitHub { 9 owner = "google"; 10 repo = "mozc"; 11 + rev = "refs/tags/${version}"; 12 + hash = "sha256-sgsfJZALpPHFB5bXu4OkRssViRDaPcgLfEyGhbqvJbI="; 13 fetchSubmodules = true; 14 }; 15
+1 -1
pkgs/top-level/all-packages.nix
··· 5340 5341 mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { 5342 stdenv = clangStdenv; 5343 - protobuf = pkgs.protobuf3_8.overrideDerivation (_: { stdenv = clangStdenv; }); 5344 }; 5345 5346 rime = callPackage ../tools/inputmethods/ibus-engines/ibus-rime { };
··· 5340 5341 mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { 5342 stdenv = clangStdenv; 5343 + protobuf = pkgs.protobuf.overrideDerivation (_: { stdenv = clangStdenv; }); 5344 }; 5345 5346 rime = callPackage ../tools/inputmethods/ibus-engines/ibus-rime { };