diff options
| author | Robert Scott <code@humanleg.org.uk> | 2023-02-05 11:30:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-05 11:30:41 +0000 |
| commit | 746a47bea03c707dc55ae2fe87d64f1b6ed70b7f (patch) | |
| tree | 0799fb67bbe997e6786d3793b2c4f26d6df91d4a | |
| parent | d5e7e30bb15643c7bf3e148edd7d3c7752a7a2e3 (diff) | |
| parent | 17fe63faf9e31ce24f2bb8f0e24069d692d3e4d2 (diff) | |
Merge pull request #209247 from acairncross/onnx-1.13.0
python3Packages.onnx: 1.12.0 -> 1.13.0
| -rw-r--r-- | pkgs/development/python-modules/onnx/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index a6f290633edc..b21f343db32a 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "onnx"; - version = "1.12.0"; + version = "1.13.0"; format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-E7PnfSdSO52/TzDfyclZRVhZ1eNOkhxE9xLWm4Np7/k="; + sha256 = "sha256-QQs5lQNnhX+XtlCTaB/iSVouI9Y3d6is6vlsVqFtFm4="; }; nativeBuildInputs = [ @@ -50,9 +50,13 @@ buildPythonPackage rec { postPatch = '' chmod +x tools/protoc-gen-mypy.sh.in - patchShebangs tools/protoc-gen-mypy.py - substituteInPlace tools/protoc-gen-mypy.sh.in \ - --replace "/bin/bash" "${bash}/bin/bash" + patchShebangs tools/protoc-gen-mypy.sh.in + ''; + + # Set CMAKE_INSTALL_LIBDIR to lib explicitly, because otherwise it gets set + # to lib64 and cmake incorrectly looks for the protobuf library in lib64 + preConfigure = '' + export CMAKE_ARGS="-DCMAKE_INSTALL_LIBDIR=lib -DONNX_USE_PROTOBUF_SHARED_LIBS=ON" ''; preBuild = '' |