[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: build-system/haskell: Refer to %GNU-BUILD-SYSTEM-MODULES.
From: |
Ludovic Courtès |
Subject: |
02/02: build-system/haskell: Refer to %GNU-BUILD-SYSTEM-MODULES. |
Date: |
Wed, 15 Apr 2015 08:33:38 +0000 |
civodul pushed a commit to branch core-updates
in repository guix.
commit cd6c6d60a83fcd081097705ec5f51243d3d701d9
Author: Ludovic Courtès <address@hidden>
Date: Wed Apr 15 10:27:19 2015 +0200
build-system/haskell: Refer to %GNU-BUILD-SYSTEM-MODULES.
Fixes a regression whereby haskell-build-system was using an incomplete
module list.
* guix/build-system/haskell.scm (%haskell-build-system-modules): New
variable.
(haskell-build): Use it as the default value of #:imported-modules.
---
guix/build-system/haskell.scm | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/guix/build-system/haskell.scm b/guix/build-system/haskell.scm
index 79faa5a..0fbf0b8 100644
--- a/guix/build-system/haskell.scm
+++ b/guix/build-system/haskell.scm
@@ -25,7 +25,8 @@
#:use-module (guix build-system gnu)
#:use-module (ice-9 match)
#:use-module (srfi srfi-26)
- #:export (haskell-build
+ #:export (%haskell-build-system-modules
+ haskell-build
haskell-build-system))
;; Commentary:
@@ -35,6 +36,11 @@
;;
;; Code:
+(define %haskell-build-system-modules
+ ;; Build-side modules imported by default.
+ `((guix build haskell-build-system)
+ ,@%gnu-build-system-modules))
+
(define (default-haskell)
"Return the default Haskell package."
;; Lazily resolve the binding to avoid a circular dependency.
@@ -80,9 +86,7 @@
(search-paths '())
(system (%current-system))
(guile #f)
- (imported-modules '((guix build haskell-build-system)
- (guix build gnu-build-system)
- (guix build utils)))
+ (imported-modules %haskell-build-system-modules)
(modules '((guix build haskell-build-system)
(guix build utils))))
"Build SOURCE using HASKELL, and with INPUTS. This assumes that SOURCE