all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Herman Rimm via Guix-patches via <guix-patches@gnu.org>
To: 75206@debbugs.gnu.org
Cc: Efraim Flashner <efraim@flashner.co.il>
Subject: [bug#75206] [PATCH rust-team 09/10] gnu: rust-rustls-ffi-0.8: Use snippet.
Date: Mon, 30 Dec 2024 18:57:44 +0100	[thread overview]
Message-ID: <63707dcb8f8bfac8305a24ac4933b351101509ab.1735580850.git.herman@rimm.ee> (raw)
In-Reply-To: <87c8753e9ba06cb3bbab6e603028c63c7be834ed.1735580850.git.herman@rimm.ee>

* gnu/packages/crates-tls.scm (rust-rustls-ffi-0.8): Add snippet.
[arguments]: Remove adjust-cbindgen-requirement phase.

Change-Id: Ia7434a8a6e46425e331c19a510846c78074fd46a
---
 gnu/packages/crates-tls.scm | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm
index 36737998a9c..f66445487f8 100644
--- a/gnu/packages/crates-tls.scm
+++ b/gnu/packages/crates-tls.scm
@@ -1675,12 +1675,18 @@ (define-public rust-rustls-ffi-0.8
     (inherit rust-rustls-ffi-0.14)
     (name "rust-rustls-ffi")
     (version "0.8.2")
-    (source (origin
-              (method url-fetch)
-              (uri (crate-uri "rustls-ffi" version))
-              (file-name (string-append name "-" version ".tar.gz"))
-              (sha256
-               (base32 "06kqrvm1d5ps9pml26zdd2hm8hh20j6svwvqibpnx7m5rh3jg9cx"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rustls-ffi" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "06kqrvm1d5ps9pml26zdd2hm8hh20j6svwvqibpnx7m5rh3jg9cx"))
+       (modules '((guix build utils)))
+       ;; The Cargo.toml in the git repository doesn't specify a version
+       ;; requirement for cbindgen.
+       (snippet #~(substitute* "Cargo.toml"
+                    (("0\\.19\\.0") "*")))))
     (arguments
      `(#:cargo-inputs
        (("rust-libc" ,rust-libc-0.2)
@@ -1691,15 +1697,7 @@ (define-public rust-rustls-ffi-0.8
         ("rust-sct" ,rust-sct-0.7)
         ("rust-webpki" ,rust-webpki-0.22))
         #:cargo-development-inputs
-        (("rust-cbindgen" ,rust-cbindgen-0.26))
-        #:phases
-        (modify-phases %standard-phases
-          (add-after 'unpack 'adjust-cbindgen-requirement
-            ;; The Cargo.toml in the git repository doesn't specify
-            ;; a version requirement for cbindgen.
-            (lambda _
-              (substitute* "Cargo.toml"
-                (("0\\.19\\.0") "*")))))))))
+        (("rust-cbindgen" ,rust-cbindgen-0.26))))))
 
 (define-public rust-rustls-native-certs-0.8
   (package
-- 
2.45.2





  parent reply	other threads:[~2024-12-30 18:01 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-30 17:52 [bug#75206] [PATCH rust-team 01/10] gnu: rust-structopt-0.3: Use snippet Herman Rimm via Guix-patches via
2024-12-30 17:57 ` [bug#75206] [PATCH rust-team 02/10] gnu: rust-structopt-0.3: Build Herman Rimm via Guix-patches via
2024-12-30 17:57 ` [bug#75206] [PATCH rust-team 03/10] gnu: rust-syn-2: Use snippet Herman Rimm via Guix-patches via
2024-12-30 17:57 ` [bug#75206] [PATCH rust-team 04/10] gnu: rust-syn-1: Inherit rust-syn-2 Herman Rimm via Guix-patches via
2024-12-30 17:57 ` [bug#75206] [PATCH rust-team 05/10] gnu: rust-syn-0.11: Use snippet Herman Rimm via Guix-patches via
2024-12-30 17:57 ` [bug#75206] [PATCH rust-team 06/10] gnu: rust-synom-0.11: " Herman Rimm via Guix-patches via
2024-12-30 17:57 ` [bug#75206] [PATCH rust-team 07/10] gnu: rust-synom-0.11: Fix build Herman Rimm via Guix-patches via
2024-12-30 17:57 ` [bug#75206] [PATCH rust-team 08/10] gnu: rust-uint-0.9: Use snippet Herman Rimm via Guix-patches via
2024-12-30 17:57 ` Herman Rimm via Guix-patches via [this message]
2024-12-30 17:57 ` [bug#75206] [PATCH rust-team 10/10] gnu: rust-user32-sys-0.2: " Herman Rimm via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=63707dcb8f8bfac8305a24ac4933b351101509ab.1735580850.git.herman@rimm.ee \
    --to=guix-patches@gnu.org \
    --cc=75206@debbugs.gnu.org \
    --cc=efraim@flashner.co.il \
    --cc=herman@rimm.ee \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.