This is an automated email from the git hooks/post-receive script.
guix_mirror_bot pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 3d72501fdff gnu: node-source-map: Update to 0.7.6.
3d72501fdff is described below
commit 3d72501fdfff6a660949810ebfa31a635f1fbebb
Author: Orahcio FelĂcio de Sousa <[email protected]>
AuthorDate: Wed Nov 11 22:13:50 2026 -0300
gnu: node-source-map: Update to 0.7.6.
* gnu/packages/node-xyz.scm (node-source-map): Update to 0.7.6.
[source]: Add patch.
[build-system]: Replace node-build-system with cargo-build-system.
[arguments]<#:modules>: Remove.
<#:phases>{modify-package}: Remove. {build}: Replace esbuild with
build.py, matching the CONTRIBUTING.md flow.
{chdir-to-wasm-api, configure-target}: Add.
{check, install}: Replace phases to adapt cargo-build-system, keeping
node-build-system output style.
[native-inputs]: Remove esbuild. Add binaryen, lld, node, python and
rust-sysroot-for-wasm32-unknown-unknown.
[inputs]: Add cargo-inputs for source-map-mappings-wasm-api crates.
* gnu/packages/patches/node-source-map-fix-mapping-callback.patch: New file.
* gnu/packages/rust-crates.scm (lookup-cargo-inputs)
[source-map-mappings-wasm-api]: Add entry.
Change-Id: I39ea8fde36a2905fa34b73a06cd385426b15d49a
Signed-off-by: Efraim Flashner <[email protected]>
---
gnu/packages/node-xyz.scm | 108 ++++++++++++++-------
.../node-source-map-fix-mapping-callback.patch | 19 ++++
gnu/packages/rust-crates.scm | 11 +++
3 files changed, 102 insertions(+), 36 deletions(-)
diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm
index c9e22bbe579..afcd0c5693d 100644
--- a/gnu/packages/node-xyz.scm
+++ b/gnu/packages/node-xyz.scm
@@ -27,10 +27,15 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages node-xyz)
+ #:use-module (gnu packages)
#:use-module (gnu packages base) ; sed
+ #:use-module (gnu packages llvm)
#:use-module (gnu packages sqlite)
+ #:use-module (gnu packages node)
#:use-module (gnu packages python)
+ #:use-module (gnu packages rust)
#:use-module (gnu packages web) ; node-esbuild
+ #:use-module (guix build-system cargo)
#:use-module (guix build-system copy)
#:use-module (guix build-system node)
#:use-module ((guix build-system pyproject) #:select (pypi-uri))
@@ -4246,52 +4251,83 @@ connection.")))
(define-public node-source-map
(package
(name "node-source-map")
- (version "0.6.1")
+ (version "0.7.6")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/mozilla/source-map")
- (commit version)))
+ (commit version)
+ ;; Download cargo submodule to compile mappings.wasm
+ ;; Also download submodules for test, they are WIP
+ (recursive? #t)))
(file-name (git-file-name name version))
(sha256
- (base32 "0q8qaddi05387y8f58q0xlj7fjxf4mkymmir7wd9c5imqqs378md"))
- (modules '((guix build utils)))
- (snippet #~(begin
- (delete-file-recursively "dist")))))
- (build-system node-build-system)
- (native-inputs (list esbuild))
- (arguments (list
- #:modules '((guix build node-build-system)
- (guix build json-utils)
- (guix build utils)
- (ice-9 match)
- (json))
- #:phases #~(modify-phases %standard-phases
- (add-before 'patch-dependencies 'modify-package (lambda _
- (modify-json
- (delete-dev-dependencies)
- (replace-json-fields
- (list (cons "scripts.test" "node test/run-tests.js"))))))
- (replace 'build (lambda _
- (for-each
- (match-lambda ((name parameters)
- (apply invoke (append
- (list
- "esbuild"
- "source-map.js"
- "--bundle"
- "--format=iife"
- "--global-name=sourceMap"
- (string-append "--outfile=dist/source-map" name ".js"))
- parameters))))
- (list
- (list "" (list))
- (list ".min" (list "--sourcemap" "--minify")))))))))
+ (base32 "1l07f5389wr64nn2mdv05jgf5ng78ksa7vbw42s9drlix8biddl6"))
+ (patches
+ (search-patches "node-source-map-fix-mapping-callback.patch"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list
+ #:install-source? #f
+ #:imported-modules (append %copy-build-system-modules
+ %cargo-build-system-modules)
+ #:modules '((guix build cargo-build-system)
+ ((guix build copy-build-system) #:prefix copy:)
+ (guix build utils))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'chdir-to-wasm-api
+ (lambda _
+ (chdir "wasm-mappings/source-map-mappings-wasm-api")))
+ (add-after 'configure 'configure-target
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((sysroot
+ (assoc-ref inputs
+ "rust-sysroot-for-wasm32-unknown-unknown")))
+ (mkdir-p ".cargo")
+ (with-atomic-file-replacement ".cargo/config"
+ (lambda (in out)
+ (display (string-append "\
+[target.wasm32-unknown-unknown]
+linker = 'lld'
+
+[build]
+target = ['wasm32-unknown-unknown']
+") out)
+ (dump-port in out)))
+ (setenv "RUSTFLAGS" (string-append "--sysroot " sysroot)))))
+ (replace 'build
+ (lambda _
+ (invoke "python3" "./build.py"
+ "--no-wasm-gc"
+ "--no-wasm-snip"
+ "-o" "../../lib/mappings.wasm")))
+ (replace 'check
+ (lambda _
+ (chdir "../../")
+ (invoke "node" "test/run-tests.js")))
+ (replace 'install
+ (lambda args
+ (apply (assoc-ref copy:%standard-phases 'install)
+ #:install-plan
+ `(("lib" "lib/node_modules/source-map/lib")
+ ("source-map.js" "lib/node_modules/source-map/")
+ ("source-map.d.ts" "lib/node_modules/source-map/")
+ ("package.json" "lib/node_modules/source-map/")
+ ("LICENSE" "lib/node_modules/source-map/"))
+ args))))))
+ (native-inputs
+ (list binaryen
+ lld
+ node
+ python
+ rust-sysroot-for-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")
(description "This is a library to generate and consume the source map
format\
@uref{https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k\
/edit, described here}.")
- (home-page (git-reference-url (origin-uri source)))
(license license:bsd-3)))
(define-public node-source-map-support
diff --git a/gnu/packages/patches/node-source-map-fix-mapping-callback.patch
b/gnu/packages/patches/node-source-map-fix-mapping-callback.patch
new file mode 100644
index 00000000000..1036f9c7650
--- /dev/null
+++ b/gnu/packages/patches/node-source-map-fix-mapping-callback.patch
@@ -0,0 +1,19 @@
+Author: Max Gilmour <[email protected]>
+Bug: https://github.com/mozilla/source-map/issues/530
+Bug-Debian: https://bugs.debian.org/1142614
+Forwarded: https://github.com/mozilla/source-map/pull/531
+Last-Update: 2026-07-22
+---
+--- a/wasm-mappings/source-map-mappings-wasm-api/src/lib.rs
++++ b/wasm-mappings/source-map-mappings-wasm-api/src/lib.rs
+@@ -251,6 +251,10 @@
+ mappings.as_mut().unwrap()
+ }
+
++// Since Rust 1.96 (rust-lang/rust#149868), wasm-ld is no longer invoked with
++// `--allow-undefined`. As the PR states, importing from `env` must now be
++// declared with the following line.
++#[link(wasm_import_module = "env")]
+ extern "C" {
+ fn mapping_callback(
+ // These two parameters are always valid.
\ No newline at end of file
diff --git a/gnu/packages/rust-crates.scm b/gnu/packages/rust-crates.scm
index ee7eb6d9491..ae10a18a05b 100644
--- a/gnu/packages/rust-crates.scm
+++ b/gnu/packages/rust-crates.scm
@@ -104342,6 +104342,17 @@ fn main() {
rust-zvariant-5.10.0
rust-zvariant-derive-5.10.0
rust-zvariant-utils-3.3.0))
+ (source-map-mappings-wasm-api =>
+ (list rust-fuchsia-cprng-0.1.1
+ rust-libc-0.2.191
+ rust-rand-0.4.6
+ rust-rand-core-0.3.2
+ rust-rand-core-0.4.3
+ rust-rdrand-0.4.0
+ rust-vlq-0.5.1
+ rust-winapi-0.3.9
+ rust-winapi-i686-pc-windows-gnu-0.4.0
+ rust-winapi-x86-64-pc-windows-gnu-0.4.0))
(speakersafetyd =>
(list rust-alsa-0.9.1
rust-alsa-sys-0.3.1