GNU bug report logs - #75210
[PATCH rust-team] gnu: rust-rustix-0.38: Remove snippet.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 75210 in the body.
You can then email your comments to 75210 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Herman Rimm <herman <at> rimm.ee>
To: guix-patches <at> gnu.org
Subject: [PATCH rust-team] gnu: rust-rustix-0.38: Remove snippet.
Date: Mon, 30 Dec 2024 20:38:47 +0100

* gnu/packages/crates-io.scm (rust-rustix-0.38): Remove snippet.

Change-Id: I2c8e9c50dd297038e4bd084ebfa01b49fee022aa
---
 gnu/packages/crates-io.scm | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0b38709201d..bfcd77139f3 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -69779,23 +69779,7 @@ (define-public rust-rustix-0.38
        (uri (crate-uri "rustix" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1h33ilqk4psn6kqfmd232df3x3lrwp4gjl2nisdmajyw3hzfmr4r"))
-       (snippet
-        #~(begin (use-modules (guix build utils))
-                 (for-each delete-file (find-files "." "\\.a$"))
-                 (delete-file "Cargo.toml")
-                 (substitute* "Cargo.toml.orig"
-                   ;; Depend unconditionally on the cc crate
-                   (("(cc = .*), optional = true.*" _ cc)
-                    (string-append cc " }\n"))
-                   ;; Disable using the linux_raw backend
-                   (("not\\(rustic_use_libc\\)") "miri"))
-                 (substitute* "build.rs"
-                   ;; Always use the 'feature = "cc"' path
-                   (("not\\(feature = \"cc\"\\)") "feature = \"foobar\"")
-                   (("#\\[cfg\\(feature = \"cc\"\\)\\]" all)
-                    (string-append "//" all)))
-                 (copy-file "Cargo.toml.orig" "Cargo.toml")))))
+        (base32 "1h33ilqk4psn6kqfmd232df3x3lrwp4gjl2nisdmajyw3hzfmr4r"))))
     (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs

base-commit: 4d478f0b404a86a0849722536f11fde0b1857bb8
-- 
2.45.2

Message #10 received at 75210-done <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: Herman Rimm <herman <at> rimm.ee>
Cc: 75210-done <at> debbugs.gnu.org
Subject: Re: [bug#75210] [PATCH rust-team] gnu: rust-rustix-0.38: Remove
 snippet.
Date: Tue, 31 Dec 2024 21:50:33 +0200

[Message part 1 (text/plain, inline)]

This one I was unsure about, but it built just fine on riscv64 so it
looks good.

Pushed to the rust-team branch.

-- 
Efraim Flashner   <efraim <at> flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[signature.asc (application/pgp-signature, inline)]

Previous Next

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