nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2015-04-15 10:27:19 +02:00
parent 1590e8a1dd
commit cd6c6d60a8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
guix/build-system/haskell.scm
View File

@ -25,7 +25,8 @@
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
#:export (haskell-build #:export (%haskell-build-system-modules
haskell-build
haskell-build-system)) haskell-build-system))
;; Commentary: ;; Commentary:
@ -35,6 +36,11 @@
;; ;;
;; Code: ;; Code:
(define %haskell-build-system-modules
;; Build-side modules imported by default.
`((guix build haskell-build-system)
,@%gnu-build-system-modules))
(define (default-haskell) (define (default-haskell)
"Return the default Haskell package." "Return the default Haskell package."
;; Lazily resolve the binding to avoid a circular dependency. ;; Lazily resolve the binding to avoid a circular dependency.
@ -80,9 +86,7 @@
(search-paths '()) (search-paths '())
(system (%current-system)) (system (%current-system))
(guile #f) (guile #f)
(imported-modules '((guix build haskell-build-system) (imported-modules %haskell-build-system-modules)
(guix build gnu-build-system)
(guix build utils)))
(modules '((guix build haskell-build-system) (modules '((guix build haskell-build-system)
(guix build utils)))) (guix build utils))))
"Build SOURCE using HASKELL, and with INPUTS. This assumes that SOURCE "Build SOURCE using HASKELL, and with INPUTS. This assumes that SOURCE