all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#75210] [PATCH rust-team] gnu: rust-rustix-0.38: Remove snippet.
@ 2024-12-30 19:38 Herman Rimm via Guix-patches via
  2024-12-31 19:50 ` bug#75210: " Efraim Flashner
  0 siblings, 1 reply; 2+ messages in thread
From: Herman Rimm via Guix-patches via @ 2024-12-30 19:38 UTC (permalink / raw)
  To: 75210; +Cc: Efraim Flashner

* 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





^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#75210: [PATCH rust-team] gnu: rust-rustix-0.38: Remove snippet.
  2024-12-30 19:38 [bug#75210] [PATCH rust-team] gnu: rust-rustix-0.38: Remove snippet Herman Rimm via Guix-patches via
@ 2024-12-31 19:50 ` Efraim Flashner
  0 siblings, 0 replies; 2+ messages in thread
From: Efraim Flashner @ 2024-12-31 19:50 UTC (permalink / raw)
  To: Herman Rimm; +Cc: 75210-done

[-- Attachment #1: Type: text/plain, Size: 331 bytes --]

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@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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-12-31 19:52 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-30 19:38 [bug#75210] [PATCH rust-team] gnu: rust-rustix-0.38: Remove snippet Herman Rimm via Guix-patches via
2024-12-31 19:50 ` bug#75210: " Efraim Flashner

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.