diff --git a/srcpkgs/maturin/patches/add-ppc-tier3.patch b/srcpkgs/maturin/patches/add-ppc-tier3.patch index c837a90fb2b..5b5b7c2021a 100644 --- a/srcpkgs/maturin/patches/add-ppc-tier3.patch +++ b/srcpkgs/maturin/patches/add-ppc-tier3.patch @@ -5,11 +5,11 @@ diff -ur setup.py setup.py "--message-format=json", ] -- if platform.machine() in ("ppc64le", "ppc64", "powerpc"): -+ if platform.machine() in ("ppc64le", "ppc64", "powerpc", "ppcle", "ppc"): +- if platform.machine() in ("ppc64le", "ppc64", "powerpc") or ( ++ if platform.machine() in ("ppc64le", "ppc64", "powerpc", "ppcle", "ppc") or ( + sys.platform == "win32" and platform.machine() == "ARM64" + ): cargo_args.extend( - ["--no-default-features", "--features=upload,log,human-panic"] - ) diff -ur src/target.rs src/target.rs --- a/src/target.rs +++ b/src/target.rs diff --git a/srcpkgs/maturin/patches/edition2018.patch b/srcpkgs/maturin/patches/edition2018.patch new file mode 100644 index 00000000000..7e6b267507b --- /dev/null +++ b/srcpkgs/maturin/patches/edition2018.patch @@ -0,0 +1,18 @@ +Void can't yet compile with edition2021 and there seems to be no reason to +demand it, so partially revert + + https://github.com/PyO3/maturin/commit/4d51112a18a331248bb36c0cb5b4c60c6fe0091a + +and make maturin work. + +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -10,7 +10,7 @@ + license = "MIT OR Apache-2.0" + keywords = ["python", "cffi", "packaging", "pypi", "pyo3"] + categories = ["api-bindings", "development-tools::ffi", "command-line-utilities"] +-edition = "2021" ++edition = "2018" + + [badges] + travis-ci = { repository = "PyO3/maturin" } diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template index 01363b438ae..d5eb458e50a 100644 --- a/srcpkgs/maturin/template +++ b/srcpkgs/maturin/template @@ -1,6 +1,6 @@ # Template file for 'maturin' pkgname=maturin -version=0.11.5 +version=0.12.2 revision=1 build_style=cargo build_helper=qemu @@ -16,8 +16,8 @@ license="Apache-2.0, MIT" homepage="https://github.com/PyO3/maturin" # bump target-lexicon version if it changes in Cargo.lock distfiles="${homepage}/archive/v${version}.tar.gz - https://github.com/bytecodealliance/target-lexicon/archive/v0.12.2.tar.gz" -checksum="33b67e66e725c76eac866c2174cfbe708e77a44d215878474d84bc5f9f6386f3 + https://github.com/bytecodealliance/target-lexicon/archive/v0.12.2.tar.gz>target-lexicon-${version}.tar.gz" +checksum="d66d21703a78d71061b279b97fb7dd15a925474da19bce9928d87f1c22550ed6 b6c2ddab7498cf6eab8e637a5b7895f3170b2f9ef989861d1ff33af6c8459b27" # Tests use unstable features and fail to build make_check=no