summaryrefslogtreecommitdiff
path: root/guix
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 /guix
parent0aa203717eccf9cb6ed2ae0d9e91625aa60e32ec (diff)
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 'guix')
-rw-r--r--guix/build-system/minify.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/guix/build-system/minify.scm b/guix/build-system/minify.scm
index 1418a71091..28a6781c06 100644
--- a/guix/build-system/minify.scm
+++ b/guix/build-system/minify.scm
@@ -44,8 +44,8 @@
(define (default-uglify-js)
"Return the default package to minify JavaScript source files."
;; Lazily resolve the binding to avoid a circular dependency.
- (let ((js-mod (resolve-interface '(gnu packages javascript))))
- (module-ref js-mod 'uglify-js)))
+ (let ((mod (resolve-interface '(gnu packages lisp-xyz))))
+ (module-ref mod 'uglify-js)))
(define* (lower name
#:key source inputs native-inputs outputs system