From 8a35e58a27a4d06f2bed7d6a6b106ed6d242555c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Sep 2019 15:44:05 +0300 Subject: gnu: js-html5shiv: Don't use unstable tarball. * gnu/packages/javascript.scm (js-html5shiv)[source]: Use 'git-fetch'. --- gnu/packages/javascript.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/javascript.scm') diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 9e1818dfaf..472fd5e98f 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -194,13 +194,14 @@ Media Queries.") (name "js-html5shiv") (version "3.7.3") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/aFarkas/html5shiv/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/aFarkas/html5shiv") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0inlbpxpqzdyi24lqagzf7l24zxg0y02xcpqs2h4npjscazzw7hg")))) + "0y1c5nyq0brl9fjdihhax33vks4s1ij9iv113879sg3zflmgqpd0")))) (build-system minify-build-system) (home-page "https://github.com/aFarkas/html5shiv") (synopsis "Enable HTML5 sectioning elements in legacy browsers") -- cgit v1.2.3 From 16df2914144b56fcc481e1b7837aaf724fdd8d21 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Sep 2019 15:57:50 +0300 Subject: gnu: js-strftime: Don't use unstable tarball. * gnu/packages/javascript.scm (js-strftime)[source]: Use 'git-fetch'. --- gnu/packages/javascript.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/javascript.scm') diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 472fd5e98f..ff6878fdf0 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -265,13 +265,14 @@ provided by ES5. @code{JSONPath} is used to represent the links.") (name "js-strftime") (version "0.10.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/samsonjs/strftime/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url"https://github.com/samsonjs/strftime") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1iya43w7y26y2dp9l4d40bhjc4scb5a9mng5ng5c8hsqr82f1375")))) + "131nmlivazwxyba25kh9lda99749fq4xsyin6lzfalaaydviby4p")))) (build-system minify-build-system) (arguments `(#:javascript-files '("strftime.js"))) -- cgit v1.2.3 From 778f4430e0d3de0ec8e29926f636aca3ed2709e0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Sep 2019 16:00:24 +0300 Subject: gnu: js-highlight: Don't use unstable tarball. * gnu/packages/javascript.scm (js-highlight)[source]: Use 'git-fetch'. --- gnu/packages/javascript.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/javascript.scm') diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index ff6878fdf0..aa2c17fb68 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -289,13 +289,14 @@ well as some other extensions from Ruby.") (name "js-highlight") (version "9.12.0") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/isagalaev/highlight.js/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/isagalaev/highlight.js") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1jjn9mj7fwq4zpr6is438bscf03b3q8jkj0k5c3fc6pkmjnhw939")))) + "12qz22qjpd6svj58pwgcwg2x2rzhihfdrxg6lgj39nfpaln6dris")))) (build-system minify-build-system) (arguments `(#:javascript-files '("src/highlight.js"))) -- cgit v1.2.3 From 4151447897dbc0ea78d192278371afb6b1218b5f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Sep 2019 16:02:40 +0300 Subject: gnu: js-selectize: Don't use unstable tarball. * gnu/packages/javascript.scm (js-selectize)[source]: Use 'git-fetch'. --- gnu/packages/javascript.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/javascript.scm') diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index aa2c17fb68..ed338c72dd 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -337,13 +337,14 @@ HTML tables with minimal effort.") (name "js-selectize") (version "0.12.4") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/selectize/selectize.js/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/selectize/selectize.js") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0756p49aaz34mw2dx8k1gxf210mngfrri25vkba0j7wihd2af8gn")))) + "1l6gdl9v9z0xb1yl81ssaqm067imjbxwbpa76nd0cyrx0jskih22")))) (build-system minify-build-system) (arguments `(#:javascript-files '("src/selectize.js"))) (home-page "http://selectize.github.io/selectize.js/") -- cgit v1.2.3 From 3500cb58f86b3966b9bca446f6d51498d112390d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Sep 2019 16:03:41 +0300 Subject: gnu: js-selectize: Update to 0.12.6. * gnu/packages/javascript.scm (js-selectize): Update to 0.12.6. --- 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 ed338c72dd..3b10442e35 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -335,7 +335,7 @@ HTML tables with minimal effort.") (define-public js-selectize (package (name "js-selectize") - (version "0.12.4") + (version "0.12.6") (source (origin (method git-fetch) (uri (git-reference @@ -344,7 +344,7 @@ HTML tables with minimal effort.") (file-name (git-file-name name version)) (sha256 (base32 - "1l6gdl9v9z0xb1yl81ssaqm067imjbxwbpa76nd0cyrx0jskih22")))) + "15gichl8wi6yxag2ps723nxrgyan15976dzsnvw9h9py8sbyyzjn")))) (build-system minify-build-system) (arguments `(#:javascript-files '("src/selectize.js"))) (home-page "http://selectize.github.io/selectize.js/") -- cgit v1.2.3 From 2209a4476e58b9fb4e0fe154179fe8d22a1430cb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Sep 2019 16:05:28 +0300 Subject: gnu: js-es5-shim: Don't use unstable tarball. * gnu/packages/javascript.scm (js-es5-shim)[source]: Use 'git-fetch'. --- gnu/packages/javascript.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/javascript.scm') diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 3b10442e35..da7226e50e 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -359,13 +359,14 @@ navigation; it is useful for tagging, contact lists, etc.") (name "js-es5-shim") (version "4.5.9") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/es-shims/es5-shim/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/es-shims/es5-shim") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0yfndyijz0ykddzprpvfjb2453gzpn528klmwycwbqc1bqd3m1hl")))) + "03kp6iinnr8ky298k3cfa5rm2ykqfry1nd65dqaywc3i3fs3h43d")))) (build-system minify-build-system) (arguments `(#:javascript-files '("es5-sham.js" -- cgit v1.2.3 From 9cf60dec1d4862e52e942e2674e12d1dc3e1f535 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Sep 2019 16:06:31 +0300 Subject: gnu: js-es5-shim: Update to 4.5.13. * gnu/packages/javascript.scm (js-es5-shim): Update to 4.5.13. --- 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 da7226e50e..cc0542636c 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -357,7 +357,7 @@ navigation; it is useful for tagging, contact lists, etc.") (define-public js-es5-shim (package (name "js-es5-shim") - (version "4.5.9") + (version "4.5.13") (source (origin (method git-fetch) (uri (git-reference @@ -366,7 +366,7 @@ navigation; it is useful for tagging, contact lists, etc.") (file-name (git-file-name name version)) (sha256 (base32 - "03kp6iinnr8ky298k3cfa5rm2ykqfry1nd65dqaywc3i3fs3h43d")))) + "142w384fbyllq4yggv173g82lw3wix4jqcg6hkhx1ymq89vvnpmh")))) (build-system minify-build-system) (arguments `(#:javascript-files '("es5-sham.js" -- cgit v1.2.3 From e452c69aa89b2646c93235e4c4322e9f60040a1b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Sep 2019 16:08:18 +0300 Subject: gnu: js-filesaver: Don't use unstable tarball. * gnu/packages/javascript.scm (js-filesaver)[source]: Use 'git-fetch'. --- gnu/packages/javascript.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/javascript.scm') diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index cc0542636c..da285db0b9 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -386,13 +386,14 @@ means that these shams cause many ES5 methods to silently fail.") (name "js-filesaver") (version "1.3.8") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/eligrey/FileSaver.js/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/eligrey/FileSaver.js") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1rkhfqs5plaj628kzj7qgm5qahy4v7ihygifidqr6g6265mil97h")))) + "0gvqk0hnr8fig0n4da7vj7q6z31bcyv52916xz3rbmdj3pgpiv1d")))) (build-system minify-build-system) (arguments `(#:phases -- cgit v1.2.3 From 367d0833c3c4d6828fe47bee5513a8ac78016c3e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Sep 2019 16:14:41 +0300 Subject: gnu: js-respond: Use minify-build-system. * gnu/packages/javascript.scm (js-respond)[build-system]: Use minify-build-system. [arguments]: Remove custom builder code. [native-inputs]: Remove uglify-js, source, gzip, tar. --- gnu/packages/javascript.scm | 34 ++++------------------------------ 1 file changed, 4 insertions(+), 30 deletions(-) (limited to 'gnu/packages/javascript.scm') diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index da285db0b9..ba0ccddff4 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -151,38 +151,12 @@ be able to view it naturally and easily."))) (sha256 (base32 "0ds1ya2a185jp93mdn07159c2x8zczwi960ykrawpp62bwk2n93d")))) - (build-system trivial-build-system) + (build-system minify-build-system) (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils) - (ice-9 match) - (ice-9 popen) - (srfi srfi-26)) - (set-path-environment-variable - "PATH" '("bin") (map (match-lambda - ((_ . input) - input)) - %build-inputs)) - (let ((install-directory (string-append %output - "/share/javascript/respond/"))) - (invoke "tar" "xvf" - (assoc-ref %build-inputs "source") - "--strip" "1") - (mkdir-p install-directory) - (let* ((file "src/respond.js") - (installed (string-append install-directory "respond.min.js"))) - (let ((minified (open-pipe* OPEN_READ "uglify-js" file))) - (call-with-output-file installed - (cut dump-port minified <>))))) - #t))) + `(#:javascript-files '("src/matchmedia.addListener.js" + "src/matchmedia.polyfill.js" + "src/respond.js"))) (home-page "https://github.com/scottjehl/Respond") - (native-inputs - `(("uglify-js" ,uglify-js) - ("source" ,source) - ("gzip" ,gzip) - ("tar" ,tar))) (synopsis "Polyfill for min/max-width CSS3 Media Queries") (description "The goal of this script is to provide a fast and lightweight script to enable responsive web designs in browsers that don't support CSS3 -- cgit v1.2.3 From 97f6004ca194a764bc7829f1ebdc292ef01f9b2b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Sep 2019 16:12:50 +0300 Subject: gnu: js-respond: Don't use unstable-tarball. * gnu/packages/javascript.scm (js-respond)[source]: Use 'git-fetch'. --- gnu/packages/javascript.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/javascript.scm') diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index ba0ccddff4..2390c23c4b 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -144,13 +144,14 @@ be able to view it naturally and easily."))) (name "js-respond") (version "1.4.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/scottjehl/Respond/" - "archive/" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/scottjehl/Respond") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0ds1ya2a185jp93mdn07159c2x8zczwi960ykrawpp62bwk2n93d")))) + "00xid731rirc7sdy1gc8qal3v9g0agr2qx15hm4x97l1lcbylyn2")))) (build-system minify-build-system) (arguments `(#:javascript-files '("src/matchmedia.addListener.js" -- cgit v1.2.3 From 4112ff7e74ee1d1f13c3a7f4aaa6dc9d0ca8c3eb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 15 Sep 2019 21:19:53 +0200 Subject: gnu: Add js-requirejs. * gnu/packages/javascript.scm (js-requirejs): New variable. --- gnu/packages/javascript.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'gnu/packages/javascript.scm') diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 2390c23c4b..2993eb66f6 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Arun Isaac -;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017, 2019 Ricardo Wurmus ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2018 Nicolas Goaziou @@ -307,6 +307,28 @@ Javascript library, adding sorting, paging and filtering abilities to plain HTML tables with minimal effort.") (license license:expat))) +(define-public js-requirejs + (package + (name "js-requirejs") + (version "2.3.6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/requirejs/requirejs.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0cvd5y2mb3h6yil3niqn3gjqrzixdsxcz4rvc2f0hg4kzp5y0w86")))) + (build-system minify-build-system) + (arguments `(#:javascript-files '("require.js"))) + (home-page "https://github.com/requirejs/requirejs/") + (synopsis "File and module loader for JavaScript") + (description "RequireJS loads plain JavaScript files as well as more +defined modules. It is optimized for in-browser use, including in a Web +Worker, but it can be used in other JavaScript environments.") + (license license:expat))) + (define-public js-selectize (package (name "js-selectize") -- cgit v1.2.3