diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-01-11 22:38:24 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-01-11 22:38:24 +0100 |
commit | b7bf02a418e946b610ef68e8c5131f2350835956 (patch) | |
tree | 6d84387279b9870dc0b151bb9d3dce7f9d9de73d /guix/build-system/clojure.scm | |
parent | 233c1be0a30846f6646b1f4edc6257037d0835fc (diff) | |
parent | 13efb24850bc40fab2448771c87c77c9a69fc231 (diff) | |
download | guix-patches-b7bf02a418e946b610ef68e8c5131f2350835956.tar guix-patches-b7bf02a418e946b610ef68e8c5131f2350835956.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/build-system/clojure.scm')
-rw-r--r-- | guix/build-system/clojure.scm | 14 |
1 files changed, 10 insertions, 4 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) |