summaryrefslogtreecommitdiff
path: root/gnu/packages/javascript.scm
diff options
context:
space:
mode:
authorPierre Neidhardt <mail@ambrevar.xyz>2020-01-03 11:59:25 +0100
committerPierre Neidhardt <mail@ambrevar.xyz>2020-01-03 15:03:36 +0100
commitba42da245bdb50aa98eecfeea8d207cefa209d48 (patch)
tree1291f6177ec386cf81e5d1fd354e8145f0ae08d9 /gnu/packages/javascript.scm
parent0aa203717eccf9cb6ed2ae0d9e91625aa60e32ec (diff)
downloadguix-patches-ba42da245bdb50aa98eecfeea8d207cefa209d48.tar
guix-patches-ba42da245bdb50aa98eecfeea8d207cefa209d48.tar.gz
gnu: uglify-js: Move back next to sbcl-cl-uglify-js definition.
This fixes the bug which prevented uglify-js from being defined properly, and cascaded back to all Common Lisp packages. * gnu/packages/bioinformatics.scm: Replace javascript module with lisp-xyz. * gnu/packages/cran.scm: Use lisp-xyz module. * gnu/packages/javascript.scm (uglify-js): Move from here... * gnu/packages/lisp-xyz.scm: ... To here. * gnu/packages/web.scm: Replace javascript module with lisp-xyz. * guix/build-system/minify.scm: Find uglify-js in the lisp-xyz module.
Diffstat (limited to 'gnu/packages/javascript.scm')
-rw-r--r--gnu/packages/javascript.scm48
1 files changed, 0 insertions, 48 deletions
diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm
index 6718274da2..83fa5ede4c 100644
--- a/gnu/packages/javascript.scm
+++ b/gnu/packages/javascript.scm
@@ -25,7 +25,6 @@
#:use-module (gnu packages)
#:use-module (gnu packages base)
#:use-module (gnu packages compression)
- #:use-module (gnu packages lisp)
#:use-module (gnu packages lisp-xyz)
#:use-module (gnu packages readline)
#:use-module (guix packages)
@@ -453,50 +452,3 @@ to use, and is very similar to Lua. There is no need to interact with byzantine
C++ template mechanisms, or worry about marking and unmarking garbage collection
roots, or wrestle with obscure build systems.")
(license license:isc)))
-
-(define-public uglify-js
- (package
- (inherit sbcl-cl-uglify-js)
- (name "uglify-js")
- (build-system trivial-build-system)
- (arguments
- `(#:modules ((guix build utils))
- #:builder
- (let* ((bin (string-append (assoc-ref %outputs "out") "/bin/"))
- (script (string-append bin "uglify-js")))
- (use-modules (guix build utils))
- (mkdir-p bin)
- (with-output-to-file script
- (lambda _
- (format #t "#!~a/bin/sbcl --script
- (require :asdf)
- (push (truename \"~a/lib/sbcl\") asdf:*central-registry*)"
- (assoc-ref %build-inputs "sbcl")
- (assoc-ref %build-inputs "sbcl-cl-uglify-js"))
- ;; FIXME: cannot use progn here because otherwise it fails to
- ;; find cl-uglify-js.
- (for-each
- write
- '(;; Quiet, please!
- (let ((*standard-output* (make-broadcast-stream))
- (*error-output* (make-broadcast-stream)))
- (asdf:load-system :cl-uglify-js))
- (let ((file (cadr *posix-argv*)))
- (if file
- (format t "~a"
- (cl-uglify-js:ast-gen-code
- (cl-uglify-js:ast-mangle
- (cl-uglify-js:ast-squeeze
- (with-open-file (in file)
- (parse-js:parse-js in))))
- :beautify nil))
- (progn
- (format *error-output*
- "Please provide a JavaScript file.~%")
- (sb-ext:exit :code 1))))))))
- (chmod script #o755)
- #t)))
- (inputs
- `(("sbcl" ,sbcl)
- ("sbcl-cl-uglify-js" ,sbcl-cl-uglify-js)))
- (synopsis "JavaScript compressor")))