all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: 宋文武 <iyzsong@member.fsf.org>
To: 29929@debbugs.gnu.org
Subject: [bug#29929] [PATCH 5/5] profiles: Sort manifest inputs for profile hooks.
Date: Mon,  1 Jan 2018 18:33:36 +0800	[thread overview]
Message-ID: <20180101103336.8613-6-iyzsong@member.fsf.org> (raw)
In-Reply-To: <20180101103336.8613-1-iyzsong@member.fsf.org>

* guix/profiles.scm (info-dir-file, manual-database, fonts-dir-file)
(ghc-package-cache-file, ca-certificate-bundle, gtk-icon-themes)
(gtk-im-modules, xdg-desktop-database, xdg-mime-database): Sort the result of
'manifest-inputs'.
---
 guix/profiles.scm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/guix/profiles.scm b/guix/profiles.scm
index 7d69d1a53..5da4807ad 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -691,7 +691,7 @@ MANIFEST."
      #~(filter
         (lambda (input)
           (file-exists? (string-append input "/share/info")))
-        '#$(manifest-inputs manifest))))
+        (sort '#$(manifest-inputs manifest) string<))))
 
   ;; XXX: We have to pass paths of inputs instead of paths of info files,
   ;; because 'gexp-inputs' only adds inputs for strings which satisfies
@@ -739,7 +739,7 @@ entries of MANIFEST, or #f if MANIFEST does not have any GHC packages."
         (lambda (input)
           (file-exists? (string-append input "/lib/ghc-"
                                        #$(package-version ghc))))
-        '#$(manifest-inputs manifest))))
+        (sort '#$(manifest-inputs manifest) string<))))
 
   (define (build inputs)
     (with-imported-modules '((guix build utils))
@@ -799,7 +799,7 @@ MANIFEST.  Single-file bundles are required by programs such as Git and Lynx."
      #~(filter
         (lambda (input)
           (file-exists? (string-append input "/etc/ssl/certs")))
-        '#$(manifest-inputs manifest))))
+        (sort '#$(manifest-inputs manifest) string<))))
 
   (define glibc-utf8-locales                      ;lazy reference
     (module-ref (resolve-interface '(gnu packages base)) 'glibc-utf8-locales))
@@ -872,7 +872,7 @@ creates the GTK+ 'icon-theme.cache' file for each theme."
      #~(filter
         (lambda (input)
           (file-exists? (string-append input "/share/icons")))
-        '#$(manifest-inputs manifest))))
+        (sort '#$(manifest-inputs manifest) string<))))
 
   (mlet %store-monad ((inputs interested)
                       (%gtk+ (manifest-lookup-package manifest "gtk+"))
@@ -935,7 +935,7 @@ for both major versions of GTK+."
            (filter
             (lambda (input)
               (not (null? (find-files input "^immodules$" #:directories? #t))))
-            '#$(manifest-inputs manifest))))))
+            (sort '#$(manifest-inputs manifest) string<))))))
 
   (mlet %store-monad ((inputs interested)
                       (gtk+   (manifest-lookup-package manifest "gtk+" "3"))
@@ -1015,7 +1015,7 @@ MIME type."
      #~(filter
         (lambda (input)
           (file-exists? (string-append input "/share/applications")))
-        '#$(manifest-inputs manifest))))
+        (sort '#$(manifest-inputs manifest) string<))))
 
   (define desktop-file-utils            ; lazy reference
     (module-ref (resolve-interface '(gnu packages freedesktop))
@@ -1059,7 +1059,7 @@ entries.  It's used to query the MIME type of a given file."
      #~(filter
         (lambda (input)
           (file-exists? (string-append input "/share/mime/packages")))
-        '#$(manifest-inputs manifest))))
+        (sort '#$(manifest-inputs manifest) string<))))
 
   (define shared-mime-info  ; lazy reference
     (module-ref (resolve-interface '(gnu packages gnome)) 'shared-mime-info))
@@ -1108,7 +1108,7 @@ files for the fonts of the @var{manifest} entries."
      #~(filter
         (lambda (input)
           (file-exists? (string-append input "/share/fonts")))
-        '#$(manifest-inputs manifest))))
+        (sort '#$(manifest-inputs manifest) string<))))
 
   (define mkfontscale
     (module-ref (resolve-interface '(gnu packages xorg)) 'mkfontscale))
@@ -1182,7 +1182,7 @@ the entries in MANIFEST."
      #~(filter
         (lambda (input)
           (file-exists? (string-append input "/share/man")))
-        '#$(manifest-inputs manifest))))
+        (sort '#$(manifest-inputs manifest) string<))))
 
   (define gdbm-ffi
     (module-ref (resolve-interface '(gnu packages guile))
-- 
2.13.3

  parent reply	other threads:[~2018-01-01 10:34 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-01 10:33 [bug#29928] [PATCH 0/5] Optimize profile hooks 宋文武
2018-01-01 10:33 ` [bug#29926] [PATCH 1/5] gexp: Add 'eval-gexp' 宋文武
2018-01-01 10:33 ` [bug#29927] [PATCH 2/5] profiles: info-dir-file: Don't consider unwanted manifest entries 宋文武
2018-01-01 10:33 ` [bug#29925] [PATCH 3/5] guix package: Disable profile hooks on dry runs 宋文武
2018-01-01 13:36   ` Danny Milosavljevic
2018-01-01 10:33 ` [bug#29930] [PATCH 4/5] profiles: Filter out unwanted manifest entries for profile hooks 宋文武
2018-01-01 10:33 ` 宋文武 [this message]
2018-01-01 13:38   ` [bug#29929] [PATCH 5/5] profiles: Sort manifest inputs " Danny Milosavljevic
2018-01-11 22:45 ` [bug#29928] [PATCH 0/5] Optimize " Ludovic Courtès
2018-01-19 14:42   ` 宋文武
2018-01-19 16:04     ` Ludovic Courtès
2018-01-20 12:52       ` 宋文武
2021-05-11 13:34 ` Leo Prikler
2021-05-12 11:12   ` bug#29925: " 宋文武

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180101103336.8613-6-iyzsong@member.fsf.org \
    --to=iyzsong@member.fsf.org \
    --cc=29929@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.