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

build-system/haskell: Update configure flags, 'haddock' and %standard-phases. 

* guix/build/haskell-build-system.scm (%standard-phases): move 'haddock phase
  before 'install phase.
* guix/build/haskell-build-system.scm (haddock): Simplify it as the 'install
  phase takes care of copying files.
* guix/build/haskell-build-system.scm (configure): Add '--libsubdir' flag.
  Fix use of '--extra-include-dirs' and '--extra-lib-dirs' flags.  Use 'doc',
  'bin' and 'lib' outputs if they are defined.
* guix/build/haskell-build-system.scm (make-ghc-package-database, register):
  Aligh location of 'package.conf.d' directory with '--libsubdir' flag.
This commit is contained in:
Federico Beffa 2015-04-04 11:16:37 +02:00
parent b29455cfe7
commit 283cce508a
1 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,26 +70,28 @@ and parameters ~s~%"
#:allow-other-keys) #:allow-other-keys)
"Configure a given Haskell package." "Configure a given Haskell package."
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc"))
(lib (assoc-ref outputs "lib"))
(bin (assoc-ref outputs "bin"))
(input-dirs (match inputs (input-dirs (match inputs
(((_ . dir) ...) (((_ . dir) ...)
dir) dir)
(_ '()))) (_ '())))
(params (append `(,(string-append "--prefix=" out)) (params (append `(,(string-append "--prefix=" out))
`(,(string-append "--libdir=" (or lib out) "/lib"))
`(,(string-append "--bindir=" (or bin out) "/bin"))
`(,(string-append `(,(string-append
"--docdir=" out "/share/doc/" "--docdir=" (or doc out)
(package-name-version out))) "/share/doc/" (package-name-version out)))
'("--libsubdir=$compiler/$pkg-$version")
`(,(string-append "--package-db=" %tmp-db-dir)) `(,(string-append "--package-db=" %tmp-db-dir))
'("--global") '("--global")
`(,(string-append `(,@(map
"--extra-include-dirs=" (cut string-append "--extra-include-dirs=" <>)
(list->search-path-as-string (search-path-as-list '("include") input-dirs)))
(search-path-as-list '("include") input-dirs) `(,@(map
":"))) (cut string-append "--extra-lib-dirs=" <>)
`(,(string-append (search-path-as-list '("lib") input-dirs)))
"--extra-lib-dirs="
(list->search-path-as-string
(search-path-as-list '("lib") input-dirs)
":")))
(if tests? (if tests?
'("--enable-tests") '("--enable-tests")
'()) '())
@ -140,7 +142,7 @@ first match and return the content of the group."
dir) dir)
(_ '()))) (_ '())))
(conf-dirs (search-path-as-list (conf-dirs (search-path-as-list
`(,(string-append "lib/" system "-" `(,(string-append "lib/"
(package-name-version haskell) (package-name-version haskell)
"/package.conf.d")) "/package.conf.d"))
input-dirs)) input-dirs))
@ -160,8 +162,8 @@ generate the cache as it would clash in user profiles."
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(haskell (assoc-ref inputs "haskell")) (haskell (assoc-ref inputs "haskell"))
(lib (string-append out "/lib")) (lib (string-append out "/lib"))
(config-dir (string-append lib "/" system (config-dir (string-append lib "/"
"-" (package-name-version haskell) (package-name-version haskell)
"/package.conf.d")) "/package.conf.d"))
(id-rx (make-regexp "^id: *(.*)$")) (id-rx (make-regexp "^id: *(.*)$"))
(lib-rx (make-regexp "lib.*\\.(a|so)")) (lib-rx (make-regexp "lib.*\\.(a|so)"))
@ -189,21 +191,13 @@ generate the cache as it would clash in user profiles."
(define* (haddock #:key outputs haddock? haddock-flags #:allow-other-keys) (define* (haddock #:key outputs haddock? haddock-flags #:allow-other-keys)
"Run the test suite of a given Haskell package." "Run the test suite of a given Haskell package."
(if haddock? (if haddock?
(let* ((out (assoc-ref outputs "out")) (run-setuphs "haddock" haddock-flags)
(doc-src (string-append (getcwd) "/dist/doc"))
(doc-dest (string-append out "/share/doc/"
(package-name-version out))))
(if (run-setuphs "haddock" haddock-flags)
(begin
(copy-recursively doc-src doc-dest)
#t)
#f))
#t)) #t))
(define %standard-phases (define %standard-phases
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases
(add-before configure setup-compiler setup-compiler) (add-before configure setup-compiler setup-compiler)
(add-after install haddock haddock) (add-before install haddock haddock)
(add-after install register register) (add-after install register register)
(replace install install) (replace install install)
(replace check check) (replace check check)