GNU bug report logs - #75980
[PATCH rust-team 000/106] Add cargo-development-inputs.

Previous Next

Full log

View this message in rfc822 format

From: Herman Rimm <herman <at> rimm.ee>
To: 75980 <at> debbugs.gnu.org
Cc: Divya Ranjan Pattanaik <divya <at> subvertising.org>, Efraim Flashner <efraim <at> flashner.co.il>
Subject: [bug#75980] [PATCH rust-team 070/106] gnu: rust-regex-0.1: Adjust Cargo.toml.
Date: Fri, 31 Jan 2025 22:10:31 +0100

* gnu/packages/crates-io.scm (rust-regex-0.1)[source]: Require simd 0.2
instead of 0.1.0.  Remove regex-syntax path.  [arguments]: Build.

Change-Id: I4ca4a86cc076654ca1cab406b6818601d0a62b14
---
 gnu/packages/crates-io.scm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9fdb1a80e50..ffd9442cfac 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -62890,22 +62890,24 @@ (define-public rust-regex-0.1
     (inherit rust-regex-0.2)
     (name "rust-regex")
     (version "0.1.80")
+    ;; Missing Cargo.toml.orig: not packaged by Cargo.
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "regex" version))
-       (file-name
-        (string-append name "-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32
-         "0bs036h3vzc6pj5jj4vc909s9rppq7b808ic99qn0y6gm3karm2g"))))
+        (base32 "0bs036h3vzc6pj5jj4vc909s9rppq7b808ic99qn0y6gm3karm2g"))
+       (modules '((guix build utils)))
+       (snippet #~(substitute* "Cargo.toml"
+                    (("version = \"0.1.0\"") "version = \"0.2\"")
+                    (("path =.*, ") "")))))
     (arguments
-     `(#:skip-build? #t     ; Can't find dependent crates.
-       #:cargo-inputs
+     `(#:cargo-inputs
        (("rust-aho-corasick" ,rust-aho-corasick-0.5)
         ("rust-memchr" ,rust-memchr-0.1)
         ("rust-regex-syntax" ,rust-regex-syntax-0.3)
-        ("rust-simd" ,rust-simd-0.2) ; 0.1?
+        ("rust-simd" ,rust-simd-0.2)
         ("rust-thread-local" ,rust-thread-local-0.2)
         ("rust-utf8-ranges" ,rust-utf8-ranges-0.1))
        #:cargo-development-inputs
-- 
2.47.1

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.