From a222ca468ea31c0ebf5ba11488dec4dec4c45b5b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 28 Sep 2022 23:03:02 +0200 Subject: [PATCH 1/4] python3Packages.tensorboardx: 2.5 -> 2.5.1 Unpins protobuf; the wanted version is a lower bound, not an upper one, which is instead given inside setup.py. https://github.com/lanpa/tensorboardX/blob/v2.5.1/setup.py#L46 --- .../python-modules/tensorboardx/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix index 76507a11e09b..7d0a28a4198c 100644 --- a/pkgs/development/python-modules/tensorboardx/default.nix +++ b/pkgs/development/python-modules/tensorboardx/default.nix @@ -8,7 +8,7 @@ , moto , numpy , pillow -, protobuf3_8 +, protobuf , pytestCheckHook , torch , six @@ -19,13 +19,14 @@ buildPythonPackage rec { pname = "tensorboardx"; - version = "2.5"; + version = "2.5.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "lanpa"; repo = "tensorboardX"; - rev = "refs/tags/${version}"; - sha256 = "sha256-g6x0yUpofeSNA4rKPidqOKC7/TrOICstcc98VnQcfDY="; + rev = "refs/tags/v${version}"; + hash = "sha256-Np0Ibn51qL0ORwq1IY8lUle05MQDdb5XkI1uzGOKJno="; }; # apparently torch API changed a bit at 1.6 @@ -39,9 +40,10 @@ buildPythonPackage rec { sed -i -e "s/'protobuf[^']*'/'protobuf'/" setup.py ''; - # Wanted protobuf version is mentioned here: - # https://github.com/lanpa/tensorboardX/blob/0d08112618a2bbda4c028a15a137fed3afe77401/compile.sh#L6 - nativeBuildInputs = [ which protobuf3_8 ]; + nativeBuildInputs = [ + which + protobuf + ]; # required to make tests deterministic PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; From 0aee87185d4307fac15902986085b42ed27ac33f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 28 Sep 2022 23:41:17 +0200 Subject: [PATCH 2/4] rippled: unpin protobuf Fails the same three tests as on hydra, so no regression. --- pkgs/servers/rippled/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 835307ae0a00..55b082f99484 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, fetchurl, git, cmake, pkg-config -, openssl, boost, grpc, abseil-cpp, protobuf3_8, libnsl }: +, openssl, boost, grpc, abseil-cpp, protobuf, libnsl }: let sqlite3 = fetchurl rec { @@ -130,7 +130,7 @@ in stdenv.mkDerivation rec { cmakeFlags = ["-Dstatic=OFF" "-DBoost_NO_BOOST_CMAKE=ON"]; nativeBuildInputs = [ pkg-config cmake git ]; - buildInputs = [ openssl openssl.dev boostSharedStatic grpc abseil-cpp protobuf3_8 libnsl ]; + buildInputs = [ openssl openssl.dev boostSharedStatic grpc abseil-cpp protobuf libnsl ]; preConfigure = '' export HOME=$PWD From 06ed064a3ed6d8adbec2704e2f90a4fe31823273 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Sep 2022 00:01:11 +0200 Subject: [PATCH 3/4] ibus-engines.mozc: unpin protobuf Also use the git tag, so the package can be better updated. --- pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index 8d4a93a375ec..7333558aaaef 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "google"; repo = "mozc"; - rev = "063c41f1d7c1a877f44c1f8caad6be1897350336"; - sha256 = "sha256-sgsfJZALpPHFB5bXu4OkRssViRDaPcgLfEyGhbqvJbI="; + rev = "refs/tags/${version}"; + hash = "sha256-sgsfJZALpPHFB5bXu4OkRssViRDaPcgLfEyGhbqvJbI="; fetchSubmodules = true; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a09bb50c797..aff908337054 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5340,7 +5340,7 @@ with pkgs; mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { stdenv = clangStdenv; - protobuf = pkgs.protobuf3_8.overrideDerivation (_: { stdenv = clangStdenv; }); + protobuf = pkgs.protobuf.overrideDerivation (_: { stdenv = clangStdenv; }); }; rime = callPackage ../tools/inputmethods/ibus-engines/ibus-rime { }; From 3d1c995185ef4878a21851bc8ad1ab2082f2435d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Oct 2022 15:15:44 +0200 Subject: [PATCH 4/4] python3Packages.coqui-trainer: unpin protobuf --- pkgs/development/python-modules/coqui-trainer/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/coqui-trainer/default.nix b/pkgs/development/python-modules/coqui-trainer/default.nix index c8bd0d67839e..1a6bf6b2aeb0 100644 --- a/pkgs/development/python-modules/coqui-trainer/default.nix +++ b/pkgs/development/python-modules/coqui-trainer/default.nix @@ -30,6 +30,10 @@ buildPythonPackage { hash = "sha256-WBFsQuGnpqOiQW7VFfsk0t7qEBs1ScOChfQFpLmqTz4="; }; + postPatch = '' + sed -i 's/^protobuf.*/protobuf/' requirements.txt + ''; + propagatedBuildInputs = [ coqpit fsspec