From ba42da245bdb50aa98eecfeea8d207cefa209d48 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 3 Jan 2020 11:59:25 +0100 Subject: 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. --- guix/build-system/minify.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'guix') 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 -- cgit v1.2.3