guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

53/68: gnu: rust-actix-connect-1: Don't skip the build.


From: guix-commits
Subject: 53/68: gnu: rust-actix-connect-1: Don't skip the build.
Date: Wed, 20 Mar 2024 11:24:38 -0400 (EDT)

efraim pushed a commit to branch rust-team
in repository guix.

commit e2009388e7ade65e00f4a34967ba7a7cb4c7cdd6
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Mar 19 16:42:17 2024 +0200

    gnu: rust-actix-connect-1: Don't skip the build.
    
    * gnu/packages/crates-web.scm (rust-actix-connect-1)[arguments]: Don't
    skip the build.  Remove custom 'fix-version-requirements phase.
    [cargo-inputs]: Replace rust-trust-dns-proto-0.18 with 0.18.0-alpha.2,
    rust-trust-dns-resolver-0.18 with 0.18.0-alpha.2.
    
    Change-Id: I881bdbf381120818884beed766c85d61ed458fe6
---
 gnu/packages/crates-web.scm | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm
index c119efaf93..9b2d27dc69 100644
--- a/gnu/packages/crates-web.scm
+++ b/gnu/packages/crates-web.scm
@@ -265,11 +265,7 @@
        (sha256
         (base32 "0v77m394gzbrrzg12xkqgli11vwhig0zcxy3yhmq1s91j9bcjp69"))))
     (arguments
-     ;; XXX: The crate fails to't build with: "error[E0432]: unresolved import
-     ;; `trust_dns_resolver::Background`".  I assume it really expects
-     ;; trust-dns-resolver at version 0.18-alpha.2, which we do not provide.
-     `(#:skip-build? #true
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-actix-codec" ,rust-actix-codec-0.2)
         ("rust-actix-rt" ,rust-actix-rt-1)
         ("rust-actix-service" ,rust-actix-service-1)
@@ -283,19 +279,11 @@
         ("rust-rustls" ,rust-rustls-0.16)
         ("rust-tokio-openssl" ,rust-tokio-openssl-0.4)
         ("rust-tokio-rustls" ,rust-tokio-rustls-0.12)
-        ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.18)
-        ("rust-trust-dns-resolver" ,rust-trust-dns-resolver-0.18)
+        ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.18.0-alpha.2)
+        ("rust-trust-dns-resolver" ,rust-trust-dns-resolver-0.18.0-alpha.2)
         ("rust-webpki" ,rust-webpki-0.21))
        #:cargo-development-inputs
-       (("rust-actix-testing" ,rust-actix-testing-1))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-version-requirements
-           (lambda _
-             (substitute* "Cargo.toml"
-               (("0.18.0-alpha.2")
-                ,(package-version rust-trust-dns-proto-0.18)))
-             #t)))))))
+       (("rust-actix-testing" ,rust-actix-testing-1))))))
 
 (define-public rust-actix-connect-0.2
   (package



reply via email to

[Prev in Thread] Current Thread [Next in Thread]