ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 06:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

profiles: Hooks always return a monadic value.

Browse source 
Suggested by 宋文武 <iyzsong@gmail.com>.

* guix/profiles.scm (ghc-package-cache-file): Return a monadic #f, not just
  #f, when MANIFEST contains no GHC package.
  (profile-derivation): Do not filter based on the return value of HOOK;
  instead filter based on the value of items in EXTRAS.
This commit is contained in:
Ludovic Courtès 2015-05-26 23:38:27 +02:00
parent 41766807d0
commit 07eaecfae1
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
guix/profiles.scm
View file

@ -516,12 +516,14 @@ (define (copy-conf-file conf)
(for-each delete-file (find-files db-dir "\\.conf$"))
success)))
(with-monad %store-monad
;; Don't depend on GHC when there's nothing to do.
(and (any (cut string-prefix? "ghc" <>)
(if (any (cut string-prefix? "ghc" <>)
(map manifest-entry-name (manifest-entries manifest)))
(gexp->derivation "ghc-package-cache" build
#:modules '((guix build utils))
#:local-build? #t)))
#:local-build? #t)
(return #f))))
(define (ca-certificate-bundle manifest)
"Return a derivation that builds a single-file bundle containing the CA
@ -602,11 +604,14 @@ (define* (profile-derivation manifest
(mlet %store-monad ((extras (if (null? (manifest-entries manifest))
(return '())
(sequence %store-monad
(filter-map (lambda (hook)
(map (lambda (hook)
(hook manifest))
hooks)))))
(define inputs
(append (map gexp-input extras)
(append (filter-map (lambda (gexp)
(and (gexp? gexp)
(gexp-input gexp)))
extras)
(manifest-inputs manifest)))
(define builder