* gnu/packages/gnuzilla.scm (mozjs): Update to 128.3.1. [#:phases]: Set HOME. : Update accordingly. [native-inputs]: Add rust-cbindgen. (mozjs-102): New variable. --- gnu/packages/gnuzilla.scm | 49 +++++++++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index a65b1fbb8b..567384a5a9 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -104,7 +104,7 @@ (define-module (gnu packages gnuzilla) (define-public mozjs (package (name "mozjs") - (version "102.2.0") + (version "128.3.1") (source (origin (method url-fetch) ;; TODO: Switch to IceCat source once available on ftp.gnu.org. @@ -113,7 +113,7 @@ (define-public mozjs version "esr.source.tar.xz")) (sha256 (base32 - "1zwpgis7py1bf8p88pz3mpai6a02qrdb8ww2fa9kxxdl9b8r2k81")))) + "1a3h7p7126pxzpidb1lqckvhfh1had805mai4l96mnc878phbx61")))) (build-system gnu-build-system) (arguments (list @@ -161,6 +161,8 @@ (define-public mozjs ;; but not the root directory either. (mkdir "run-configure-from-here") (chdir "run-configure-from-here") + ;; Configure script writes to $HOME. + (setenv "HOME" (getcwd)) (setenv "SHELL" (which "sh")) (setenv "CONFIG_SHELL" (which "sh")) (setenv "AUTOCONF" (which "autoconf")) @@ -198,7 +200,29 @@ (define-public mozjs ;; FIXME: got "en-US-posix", expected "en-US-POSIX". (delete-file "non262/Intl/available-locales-supported.js") ;; FIXME: got "en-US", expected "en-US-POSIX" - (delete-file "non262/Intl/available-locales-resolved.js")))) + (delete-file "non262/Intl/available-locales-resolved.js") + + ;;; Since 115: + ;; Mismatching array lengths + (delete-file "non262/Intl/supportedValuesOf-timeZones-canonical.js") + ;; FIXME: got "America/Santa_Isabel", expected "America/Tijuana": + ;; America/Santa_Isabel -> America/Tijuana + (delete-file "non262/Intl/DateTimeFormat/timeZone_backward_links.js") + ;; TODO: tzdata 2024a expected – find a way to regenerate + ;; these generated tests + (delete-file "non262/Intl/DateTimeFormat/timeZone_version.js") + + ;; FIXME: got "\uD840\uDDF2", expected "\u5047" + (delete-file "non262/Intl/Collator/implicithan.js") + ;; FIXME: got "\uD840\uDDF2", expected "\u3467" + (delete-file "non262/Intl/Collator/big5han-gb2312han.js") + + ;; Since 128: + ;; FIXME: got (void 0), expected "GMT" + (delete-file "non262/Intl/DateTimeFormat/formatRange-timeZoneName-matches-format.js") + ;; FIXME: got 7, expected 9: parts count mismatch + (delete-file "non262/Intl/DateTimeFormat/formatRange-timeZone-offset.js") + (delete-file "non262/Intl/DateTimeFormat/formatRange-timeZoneName.js")))) (add-before 'check 'pre-check (lambda _ (setenv "JSTESTS_EXTRA_ARGS" @@ -219,7 +243,8 @@ (define-public mozjs pkg-config python-wrapper rust - `(,rust "cargo"))) + `(,rust "cargo") + rust-cbindgen)) (inputs (list icu4c readline zlib)) (propagated-inputs @@ -231,6 +256,22 @@ (define-public mozjs in C/C++.") (license license:mpl2.0))) ; and others for some files +(define-public mozjs-102 + (package + (inherit mozjs) + (name "mozjs") + (version "102.2.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ftp.mozilla.org/pub/firefox" + "/releases/" version "esr/source/firefox-" + version "esr.source.tar.xz")) + (sha256 + (base32 + "1zwpgis7py1bf8p88pz3mpai6a02qrdb8ww2fa9kxxdl9b8r2k81")))) + (inputs (modify-inputs (package-inputs mozjs) + (replace "icu4c" icu4c-71))))) + (define-public mozjs-91 (package (inherit mozjs) -- 2.46.0