From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eVxQ0-0006Os-UL for guix-patches@gnu.org; Mon, 01 Jan 2018 05:34:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eVxQ0-0004XB-0K for guix-patches@gnu.org; Mon, 01 Jan 2018 05:34:08 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:50585) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eVxPz-0004X1-SG for guix-patches@gnu.org; Mon, 01 Jan 2018 05:34:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eVxPz-0000v9-L1 for guix-patches@gnu.org; Mon, 01 Jan 2018 05:34:07 -0500 Subject: [bug#29929] [PATCH 5/5] profiles: Sort manifest inputs for profile hooks. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:48726) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eVxPi-0006LD-GX for guix-patches@gnu.org; Mon, 01 Jan 2018 05:33:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eVxPh-0004O0-6S for guix-patches@gnu.org; Mon, 01 Jan 2018 05:33:50 -0500 Received: from rezeros.cc ([2001:19f0:7001:2f3e:5400:ff:fe84:e55d]:35544) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eVxPg-0004Km-Oe for guix-patches@gnu.org; Mon, 01 Jan 2018 05:33:49 -0500 From: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Mon, 1 Jan 2018 18:33:36 +0800 Message-Id: <20180101103336.8613-6-iyzsong@member.fsf.org> In-Reply-To: <20180101103336.8613-1-iyzsong@member.fsf.org> References: <20180101103336.8613-1-iyzsong@member.fsf.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 29929@debbugs.gnu.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