me
/
guix
Archived
1
0
Fork 0
Code

haskell-build-system: register: Remove references to the doc output. 

* guix/build/haskell-build-system.scm (register): Strip references to the doc
output from the generated package config files; move the haddock files from
the "doc" output to the "lib" output.
master
Ricardo Wurmus 2020-06-16 22:34:37 +02:00
parent 75bda3c648
commit 3f7922cbf5
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,6 +244,7 @@ given Haskell package."
(loop seen tail)))))) (loop seen tail))))))
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc"))
(haskell (assoc-ref inputs "haskell")) (haskell (assoc-ref inputs "haskell"))
(name-verion (strip-store-file-name haskell)) (name-verion (strip-store-file-name haskell))
(lib (string-append (or (assoc-ref outputs "lib") out) "/lib")) (lib (string-append (or (assoc-ref outputs "lib") out) "/lib"))
@ -258,8 +259,25 @@ given Haskell package."
;; 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.
(when (file-exists? config-file) (when (file-exists? config-file)
(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 <>))))
;; Remove reference to "doc" output from "lib" (or "out") by rewriting the
;; "haddock-interfaces" field and removing the optional "haddock-html"
;; field in the generated .conf file.
(when doc
(substitute* config-file
(("^haddock-html: .*") "\n")
(((format #f "^haddock-interfaces: ~a" doc))
(string-append "haddock-interfaces: " lib)))
;; Move the referenced file to the "lib" (or "out") output.
(match (find-files doc "\\.haddock$")
((haddock-file . rest)
(let* ((subdir (string-drop haddock-file (string-length doc)))
(new (string-append lib subdir)))
(mkdir-p (dirname new))
(rename-file haddock-file new)))
(_ #f)))
(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 "/"