[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
374/470: gnu: rust-cargo-edit: Fix build.
From: |
guix-commits |
Subject: |
374/470: gnu: rust-cargo-edit: Fix build. |
Date: |
Sun, 30 Apr 2023 14:05:02 -0400 (EDT) |
efraim pushed a commit to branch rust-team
in repository guix.
commit 8b53dfc8d0251b82b01b4b931f5be792148a2008
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))
- 293/470: gnu: rust-libloading: Remove bundled libraries., (continued)
- 293/470: gnu: rust-libloading: Remove bundled libraries., guix-commits, 2023/04/30
- 339/470: gnu: rust-quote-1: Update to 1.0.25., guix-commits, 2023/04/30
- 344/470: gnu: rust-syn-1: Update to 1.0.109., guix-commits, 2023/04/30
- 348/470: gnu: Add rust-compact-str-0.7., guix-commits, 2023/04/30
- 349/470: gnu: Add rust-windows-interface-0.46., guix-commits, 2023/04/30
- 367/470: gnu: rust-pktparse-0.5: Update to 0.7.1., guix-commits, 2023/04/30
- 376/470: gnu: Add rust-block2-0.2., guix-commits, 2023/04/30
- 389/470: gnu: rust-wayland-scanner-0.29: Update to 0.29.5., guix-commits, 2023/04/30
- 385/470: gnu: rust-wayland-commons-0.29: Update to 0.29.5., guix-commits, 2023/04/30
- 383/470: gnu: Add rust-glutin-0.30., guix-commits, 2023/04/30
- 374/470: gnu: rust-cargo-edit: Fix build.,
guix-commits <=
- 381/470: gnu: Add rust-objc2-encode-2., guix-commits, 2023/04/30
- 384/470: gnu: rust-wayland-client-0.29: Update to 0.29.5., guix-commits, 2023/04/30
- 390/470: gnu: rust-wayland-server-0.29: Update to 0.29.5., guix-commits, 2023/04/30
- 386/470: gnu: rust-wayland-cursor-0.29: Update to 0.29.5., guix-commits, 2023/04/30
- 401/470: gnu: rust-smithay-clipboard-0.6: Update to 0.6.6., guix-commits, 2023/04/30
- 417/470: gnu: Add rust-sdl2-0.35., guix-commits, 2023/04/30
- 399/470: gnu: Add rust-calloop-0.10., guix-commits, 2023/04/30
- 400/470: gnu: rust-memmap2-0.5: Update to 0.5.10., guix-commits, 2023/04/30
- 406/470: gnu: Add rust-alacritty-config-0.1., guix-commits, 2023/04/30
- 418/470: gnu: Add rust-orbclient-0.3., guix-commits, 2023/04/30