emacs-bug-tracker
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#29927: closed ([PATCH 2/5] profiles: info-dir-file: Don't consider u


From: GNU bug Tracking System
Subject: bug#29927: closed ([PATCH 2/5] profiles: info-dir-file: Don't consider unwanted manifest entries.)
Date: Wed, 12 May 2021 11:13:02 +0000

Your message dated Wed, 12 May 2021 19:12:01 +0800
with message-id 
<OSZP286MB06646499F30864E598E5BBF1A3529@OSZP286MB0664.JPNP286.PROD.OUTLOOK.COM>
and subject line Re: [PATCH 0/5] Optimize profile hooks
has caused the debbugs.gnu.org bug report #29925,
regarding [PATCH 2/5] profiles: info-dir-file: Don't consider unwanted manifest 
entries.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
29925: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=29925
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
--- Begin Message --- Subject: [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




--- End Message ---
--- Begin Message --- Subject: Re: [PATCH 0/5] Optimize profile hooks Date: Wed, 12 May 2021 19:12:01 +0800 User-agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux)
Leo Prikler <leo.prikler@student.tugraz.at> writes:

> merge 29928 29926
> merge 29928 29927
> thanks
>
> This series (29928 29926 29927 29925 29929 29930) has by now slept on
> the mailing list for more than three years.
> Should we still try to merge it?  If so, could you send an updated
> version, that is not spread across six threads?

Hello, thoes patches are obsoleted, should be rewrite to use
`with-build-handler` (I haven't figure it out how yet).

Look like they were all merged as #29925, I think we can close it for
now, thank you!


--- End Message ---

reply via email to

[Prev in Thread] Current Thread [Next in Thread]