01/01: emacs: Add support for "triplet" package inputs.

[Alex Kost]

alezost pushed a commit to branch master
in repository guix.

commit 00f34aaafe9547185c9eb200bb4533bf3534c124
Author: Alex Kost <address@hidden>
Date:   Wed Sep 2 17:57:58 2015 +0300

    emacs: Add support for "triplet" package inputs.
    
    Fixes <http://bugs.gnu.org/21399>.
    
    * emacs/guix-main.scm (full-name->name+version): Adjust to handle
      "name-version:output" string.
      (package-inputs-names): Support ("name" package "output") inputs.
---
 emacs/guix-main.scm |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/emacs/guix-main.scm b/emacs/guix-main.scm
index 8d3a881..623da88 100644
--- a/emacs/guix-main.scm
+++ b/emacs/guix-main.scm
@@ -71,7 +71,14 @@
 (define (list-maybe obj)
   (if (list? obj) obj (list obj)))
 
-(define full-name->name+version package-name->name+version)
+(define (full-name->name+version spec)
+  "Given package specification SPEC with or without output,
+return two values: name and version.  For example, for SPEC
+\"foo-0.9.1b:lib\", return \"foo\" and \"0.9.1b\"."
+  (let-values (((name version output)
+                (package-specification->name+version+output spec)))
+    (values name version)))
+
 (define (name+version->full-name name version)
   (string-append name "-" version))
 
@@ -247,6 +254,10 @@ Example:
   (filter-map (match-lambda
                ((_ (? package? package))
                 (package-full-name package))
+               ((_ (? package? package) output)
+                (make-package-specification (package-name package)
+                                            (package-version package)
+                                            output))
                (_ #f))
               inputs))