[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
385/459: gnu: rust-cargo-edit: Fix build.
From: |
guix-commits |
Subject: |
385/459: gnu: rust-cargo-edit: Fix build. |
Date: |
Mon, 24 Apr 2023 15:04:03 -0400 (EDT) |
efraim pushed a commit to branch rust-team
in repository guix.
commit e9623f0ac26ab9bdd435ce34ca764d545488f4b6
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Apr 18 10:05:48 2023 +0300
gnu: rust-cargo-edit: Fix build.
* gnu/packages/rust-apps.scm (rust-cargo-edit)[arguments]: Skip tests.
Add a phase to not default to vendored libgit2.
[native-inputs]: Add perl.
[inputs]: Replace libgit2 with libgit2-1.4.
---
gnu/packages/rust-apps.scm | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 1540b6ed2a..c7dfec40af 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -924,6 +924,8 @@ browsers.")
(build-system cargo-build-system)
(arguments
`(#:install-source? #f
+ ;; error[E0463]: can't find crate for `cargo_test_macro`
+ #:tests? #f
#:cargo-inputs
(("rust-anyhow" ,rust-anyhow-1)
("rust-cargo-metadata" ,rust-cargo-metadata-0.15)
@@ -954,11 +956,17 @@ browsers.")
("rust-predicates" ,rust-predicates-2)
("rust-snapbox" ,rust-snapbox-0.2)
("rust-trycmd" ,rust-trycmd-0.13)
- ("rust-url" ,rust-url-2))))
+ ("rust-url" ,rust-url-2))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'dont-default-to-vendored-libgit2
+ (lambda _
+ (substitute* "Cargo.toml"
+ ((".*\"vendored-libgit2\".*") "")))))))
(native-inputs
- (list pkg-config))
+ (list perl pkg-config))
(inputs
- (list libgit2
+ (list libgit2-1.4
libssh2
openssl
zlib))
- 334/459: gnu: rust-windows-aarch64-msvc-0.42: Update to 0.42.2., (continued)
- 334/459: gnu: rust-windows-aarch64-msvc-0.42: Update to 0.42.2., guix-commits, 2023/04/24
- 336/459: gnu: rust-windows-x86-64-msvc-0.42: Update to 0.42.2., guix-commits, 2023/04/24
- 337/459: gnu: rust-windows-x86-64-gnullvm-0.42: Update to 0.42.2., guix-commits, 2023/04/24
- 343/459: gnu: rust-uuid-1: Update to 1.3.0., guix-commits, 2023/04/24
- 340/459: gnu: rust-typenum-1: Update to 1.16.0., guix-commits, 2023/04/24
- 346/459: gnu: rust-bytecheck-0.6: Update to 0.6.10., guix-commits, 2023/04/24
- 350/459: gnu: rust-quote-1: Update to 1.0.25., guix-commits, 2023/04/24
- 353/459: gnu: Add rust-castaway-0.2., guix-commits, 2023/04/24
- 355/459: gnu: rust-syn-1: Update to 1.0.109., guix-commits, 2023/04/24
- 360/459: gnu: Add rust-windows-interface-0.46., guix-commits, 2023/04/24
- 385/459: gnu: rust-cargo-edit: Fix build.,
guix-commits <=
- 358/459: gnu: Add rust-test-strategy-0.2., guix-commits, 2023/04/24
- 381/459: gnu: sniffglue: Update to 0.15.0., guix-commits, 2023/04/24
- 366/459: gnu: rust: Disable tests that fail on aarch64., guix-commits, 2023/04/24
- 365/459: gnu: Add python-orjson., guix-commits, 2023/04/24
- 380/459: gnu: rust-syscallz-0.15: Update to 0.16.2., guix-commits, 2023/04/24
- 376/459: gnu: rust-nom-derive-0.7: Update to 0.10.1., guix-commits, 2023/04/24
- 379/459: gnu: rust-pledge-0.3: Update to 0.4.2., guix-commits, 2023/04/24
- 368/459: gnu: Add rust-bitflags-2., guix-commits, 2023/04/24
- 369/459: gnu: rust-curl-sys-0.4: Update to 0.4.61+curl-8.0.1., guix-commits, 2023/04/24
- 372/459: gnu: rust-fastrand-1: Update to 1.9.0., guix-commits, 2023/04/24