From 984efa2b6a561bf0eeb43be63f01e2d83b151aa5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 8 Jan 2020 19:28:48 +0100 Subject: build-system/clojure: Provide only the right modules in scope. Previously, we used to have a whole bunch of (guix build *-build-system) modules in scope, which, for example, meant that '%standard-phases' was clashing. This change clarifies it. * guix/build-system/clojure.scm (%default-modules): New variable. (clojure-build): Change the default value of #:modules and that of #:phases. --- guix/build-system/clojure.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'guix') 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 +;;; Copyright © 2020 Ludovic Courtès ;;; ;;; 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) -- cgit v1.2.3