summaryrefslogtreecommitdiff
path: root/guix/build-system
diff options
context:
space:
mode:
authorPierre Neidhardt <mail@ambrevar.xyz>2019-11-28 21:37:28 +0100
committerPierre Neidhardt <mail@ambrevar.xyz>2019-12-05 13:48:47 +0100
commitac1ee30f4f7f9d0ae2a655676b0e8b9eb90a35dd (patch)
treee5b522e6de8980f28d5b8e4b370151eb29ceac9f /guix/build-system
parent29e621a0134841705c007917e9a107013c8b0adb (diff)
downloadpatches-ac1ee30f4f7f9d0ae2a655676b0e8b9eb90a35dd.tar
patches-ac1ee30f4f7f9d0ae2a655676b0e8b9eb90a35dd.tar.gz
gnu: Properly move lisp libraries to lisp-xyz, uglify-js to javascript and stumpwm to wm.
* gnu/local.mk: Include lisp-xyz.scm. * gnu/packages/lisp-xyz.scm: New file. * gnu/packages/lisp.scm: Move all lisp libraries to lisp-xyz.scm, uglify-js to javascript.scm and stumpwm to wm.scm. * gnu/packages/javascript.scm: Add uglify-js. * gnu/packages/wm.scm: Add stumpwm. * gnu/packages/bioinformatics.scm: Find uglify-js in javascript.scm. * gnu/packages/machine-learning.scm: Depend on lisp-xyz.scm instead of lisp.scm. * gnu/packages/web.scm: Find uglify-js in javascript.scm. * gnu/packages/web-browsers.scm: Depend on lisp-xyz.scm instead of lisp.scm. * guix/build-system/minify.scm (default-uglify-js): Find uglify-js in javascript module instead of lisp.
Diffstat (limited to 'guix/build-system')
-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 21d84a179a..1418a71091 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 ((lisp-mod (resolve-interface '(gnu packages lisp))))
- (module-ref lisp-mod 'uglify-js)))
+ (let ((js-mod (resolve-interface '(gnu packages javascript))))
+ (module-ref js-mod 'uglify-js)))
(define* (lower name
#:key source inputs native-inputs outputs system