From 8ebfa60d93141d83e1217d3557e194da87fe6c14 Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Sun, 15 Nov 2020 20:57:50 +0000 Subject: gnu: quickjs: Update to 2020-11-08. * gnu/packages/javascript.scm (quickjs): Update to 2020-11-08. Signed-off-by: Efraim Flashner --- gnu/packages/javascript.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/javascript.scm') diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 0e61cf10ff8..669951f7419 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -451,14 +451,14 @@ roots, or wrestle with obscure build systems.") (define-public quickjs (package (name "quickjs") - (version "2020-09-06") + (version "2020-11-08") (source (origin (method url-fetch) (uri (string-append "https://bellard.org/quickjs/quickjs-" version ".tar.xz")) (sha256 (base32 - "05vpnnzmws7plnwsnk2brwf7whyj84l5xl0iahi1xdn6rpla6880")))) + "0yqqcjxi3cqagw184mqrxpvqg486x7c233r3cp9mxachngd6779f")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.3 From d3e6f41ad63e64c0fdfb9c24c2a9d1a2dd49b636 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 23 Nov 2020 22:03:27 +0100 Subject: gnu: mujs: Fetch sources from git. * gnu/packages/javascript.scm (mujs)[source]: GIT-FETCH the sources directly from the author. [arguments]: Add VERSION to #:make-flags. --- gnu/packages/javascript.scm | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'gnu/packages/javascript.scm') diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 669951f7419..48f3e85f77d 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017, 2019 Ricardo Wurmus -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2018 Nicolas Goaziou ;;; @@ -416,23 +416,27 @@ external server.") (package (name "mujs") (version "1.0.7") - (source (origin - (method url-fetch) - (uri (string-append "https://mujs.com/downloads/mujs-" - version ".tar.xz")) - (sha256 - (base32 - "1ilhay15z4k7mlzs6g2d00snivin7vp72dfw5wwpmc0x70jr31l2")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ccxvii/mujs") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "08cm3w51xx1bznlglys9wl76vmbdf6jbd3cq504wzrqh10vgdfbv")))) (build-system gnu-build-system) (arguments - '(#:phases + `(#:phases (modify-phases %standard-phases - (delete 'configure) ; no configure + (delete 'configure) ; no configure script (add-after 'install 'install-shared-library (lambda* (#:key (make-flags '()) #:allow-other-keys) (apply invoke "make" "install-shared" make-flags)))) - #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out")) - (string-append "CC=gcc")) + #:make-flags + (list ,(string-append "VERSION=" version) + (string-append "CC=gcc") + (string-append "prefix=" (assoc-ref %outputs "out"))) #:tests? #f)) ; no tests (inputs `(("readline" ,readline))) -- cgit v1.3 From f289d922b2d6530c15d1521cc136b7b2eb722baa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 23 Nov 2020 22:05:42 +0100 Subject: gnu: mujs: Update to 1.0.9. * gnu/packages/javascript.scm (mujs): Update to 1.0.9. --- gnu/packages/javascript.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/javascript.scm') diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 48f3e85f77d..7c526ccb3c1 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -415,7 +415,7 @@ external server.") (define-public mujs (package (name "mujs") - (version "1.0.7") + (version "1.0.9") (source (origin (method git-fetch) @@ -424,7 +424,7 @@ external server.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "08cm3w51xx1bznlglys9wl76vmbdf6jbd3cq504wzrqh10vgdfbv")))) + (base32 "146lmmigqlvx36d3fzb9kk7sy6y4ddv0ih4pkjz4zyj30zl84gy2")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.3 From 4a74499cd9af6eea1e1d74e46bf0a7a7123d9e3b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 23 Nov 2020 22:08:20 +0100 Subject: gnu: mujs: Cross-compile. * gnu/packages/javascript.scm (mujs)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/javascript.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/javascript.scm') diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 7c526ccb3c1..709ca009929 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -32,7 +32,8 @@ #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) - #:use-module (guix build-system minify)) + #:use-module (guix build-system minify) + #:use-module (guix utils)) (define-public font-mathjax (package @@ -435,7 +436,7 @@ external server.") (apply invoke "make" "install-shared" make-flags)))) #:make-flags (list ,(string-append "VERSION=" version) - (string-append "CC=gcc") + ,(string-append "CC=" (cc-for-target)) (string-append "prefix=" (assoc-ref %outputs "out"))) #:tests? #f)) ; no tests (inputs -- cgit v1.3 From 94147d672ab217f21e12bb20bd958e3da66a61f5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 23 Nov 2020 22:10:37 +0100 Subject: gnu: mujs: Omit static library. * gnu/packages/javascript.scm (mujs)[arguments]: Replace the default 'install phase which would install (only) the static library. --- gnu/packages/javascript.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/javascript.scm') diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 709ca009929..ac9fbfea60d 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -431,7 +431,7 @@ external server.") `(#:phases (modify-phases %standard-phases (delete 'configure) ; no configure script - (add-after 'install 'install-shared-library + (replace 'install (lambda* (#:key (make-flags '()) #:allow-other-keys) (apply invoke "make" "install-shared" make-flags)))) #:make-flags -- cgit v1.3