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

build-system/haskell: Let all phases return #T unconditionally. 

* guix/build/haskell-build-system.scm (make-ghc-package-database, register,
check, haddock): Return #T unconditionally; use INVOKE.
This commit is contained in:
Ricardo Wurmus 2018-08-09 14:37:36 +02:00
parent bc731eada6
commit a7e231a2a3
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -178,9 +179,10 @@ first match and return the content of the group."
(unless (file-exists? dest) (unless (file-exists? dest)
(copy-file file dest)))) (copy-file file dest))))
conf-files) conf-files)
(zero? (system* "ghc-pkg" (invoke "ghc-pkg"
(string-append "--package-db=" %tmp-db-dir) (string-append "--package-db=" %tmp-db-dir)
"recache")))) "recache")
#t))
(define* (register #:key name system inputs outputs #:allow-other-keys) (define* (register #:key name system inputs outputs #:allow-other-keys)
"Generate the compiler registration and binary package database files for a "Generate the compiler registration and binary package database files for a
@ -238,32 +240,31 @@ given Haskell package."
(list (string-append "--gen-pkg-config=" config-file)))) (list (string-append "--gen-pkg-config=" config-file))))
(run-setuphs "register" params) (run-setuphs "register" params)
;; The conf file is created only when there is a library to register. ;; The conf file is created only when there is a library to register.
(or (not (file-exists? config-file)) (unless (file-exists? config-file)
(begin (mkdir-p config-dir)
(mkdir-p config-dir) (let* ((config-file-name+id
(let* ((config-file-name+id (call-with-ascii-input-file config-file (cut grep id-rx <>))))
(call-with-ascii-input-file config-file (cut grep id-rx <>)))) (install-transitive-deps config-file %tmp-db-dir config-dir)
(install-transitive-deps config-file %tmp-db-dir config-dir) (rename-file config-file
(rename-file config-file (string-append config-dir "/"
(string-append config-dir "/" config-file-name+id ".conf"))
config-file-name+id ".conf")) (invoke "ghc-pkg"
(zero? (system* "ghc-pkg" (string-append "--package-db=" config-dir)
(string-append "--package-db=" config-dir) "recache")))
"recache"))))))) #t))
(define* (check #:key tests? test-target #:allow-other-keys) (define* (check #:key tests? test-target #:allow-other-keys)
"Run the test suite of a given Haskell package." "Run the test suite of a given Haskell package."
(if tests? (if tests?
(run-setuphs test-target '()) (run-setuphs test-target '())
(begin (format #t "test suite not run~%"))
(format #t "test suite not run~%") #t)
#t)))
(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? (when haddock?
(run-setuphs "haddock" haddock-flags) (run-setuphs "haddock" haddock-flags))
#t)) #t)
(define %standard-phases (define %standard-phases
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases