onnx: 1.6.0 -> 1.7.0

This commit is contained in:
Aiken Cairncross 2020-05-11 19:46:44 +01:00 committed by Jon
parent 6bcb1dec8e
commit d020db4a44

View file

@ -18,29 +18,18 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "onnx"; pname = "onnx";
version = "1.6.0"; version = "1.7.0";
# Due to Protobuf packaging issues this build of Onnx with Python 2 gives # Due to Protobuf packaging issues this build of Onnx with Python 2 gives
# errors on import # errors on import.
# Also support for Python 2 will be deprecated from Onnx v1.8.
disabled = isPy27; disabled = isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0ig33jl3591041lyylxp52yi20rfrcqx3i030hd6al8iabzc721v"; sha256 = "0j6rgfbhsw3a8id8pyg18y93k68lbjbj1kq6qia36h69f6pvlyjy";
}; };
# Remove the unqualified requirement for the typing package for running the
# tests. typing is already required for the installation, where it is
# correctly qualified so as to only be required for sufficiently old Python
# versions.
# This patch should be in the next release (>1.6).
patches = [
(fetchpatch {
url = "https://github.com/onnx/onnx/commit/c963586d0f8dd5740777b2fd06f04ec60816de9f.patch";
sha256 = "1hl26cw5zckc91gmh0bdah87jyprccxiw0f4i5h1gwkq28hm6wbj";
})
];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -61,13 +50,17 @@ buildPythonPackage rec {
patchShebangs tools/protoc-gen-mypy.py patchShebangs tools/protoc-gen-mypy.py
''; '';
preBuild = ''
export MAX_JOBS=$NIX_BUILD_CORES
'';
# The executables are just utility scripts that aren't too important # The executables are just utility scripts that aren't too important
postInstall = '' postInstall = ''
rm -r $out/bin rm -r $out/bin
''; '';
# The setup.py does all the configuration (running CMake) # The setup.py does all the configuration
dontConfigure = true; dontUseCmakeConfigure = true;
meta = { meta = {
homepage = "http://onnx.ai"; homepage = "http://onnx.ai";