[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/12: gnu: rust-cargo-edit: Fix build.
From: |
guix-commits |
Subject: |
12/12: gnu: rust-cargo-edit: Fix build. |
Date: |
Tue, 18 Apr 2023 03:38:39 -0400 (EDT) |
efraim pushed a commit to branch rust-team
in repository guix.
commit e614f4da3e44db9adad367a7146bf3fa0c8ccef4
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))
- 02/12: gnu: rust-tls-parser-0.10: Update to 0.11.0., (continued)
- 02/12: gnu: rust-tls-parser-0.10: Update to 0.11.0., guix-commits, 2023/04/18
- 03/12: gnu: rust-nom-derive-0.7: Update to 0.10.1., guix-commits, 2023/04/18
- 04/12: gnu: Add rust-nom-derive-impl-0.10., guix-commits, 2023/04/18
- 07/12: gnu: rust-syscallz-0.15: Update to 0.16.2., guix-commits, 2023/04/18
- 08/12: gnu: sniffglue: Update to 0.15.0., guix-commits, 2023/04/18
- 09/12: gnu: rust-libgit2-sys-0.13: Update to 0.13.5., guix-commits, 2023/04/18
- 06/12: gnu: rust-pledge-0.3: Update to 0.4.2., guix-commits, 2023/04/18
- 10/12: gnu: rust-libgit2-sys-0.12: Update to 0.12.26., guix-commits, 2023/04/18
- 05/12: gnu: rust-pktparse-0.5: Update to 0.7.1., guix-commits, 2023/04/18
- 11/12: gnu: rust-git2-0.14: Build with correct libgit2., guix-commits, 2023/04/18
- 12/12: gnu: rust-cargo-edit: Fix build.,
guix-commits <=