[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#29927] [PATCH 2/5] profiles: info-dir-file: Don't consider unwanted
From: |
宋文武 |
Subject: |
[bug#29927] [PATCH 2/5] profiles: info-dir-file: Don't consider unwanted manifest entries. |
Date: |
Mon, 1 Jan 2018 18:33:33 +0800 |
* guix/profiles.scm (info-dir-file): Use 'eval-gexp' to filter out those
manifest inputs that doesn't have info manuals.
---
guix/profiles.scm | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
diff --git a/guix/profiles.scm b/guix/profiles.scm
index 3c05543be..f6e455c96 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -684,7 +684,19 @@ MANIFEST."
(define gzip ;lazy reference
(module-ref (resolve-interface '(gnu packages compression)) 'gzip))
- (define build
+ ;; We only need to build the 'dir' file for inputs that does contain info
+ ;; manuals.
+ (define interested
+ (eval-gexp
+ #~(filter
+ (lambda (input)
+ (file-exists? (string-append input "/share/info")))
+ '#$(manifest-inputs manifest))))
+
+ ;; XXX: We have to pass paths of inputs instead of paths of info files,
+ ;; because 'gexp-inputs' only adds inputs for strings which satisfies
+ ;; 'direct-store-path?'.
+ (define (build inputs)
(with-imported-modules '((guix build utils))
#~(begin
(use-modules (guix build utils)
@@ -708,12 +720,12 @@ MANIFEST."
(mkdir-p (string-append #$output "/share/info"))
(exit (every install-info
- (append-map info-files
- '#$(manifest-inputs manifest)))))))
+ (append-map info-files '#$inputs))))))
- (gexp->derivation "info-dir" build
- #:local-build? #t
- #:substitutable? #f))
+ (mlet* %store-monad ((inputs interested))
+ (gexp->derivation "info-dir" (build inputs)
+ #:local-build? #t
+ #:substitutable? #f)))
(define (ghc-package-cache-file manifest)
"Return a derivation that builds the GHC 'package.cache' file for all the
--
2.13.3
- [bug#29928] [PATCH 0/5] Optimize profile hooks, 宋文武, 2018/01/01
- [bug#29927] [PATCH 2/5] profiles: info-dir-file: Don't consider unwanted manifest entries.,
宋文武 <=
- [bug#29926] [PATCH 1/5] gexp: Add 'eval-gexp'., 宋文武, 2018/01/01
- [bug#29925] [PATCH 3/5] guix package: Disable profile hooks on dry runs., 宋文武, 2018/01/01
- [bug#29929] [PATCH 5/5] profiles: Sort manifest inputs for profile hooks., 宋文武, 2018/01/01
- [bug#29930] [PATCH 4/5] profiles: Filter out unwanted manifest entries for profile hooks., 宋文武, 2018/01/01
- [bug#29928] [PATCH 0/5] Optimize profile hooks, Ludovic Courtès, 2018/01/11