summaryrefslogtreecommitdiff
path: root/guix/build-system
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-01-11 22:38:24 +0100
committerMarius Bakke <mbakke@fastmail.com>2020-01-11 22:38:24 +0100
commitb7bf02a418e946b610ef68e8c5131f2350835956 (patch)
tree6d84387279b9870dc0b151bb9d3dce7f9d9de73d /guix/build-system
parent233c1be0a30846f6646b1f4edc6257037d0835fc (diff)
parent13efb24850bc40fab2448771c87c77c9a69fc231 (diff)
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/build-system')
-rw-r--r--guix/build-system/clojure.scm14
-rw-r--r--guix/build-system/guile.scm10
-rw-r--r--guix/build-system/minify.scm4
3 files changed, 19 insertions, 9 deletions
diff --git a/guix/build-system/clojure.scm b/guix/build-system/clojure.scm
index d70535c9e3..607f67aaec 100644
--- a/guix/build-system/clojure.scm
+++ b/guix/build-system/clojure.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
+;;; Copyright © 2020 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -43,12 +44,18 @@
;; Code:
(define-with-docs %clojure-build-system-modules
- "Build-side modules imported and used by default."
+ "Build-side modules imported by default."
`((guix build clojure-build-system)
(guix build clojure-utils)
(guix build guile-build-system)
,@%ant-build-system-modules))
+(define %default-modules
+ ;; Modules in scope in the build-side environment.
+ '((guix build clojure-build-system)
+ (guix build clojure-utils)
+ (guix build utils)))
+
(define-with-docs %default-clojure
"The default Clojure package."
(delay (@* (gnu packages clojure) clojure)))
@@ -133,15 +140,14 @@
(test-include `',%test-include)
(test-exclude `',%test-exclude)
- (phases '(@ (guix build clojure-build-system)
- %standard-phases))
+ (phases '%standard-phases)
(outputs '("out"))
(search-paths '())
(system (%current-system))
(guile #f)
(imported-modules %clojure-build-system-modules)
- (modules %clojure-build-system-modules))
+ (modules %default-modules))
"Build SOURCE with INPUTS."
(let ((builder `(begin
(use-modules ,@modules)
diff --git a/guix/build-system/guile.scm b/guix/build-system/guile.scm
index 2c5cc968ce..3693014694 100644
--- a/guix/build-system/guile.scm
+++ b/guix/build-system/guile.scm
@@ -36,6 +36,7 @@
(define* (lower name
#:key source inputs native-inputs outputs system target
+ (implicit-inputs? #t)
#:allow-other-keys
#:rest arguments)
"Return a bag for NAME."
@@ -45,7 +46,8 @@
;; procedures like 'package-for-guile-2.0' unchanged and simple.
(define private-keywords
- '(#:target #:inputs #:native-inputs))
+ '(#:target #:inputs #:native-inputs
+ #:implicit-inputs?))
(bag
(name name)
@@ -56,8 +58,10 @@
`(("source" ,source))
'())
,@native-inputs
- ,@(map (cute assoc <> (standard-packages))
- '("tar" "gzip" "bzip2" "xz" "locales"))))
+ ,@(if implicit-inputs?
+ (map (cute assoc <> (standard-packages))
+ '("tar" "gzip" "bzip2" "xz" "locales"))
+ '())))
(outputs outputs)
(build (if target guile-cross-build guile-build))
(arguments (strip-keyword-arguments private-keywords arguments))))
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