guix_mirror_bot pushed a commit to branch rust-team
in repository guix.
commit 8e712bf813e158e507a7338ab890c1c05b054fa6
Author: Efraim Flashner <[email protected]>
AuthorDate: Wed Nov 18 21:46:12 2026 +0200
gnu: Deprecate rust-sysroot-for-wasm32-unknown-unknown.
* gnu/packages/rust.scm (rust-sysroot-for-wasm32-unknown-unknown):
Define as deprecated alias for make-rust-sysroot for
wasm32-unknown-unknown.
* gnu/packages/node-xyz.scm (node-source-map)[native-inputs]: Remove
rust-sysroot-for-wasm32-unknown-unknown. Add make-rust-sysroot for
wasm32-unknown-unknown.
* gnu/packages/typst.scm (cetz-core-wasm, linguify-fluent-wasm): Same.
---
gnu/packages/node-xyz.scm | 2 +-
gnu/packages/rust.scm | 61 +++--------------------------------------------
gnu/packages/typst.scm | 4 ++--
3 files changed, 6 insertions(+), 61 deletions(-)
diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm
index ebce2abfa35..6a3c21caf56 100644
--- a/gnu/packages/node-xyz.scm
+++ b/gnu/packages/node-xyz.scm
@@ -4315,7 +4315,7 @@ connection.")))
lld
node
python
- rust-sysroot-for-wasm32-unknown-unknown))
+ (make-rust-sysroot "wasm32-unknown-unknown")))
(inputs (cargo-inputs 'source-map-mappings-wasm-api))
(home-page "https://github.com/mozilla/source-map")
(synopsis "Generates and consumes source maps")
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index a2a8215e7a2..a14088f14ae 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -1637,64 +1637,9 @@ ar = \"" #$@(if (with-cross-gcc? target)
(properties
`((hidden? . #t) ,(package-properties base-rust))))))
-(define-public rust-sysroot-for-wasm32-unknown-unknown
- (package
- (inherit (make-rust-sysroot "i686-linux-gnu"))
- (name "rust-sysroot-for-wasm32-unknown-unknown")
- (arguments
- (substitute-keyword-arguments arguments
- ((#:phases phases)
- #~(modify-phases #$phases
- (replace 'set-env
- (lambda _
- (setenv "SHELL" (which "sh"))
- (setenv "CONFIG_SHELL" (which "sh"))
- (setenv "CC" (which "clang"))
- ;; The Guix LLVM package installs only shared libraries.
- (setenv "LLVM_LINK_SHARED" "1")))
- (replace 'configure
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (call-with-output-file "config.toml"
- (lambda (port)
- (display (string-append "
-[llvm]
-[build]
-optimized-compiler-builtins = false
-cargo = \"" (search-input-file inputs "/bin/cargo") "\"
-rustc = \"" (search-input-file inputs "/bin/rustc") "\"
-docs = false
-python = \"" (which "python") "\"
-vendor = true
-submodules = false
-target = [\"wasm32-unknown-unknown\"]
-[install]
-prefix = \"" (assoc-ref outputs "out") "\"
-sysconfdir = \"etc\"
-[rust]
-debug = false
-jemalloc = false
-default-linker = \"lld\"
-channel = \"stable\"
-[target." #$(platform-rust-target (lookup-platform-by-system
(%current-system))) "]
-# These are all native tools
-llvm-config = \"" (search-input-file inputs "/bin/llvm-config") "\"
-linker = \"" (which "gcc") "\"
-cc = \"" (which "gcc") "\"
-cxx = \"" (which "g++") "\"
-ar = \"" (which "ar") "\"
-[target.wasm32-unknown-unknown]
-llvm-config = \"" (search-input-file inputs "/bin/llvm-config") "\"
-linker = \"lld\"
-cc = \"clang\"
-cxx = \"clang++\"
-ar = \"ar\"
-[dist]
-") port)))))))))
- ;; Use native-inputs of base rust.
- (native-inputs
- (modify-inputs (package-native-inputs rust)
- ;; Remove the test inputs
- (delete "gdb" "git-minimal" "procps")))))
+;; TODO: Remove when 2027/06 comes.
+(define-deprecated-package rust-sysroot-for-wasm32-unknown-unknown
+ (make-rust-sysroot "wasm32-unknown-unknown"))
(define-public rust-analyzer
(package
diff --git a/gnu/packages/typst.scm b/gnu/packages/typst.scm
index 8d7e1a95f99..52d5e126197 100644
--- a/gnu/packages/typst.scm
+++ b/gnu/packages/typst.scm
@@ -280,7 +280,7 @@ configuration-free.")
(string-append #$output "/share/typst/packages/preview/cetz/"
#$version "/cetz-core")))))))
(inputs (cargo-inputs 'cetz-core))
- (native-inputs (list lld rust-sysroot-for-wasm32-unknown-unknown))
+ (native-inputs (list lld (make-rust-sysroot "wasm32-unknown-unknown")))
(home-page "https://cetz-package.github.io")
(synopsis "Library for drawing in Typst")
(description "CeTZ is a library for drawing figures in Typst,
@@ -332,7 +332,7 @@ used by the actual CeTZ package.")
(string-append #$output
"/share/typst/packages/preview/linguify/"
#$version)))))))
(inputs (cargo-inputs 'linguify-fluent))
- (native-inputs (list lld rust-sysroot-for-wasm32-unknown-unknown))
+ (native-inputs (list lld (make-rust-sysroot "wasm32-unknown-unknown")))
(home-page "https://typst.app/universe/package/linguify")
(synopsis "Easily localize packages and templates")
(description "Linguify is a Typst library for loading strings for different