[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
374/471: gnu: rust-cargo-edit: Fix build.
From: |
guix-commits |
Subject: |
374/471: gnu: rust-cargo-edit: Fix build. |
Date: |
Wed, 3 May 2023 09:28:57 -0400 (EDT) |
efraim pushed a commit to branch rust-team
in repository guix.
commit 5dc4eed725a7750266c8b4a51d7a1d2ee8baff41
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 0b1f7b8bf4..8c29969712 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))
- 416/471: gnu: Add rust-sdl2-sys-0.35., (continued)
- 416/471: gnu: Add rust-sdl2-sys-0.35., guix-commits, 2023/05/03
- 453/471: gnu: rust-rustls-0.17: Skip the tests., guix-commits, 2023/05/03
- 450/471: gnu: rust-bindgen-0.59: Add missing inputs., guix-commits, 2023/05/03
- 459/471: gnu: rust-security-framework-0.2: Skip build., guix-commits, 2023/05/03
- 458/471: gnu: rust-criterion-0.3: Update to 0.3.6., guix-commits, 2023/05/03
- 234/471: gnu: Add rust-built-0.5., guix-commits, 2023/05/03
- 235/471: gnu: Add rust-bindgen-0.61., guix-commits, 2023/05/03
- 333/471: gnu: Add rust-bitvec-1., guix-commits, 2023/05/03
- 395/471: gnu: rust-x11-dl-2: Update to 2.21.0., guix-commits, 2023/05/03
- 375/471: gnu: alacritty: Update to 0.12.0., guix-commits, 2023/05/03
- 374/471: gnu: rust-cargo-edit: Fix build.,
guix-commits <=
- 391/471: gnu: Add rust-wayland-sys-0.30., guix-commits, 2023/05/03
- 379/471: gnu: Add rust-objc-sys-0.2., guix-commits, 2023/05/03
- 451/471: gnu: rust-rustls-0.20: Add missing input., guix-commits, 2023/05/03
- 456/471: gnu: rust-webpki-0.22: Add missing input., guix-commits, 2023/05/03
- 465/471: gnu: rust-webpki-0.19: Fix build., guix-commits, 2023/05/03
- 468/471: gnu: rust-hashbrown-0.8: Update to 0.8.2., guix-commits, 2023/05/03
- 262/471: gnu: fd: Update to 8.7.0., guix-commits, 2023/05/03
- 205/471: gnu: Add rust-libdeflate-sys-0.11., guix-commits, 2023/05/03
- 220/471: gnu: rust-wasm-bindgen-test-0.3: Update to 0.3.34., guix-commits, 2023/05/03
- 268/471: gnu: Add rust-argmax-0.3., guix-commits, 2023/05/03