[Top][All Lists]

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

03/04: profiles: Add 'packages->manifest' procedure.

From: David Thompson
Subject: 03/04: profiles: Add 'packages->manifest' procedure.
Date: Wed, 20 May 2015 16:30:21 +0000

davexunit pushed a commit to branch master
in repository guix.

commit 8404ed5c3e3a36958dc0427531b21ae14b6398aa
Author: David Thompson <address@hidden>
Date:   Mon May 18 07:51:56 2015 -0400

    profiles: Add 'packages->manifest' procedure.
    * guix/profiles.scm (packages->manifest): New procedure.
 guix/profiles.scm |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/guix/profiles.scm b/guix/profiles.scm
index 11d9bf0..9cb226e 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -80,6 +80,7 @@
+            packages->manifest
@@ -172,6 +173,18 @@ omitted or #f, use the first output of PACKAGE."
      (dependencies (delete-duplicates deps))
      (search-paths (package-native-search-paths package)))))
+(define (packages->manifest packages)
+  "Return a list of manifest entries, one for each item listed in PACKAGES.
+Elements of PACKAGES can be either package objects or package/string tuples
+denoting a specific output of a package."
+  (manifest
+   (map (match-lambda
+         ((package output)
+          (package->manifest-entry package output))
+         (package
+           (package->manifest-entry package)))
+        packages)))
 (define (manifest->gexp manifest)
   "Return a representation of MANIFEST as a gexp."
   (define (entry->gexp entry)
@@ -469,7 +482,7 @@ entries of MANIFEST, or #f if MANIFEST does not have any 
GHC packages."
     (module-ref (resolve-interface '(gnu packages haskell)) 'ghc))
   (define build
-    #~(begin 
+    #~(begin
         (use-modules (guix build utils)
                      (srfi srfi-1) (srfi srfi-26)
                      (ice-9 ftw))
@@ -478,20 +491,20 @@ entries of MANIFEST, or #f if MANIFEST does not have any 
GHC packages."
           (let* ((base (basename #+ghc)))
             (string-drop base
                          (+ 1 (string-index base #\-)))))
         (define db-subdir
           (string-append "lib/" ghc-name-version "/package.conf.d"))
         (define db-dir
           (string-append #$output "/" db-subdir))
         (define (conf-files top)
           (find-files (string-append top "/" db-subdir) "\\.conf$"))
         (define (copy-conf-file conf)
           (let ((base (basename conf)))
             (copy-file conf (string-append db-dir "/" base))))
         (system* (string-append #+ghc "/bin/ghc-pkg") "init" db-dir)
         (for-each copy-conf-file
                   (append-map conf-files

reply via email to

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