[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
374/475: gnu: rust-cargo-edit: Fix build.
From: |
guix-commits |
Subject: |
374/475: gnu: rust-cargo-edit: Fix build. |
Date: |
Sun, 7 May 2023 12:48:13 -0400 (EDT) |
efraim pushed a commit to branch rust-team
in repository guix.
commit 163c1a84d116e963065300cd3f20349b67e155e3
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))
- 339/475: gnu: rust-quote-1: Update to 1.0.25., (continued)
- 339/475: gnu: rust-quote-1: Update to 1.0.25., guix-commits, 2023/05/07
- 364/475: gnu: rust-tls-parser-0.10: Update to 0.11.0., guix-commits, 2023/05/07
- 370/475: gnu: sniffglue: Update to 0.15.0., guix-commits, 2023/05/07
- 354/475: gnu: Add python-orjson., guix-commits, 2023/05/07
- 393/475: gnu: rust-core-graphics-0.22: Update to 0.22.3., guix-commits, 2023/05/07
- 358/475: gnu: rust-curl-sys-0.4: Update to 0.4.61+curl-8.0.1., guix-commits, 2023/05/07
- 359/475: gnu: rust-lexopt: Update to 0.3.0., guix-commits, 2023/05/07
- 373/475: gnu: rust-git2-0.14: Build with correct libgit2., guix-commits, 2023/05/07
- 386/475: gnu: rust-wayland-cursor-0.29: Update to 0.29.5., guix-commits, 2023/05/07
- 365/475: gnu: rust-nom-derive-0.7: Update to 0.10.1., guix-commits, 2023/05/07
- 374/475: gnu: rust-cargo-edit: Fix build.,
guix-commits <=
- 394/475: gnu: Add rust-raw-window-handle-0.5., guix-commits, 2023/05/07
- 356/475: gnu: rust-1.68: Update to 1.68.2., guix-commits, 2023/05/07
- 372/475: gnu: rust-libgit2-sys-0.12: Update to 0.12.26., guix-commits, 2023/05/07
- 377/475: gnu: Add rust-block-sys-0.1., guix-commits, 2023/05/07
- 396/475: gnu: Add rust-winit-0.28., guix-commits, 2023/05/07
- 369/475: gnu: rust-syscallz-0.15: Update to 0.16.2., guix-commits, 2023/05/07
- 400/475: gnu: rust-memmap2-0.5: Update to 0.5.10., guix-commits, 2023/05/07
- 415/475: gnu: Add rust-indoc-2., guix-commits, 2023/05/07
- 411/475: gnu: rust-embed-resource-1: Update to 1.8.0., guix-commits, 2023/05/07
- 418/475: gnu: Add rust-orbclient-0.3., guix-commits, 2023/05/07