2023-08-06 07:22:00 +00:00
|
|
|
Remove dependencies on xwin and zig. We're not offering cross-compilation
|
|
|
|
|
options using these crates.
|
|
|
|
|
|
|
|
|
|
diff --git a/Cargo.toml b/Cargo.toml
|
gnu: maturin: Update to 1.4.0.
* gnu/packages/rust-apps.scm (maturin): Update to 1.4.0.
[source]: Add snippet to fix compilation.
[cargo-inputs]: Add rust-path-slash-0.2. Replace rust-cargo-options-0.6
with 0.7, rust-cargo-metadata-0.16 with 0.18, rust-cbindgen-0.24 with
0.26, rust-dialoguer-0.10 with 0.11, rust-goblin-0.6 with 0.7,
rust-indexmap-1 with 2, rust-itertools-0.10 with 0.12,
rust-minijinja-0.34 with 1, rust-pyproject-toml-0.6 with 0.8,
rust-python-pkginfo-0.5 with 0.6, rust-rustls-0.20 with 0.21,
rust-rustls-pemfile-1 with 2, rust-toml-0.7 with 0.8,
rust-toml-edit-0.19 with 0.21.
Remove rust-same-file-1.
[cargo-development-inputs]: Add rust-expect-test-1. Replace
rust-which-4 with 5.
* gnu/packages/patches/maturin-no-cross-compile.patch: Refresh patch.
Change-Id: I1c943ad1a9a3cb315e5baa287f7ba5bc7bc15413
2023-12-24 08:13:32 +00:00
|
|
|
index 6704e46..ff126a9 100644
|
2023-08-06 07:22:00 +00:00
|
|
|
--- a/Cargo.toml
|
|
|
|
|
+++ b/Cargo.toml
|
gnu: maturin: Update to 1.4.0.
* gnu/packages/rust-apps.scm (maturin): Update to 1.4.0.
[source]: Add snippet to fix compilation.
[cargo-inputs]: Add rust-path-slash-0.2. Replace rust-cargo-options-0.6
with 0.7, rust-cargo-metadata-0.16 with 0.18, rust-cbindgen-0.24 with
0.26, rust-dialoguer-0.10 with 0.11, rust-goblin-0.6 with 0.7,
rust-indexmap-1 with 2, rust-itertools-0.10 with 0.12,
rust-minijinja-0.34 with 1, rust-pyproject-toml-0.6 with 0.8,
rust-python-pkginfo-0.5 with 0.6, rust-rustls-0.20 with 0.21,
rust-rustls-pemfile-1 with 2, rust-toml-0.7 with 0.8,
rust-toml-edit-0.19 with 0.21.
Remove rust-same-file-1.
[cargo-development-inputs]: Add rust-expect-test-1. Replace
rust-which-4 with 5.
* gnu/packages/patches/maturin-no-cross-compile.patch: Refresh patch.
Change-Id: I1c943ad1a9a3cb315e5baa287f7ba5bc7bc15413
2023-12-24 08:13:32 +00:00
|
|
|
@@ -83,16 +83,6 @@ version = "0.1.16"
|
2023-08-06 07:22:00 +00:00
|
|
|
[dependencies.cargo-options]
|
gnu: maturin: Update to 1.4.0.
* gnu/packages/rust-apps.scm (maturin): Update to 1.4.0.
[source]: Add snippet to fix compilation.
[cargo-inputs]: Add rust-path-slash-0.2. Replace rust-cargo-options-0.6
with 0.7, rust-cargo-metadata-0.16 with 0.18, rust-cbindgen-0.24 with
0.26, rust-dialoguer-0.10 with 0.11, rust-goblin-0.6 with 0.7,
rust-indexmap-1 with 2, rust-itertools-0.10 with 0.12,
rust-minijinja-0.34 with 1, rust-pyproject-toml-0.6 with 0.8,
rust-python-pkginfo-0.5 with 0.6, rust-rustls-0.20 with 0.21,
rust-rustls-pemfile-1 with 2, rust-toml-0.7 with 0.8,
rust-toml-edit-0.19 with 0.21.
Remove rust-same-file-1.
[cargo-development-inputs]: Add rust-expect-test-1. Replace
rust-which-4 with 5.
* gnu/packages/patches/maturin-no-cross-compile.patch: Refresh patch.
Change-Id: I1c943ad1a9a3cb315e5baa287f7ba5bc7bc15413
2023-12-24 08:13:32 +00:00
|
|
|
version = "0.7.2"
|
2023-08-06 07:22:00 +00:00
|
|
|
|
|
|
|
|
-[dependencies.cargo-xwin]
|
gnu: maturin: Update to 1.4.0.
* gnu/packages/rust-apps.scm (maturin): Update to 1.4.0.
[source]: Add snippet to fix compilation.
[cargo-inputs]: Add rust-path-slash-0.2. Replace rust-cargo-options-0.6
with 0.7, rust-cargo-metadata-0.16 with 0.18, rust-cbindgen-0.24 with
0.26, rust-dialoguer-0.10 with 0.11, rust-goblin-0.6 with 0.7,
rust-indexmap-1 with 2, rust-itertools-0.10 with 0.12,
rust-minijinja-0.34 with 1, rust-pyproject-toml-0.6 with 0.8,
rust-python-pkginfo-0.5 with 0.6, rust-rustls-0.20 with 0.21,
rust-rustls-pemfile-1 with 2, rust-toml-0.7 with 0.8,
rust-toml-edit-0.19 with 0.21.
Remove rust-same-file-1.
[cargo-development-inputs]: Add rust-expect-test-1. Replace
rust-which-4 with 5.
* gnu/packages/patches/maturin-no-cross-compile.patch: Refresh patch.
Change-Id: I1c943ad1a9a3cb315e5baa287f7ba5bc7bc15413
2023-12-24 08:13:32 +00:00
|
|
|
-version = "0.16.2"
|
2023-08-06 07:22:00 +00:00
|
|
|
-optional = true
|
|
|
|
|
-default-features = false
|
|
|
|
|
-
|
|
|
|
|
-[dependencies.cargo-zigbuild]
|
gnu: maturin: Update to 1.4.0.
* gnu/packages/rust-apps.scm (maturin): Update to 1.4.0.
[source]: Add snippet to fix compilation.
[cargo-inputs]: Add rust-path-slash-0.2. Replace rust-cargo-options-0.6
with 0.7, rust-cargo-metadata-0.16 with 0.18, rust-cbindgen-0.24 with
0.26, rust-dialoguer-0.10 with 0.11, rust-goblin-0.6 with 0.7,
rust-indexmap-1 with 2, rust-itertools-0.10 with 0.12,
rust-minijinja-0.34 with 1, rust-pyproject-toml-0.6 with 0.8,
rust-python-pkginfo-0.5 with 0.6, rust-rustls-0.20 with 0.21,
rust-rustls-pemfile-1 with 2, rust-toml-0.7 with 0.8,
rust-toml-edit-0.19 with 0.21.
Remove rust-same-file-1.
[cargo-development-inputs]: Add rust-expect-test-1. Replace
rust-which-4 with 5.
* gnu/packages/patches/maturin-no-cross-compile.patch: Refresh patch.
Change-Id: I1c943ad1a9a3cb315e5baa287f7ba5bc7bc15413
2023-12-24 08:13:32 +00:00
|
|
|
-version = "0.18.0"
|
2023-08-06 07:22:00 +00:00
|
|
|
-optional = true
|
|
|
|
|
-default-features = false
|
|
|
|
|
-
|
|
|
|
|
[dependencies.cargo_metadata]
|
gnu: maturin: Update to 1.4.0.
* gnu/packages/rust-apps.scm (maturin): Update to 1.4.0.
[source]: Add snippet to fix compilation.
[cargo-inputs]: Add rust-path-slash-0.2. Replace rust-cargo-options-0.6
with 0.7, rust-cargo-metadata-0.16 with 0.18, rust-cbindgen-0.24 with
0.26, rust-dialoguer-0.10 with 0.11, rust-goblin-0.6 with 0.7,
rust-indexmap-1 with 2, rust-itertools-0.10 with 0.12,
rust-minijinja-0.34 with 1, rust-pyproject-toml-0.6 with 0.8,
rust-python-pkginfo-0.5 with 0.6, rust-rustls-0.20 with 0.21,
rust-rustls-pemfile-1 with 2, rust-toml-0.7 with 0.8,
rust-toml-edit-0.19 with 0.21.
Remove rust-same-file-1.
[cargo-development-inputs]: Add rust-expect-test-1. Replace
rust-which-4 with 5.
* gnu/packages/patches/maturin-no-cross-compile.patch: Refresh patch.
Change-Id: I1c943ad1a9a3cb315e5baa287f7ba5bc7bc15413
2023-12-24 08:13:32 +00:00
|
|
|
version = "0.18.0"
|
2023-08-06 07:22:00 +00:00
|
|
|
|
gnu: maturin: Update to 1.4.0.
* gnu/packages/rust-apps.scm (maturin): Update to 1.4.0.
[source]: Add snippet to fix compilation.
[cargo-inputs]: Add rust-path-slash-0.2. Replace rust-cargo-options-0.6
with 0.7, rust-cargo-metadata-0.16 with 0.18, rust-cbindgen-0.24 with
0.26, rust-dialoguer-0.10 with 0.11, rust-goblin-0.6 with 0.7,
rust-indexmap-1 with 2, rust-itertools-0.10 with 0.12,
rust-minijinja-0.34 with 1, rust-pyproject-toml-0.6 with 0.8,
rust-python-pkginfo-0.5 with 0.6, rust-rustls-0.20 with 0.21,
rust-rustls-pemfile-1 with 2, rust-toml-0.7 with 0.8,
rust-toml-edit-0.19 with 0.21.
Remove rust-same-file-1.
[cargo-development-inputs]: Add rust-expect-test-1. Replace
rust-which-4 with 5.
* gnu/packages/patches/maturin-no-cross-compile.patch: Refresh patch.
Change-Id: I1c943ad1a9a3cb315e5baa287f7ba5bc7bc15413
2023-12-24 08:13:32 +00:00
|
|
|
@@ -321,8 +311,6 @@ version = "5.0.0"
|
2023-08-06 07:22:00 +00:00
|
|
|
[features]
|
|
|
|
|
cli-completion = ["dep:clap_complete_command"]
|
|
|
|
|
cross-compile = [
|
|
|
|
|
- "zig",
|
|
|
|
|
- "xwin",
|
|
|
|
|
]
|
|
|
|
|
default = [
|
|
|
|
|
"full",
|
gnu: maturin: Update to 1.4.0.
* gnu/packages/rust-apps.scm (maturin): Update to 1.4.0.
[source]: Add snippet to fix compilation.
[cargo-inputs]: Add rust-path-slash-0.2. Replace rust-cargo-options-0.6
with 0.7, rust-cargo-metadata-0.16 with 0.18, rust-cbindgen-0.24 with
0.26, rust-dialoguer-0.10 with 0.11, rust-goblin-0.6 with 0.7,
rust-indexmap-1 with 2, rust-itertools-0.10 with 0.12,
rust-minijinja-0.34 with 1, rust-pyproject-toml-0.6 with 0.8,
rust-python-pkginfo-0.5 with 0.6, rust-rustls-0.20 with 0.21,
rust-rustls-pemfile-1 with 2, rust-toml-0.7 with 0.8,
rust-toml-edit-0.19 with 0.21.
Remove rust-same-file-1.
[cargo-development-inputs]: Add rust-expect-test-1. Replace
rust-which-4 with 5.
* gnu/packages/patches/maturin-no-cross-compile.patch: Refresh patch.
Change-Id: I1c943ad1a9a3cb315e5baa287f7ba5bc7bc15413
2023-12-24 08:13:32 +00:00
|
|
|
@@ -341,7 +329,6 @@ log = ["tracing-subscriber"]
|
2023-08-06 07:22:00 +00:00
|
|
|
native-tls = [
|
|
|
|
|
"dep:native-tls",
|
|
|
|
|
"ureq?/native-tls",
|
|
|
|
|
- "cargo-xwin?/native-tls",
|
|
|
|
|
"dep:rustls-pemfile",
|
|
|
|
|
]
|
|
|
|
|
password-storage = [
|
gnu: maturin: Update to 1.4.0.
* gnu/packages/rust-apps.scm (maturin): Update to 1.4.0.
[source]: Add snippet to fix compilation.
[cargo-inputs]: Add rust-path-slash-0.2. Replace rust-cargo-options-0.6
with 0.7, rust-cargo-metadata-0.16 with 0.18, rust-cbindgen-0.24 with
0.26, rust-dialoguer-0.10 with 0.11, rust-goblin-0.6 with 0.7,
rust-indexmap-1 with 2, rust-itertools-0.10 with 0.12,
rust-minijinja-0.34 with 1, rust-pyproject-toml-0.6 with 0.8,
rust-python-pkginfo-0.5 with 0.6, rust-rustls-0.20 with 0.21,
rust-rustls-pemfile-1 with 2, rust-toml-0.7 with 0.8,
rust-toml-edit-0.19 with 0.21.
Remove rust-same-file-1.
[cargo-development-inputs]: Add rust-expect-test-1. Replace
rust-which-4 with 5.
* gnu/packages/patches/maturin-no-cross-compile.patch: Refresh patch.
Change-Id: I1c943ad1a9a3cb315e5baa287f7ba5bc7bc15413
2023-12-24 08:13:32 +00:00
|
|
|
@@ -351,7 +338,6 @@ password-storage = [
|
2023-08-06 07:22:00 +00:00
|
|
|
rustls = [
|
|
|
|
|
"dep:rustls",
|
|
|
|
|
"ureq?/tls",
|
|
|
|
|
- "cargo-xwin?/rustls-tls",
|
|
|
|
|
"dep:rustls-pemfile",
|
|
|
|
|
]
|
|
|
|
|
scaffolding = [
|
gnu: maturin: Update to 1.4.0.
* gnu/packages/rust-apps.scm (maturin): Update to 1.4.0.
[source]: Add snippet to fix compilation.
[cargo-inputs]: Add rust-path-slash-0.2. Replace rust-cargo-options-0.6
with 0.7, rust-cargo-metadata-0.16 with 0.18, rust-cbindgen-0.24 with
0.26, rust-dialoguer-0.10 with 0.11, rust-goblin-0.6 with 0.7,
rust-indexmap-1 with 2, rust-itertools-0.10 with 0.12,
rust-minijinja-0.34 with 1, rust-pyproject-toml-0.6 with 0.8,
rust-python-pkginfo-0.5 with 0.6, rust-rustls-0.20 with 0.21,
rust-rustls-pemfile-1 with 2, rust-toml-0.7 with 0.8,
rust-toml-edit-0.19 with 0.21.
Remove rust-same-file-1.
[cargo-development-inputs]: Add rust-expect-test-1. Replace
rust-which-4 with 5.
* gnu/packages/patches/maturin-no-cross-compile.patch: Refresh patch.
Change-Id: I1c943ad1a9a3cb315e5baa287f7ba5bc7bc15413
2023-12-24 08:13:32 +00:00
|
|
|
@@ -369,5 +355,3 @@ upload = [
|
2023-08-06 07:22:00 +00:00
|
|
|
"wild",
|
|
|
|
|
"dep:dirs",
|
|
|
|
|
]
|
|
|
|
|
-xwin = ["cargo-xwin"]
|
|
|
|
|
-zig = ["cargo-zigbuild"]
|
