Message ID | Hyy9vJoFIM6sumrJZHQQQIrsuW0vPLOb7pQ5EPnh16HGxkYQzVWvc89AJN96ugqGs-B4iIxygICwKpqgQNkbJqM_Lw-T14ffBbMTEAt5zX0=@protonmail.com |
---|---|
State | Accepted |
Headers | show |
Series | [bug#49242] Update UglifyJs (& dependencies) and update dependents | expand |
Context | Check | Description |
---|---|---|
cbaines/applying patch | fail | View Laminar job |
cbaines/issue | success | View issue |
On Tue, Jul 13, 2021 at 05:36:54AM +0000, Charles wrote: > From 321c2e32a7a78587401dc5d683468603c9a6d139 Mon Sep 17 00:00:00 2001 > From: Charles <charles.b.jackson@protonmail.com> > Date: Sat, 26 Jun 2021 14:33:19 -0500 > Subject: [PATCH 1/4] gnu: Add node-acorn. > > * gnu/packages/node-xyz.scm (node-acorn): Add new variable. > --- > gnu/packages/node-xyz.scm | 30 ++++++++++++++++++++++++++++++ > 1 file changed, 30 insertions(+) > > diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm > index 27a76f59c3..dc8ae8bb94 100644 > --- a/gnu/packages/node-xyz.scm > +++ b/gnu/packages/node-xyz.scm > @@ -2,6 +2,7 @@ > ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il> > ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org> > ;;; Copyright © 2021 Noisytoot <noisytoot@disroot.org> > +;;; Copyright © 2021 Charles <charles.b.jackson@protonmail.com> > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -330,3 +331,32 @@ function with browser support.") > Subsequent calls will either return the cached previous value or throw an error > if desired.") > (license license:isc))) It wasn't mentioned at the top of the file but I moved this package so it was sorted alphabetically. > +(define-public node-acorn > + (let ((commit "9ef40d8ae2c08e07fd2f510bed58c3ca9edcbe46") > + (revision "1")) There didn't seem to be a reason to use this commit specifically so I switched the package to use the 8.4.1 release. > + (package > + (name "node-acorn") > + (version (git-version "8.4.1" revision commit)) > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/acornjs/acorn") > + (commit commit))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 "068h5gysz8bbslq31dva8f223rdf8l7w6nxcxjnv4zdprwkzkhaa")))) > + (build-system node-build-system) > + (arguments > + '(#:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'change-directory > + (lambda _ > + (chdir "acorn") > + #t))))) > + (home-page "https://github.com/acornjs/acorn/tree/master/acorn") > + (synopsis "A small, fast, Javascript-based Javascript parser") After 'guix lint' I switched this to 'Javascript-based Javascript parser' > + (description "Acornjs is a Javascrip parser with many options and an > +architecture supporting plugins.") > + (license license:expat)))) > -- > 2.32.0 >
I combined patches 2 and 3 and moved node-uglify-js to uglify.scm. I also registered uglify.scm in gnu/local.mk. On Tue, Jul 13, 2021 at 05:36:54AM +0000, Charles wrote: > From 37b46e3f25c9a27cdc6bb8f78c0ec29c7759a7a0 Mon Sep 17 00:00:00 2001 > From: Charles <charles.b.jackson@protonmail.com> > Date: Mon, 12 Jul 2021 22:27:35 -0500 > Subject: [PATCH 2/4] gnu: Add node-uglify-js. > > * gnu/packages/node-xyz.scm (node-uglify-js): Add new variable. > --- > gnu/packages/node-xyz.scm | 27 +++++++++++++++++++++++++++ > 1 file changed, 27 insertions(+) > > diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm > index dc8ae8bb94..9e2f5a5e98 100644 > --- a/gnu/packages/node-xyz.scm > +++ b/gnu/packages/node-xyz.scm > @@ -360,3 +360,30 @@ if desired.") > (description "Acornjs is a Javascrip parser with many options and an > architecture supporting plugins.") > (license license:expat)))) > + > +(define-public node-uglify-js > + (let ((commit "b23b333d9d6e97bece90fb7bc37a44870a7fecf7") > + (revision "1")) > + (package > + (name "node-uglify-js") > + (version (git-version "3.13.9" revision commit)) > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/mishoo/UglifyJS") > + (commit commit))) > + (git-file-name name version) > + (sha256 > + (base32 "06yha17f9qy79ci8h3sgvg8x9l348ap95c4a3y9ln6c5syzyl6rd")))) > + (build-system node-build-system) > + (inputs > + `(("semver" ,node-semver) > + ("acorn" ,node-acorn))) > + (home-page "https://lisperator.net/uglifyjs/") > + (synopsis "JavaScript parser / mangler / compressor / beautifier toolkit") > + (description "UglifyJS is a JavaScript compressor/minifier written in > +JavaScript. It also contains tools that allow one to automate working with > +JavaScript code: parser, code generator, compressor, mangler, scope analyzer, > +tree walker, and tree transformer.") > + (license license:bsd-2)))) > -- > 2.32.0 >
From 321c2e32a7a78587401dc5d683468603c9a6d139 Mon Sep 17 00:00:00 2001 From: Charles <charles.b.jackson@protonmail.com> Date: Sat, 26 Jun 2021 14:33:19 -0500 Subject: [PATCH 1/4] gnu: Add node-acorn. * gnu/packages/node-xyz.scm (node-acorn): Add new variable. --- gnu/packages/node-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 27a76f59c3..dc8ae8bb94 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2021 Noisytoot <noisytoot@disroot.org> +;;; Copyright © 2021 Charles <charles.b.jackson@protonmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -330,3 +331,32 @@ function with browser support.") Subsequent calls will either return the cached previous value or throw an error if desired.") (license license:isc))) + +(define-public node-acorn + (let ((commit "9ef40d8ae2c08e07fd2f510bed58c3ca9edcbe46") + (revision "1")) + (package + (name "node-acorn") + (version (git-version "8.4.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/acornjs/acorn") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "068h5gysz8bbslq31dva8f223rdf8l7w6nxcxjnv4zdprwkzkhaa")))) + (build-system node-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'change-directory + (lambda _ + (chdir "acorn") + #t))))) + (home-page "https://github.com/acornjs/acorn/tree/master/acorn") + (synopsis "A small, fast, Javascript-based Javascript parser") + (description "Acornjs is a Javascrip parser with many options and an +architecture supporting plugins.") + (license license:expat)))) -- 2.32.0