From 00f34aaafe9547185c9eb200bb4533bf3534c124 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Wed, 2 Sep 2015 17:57:58 +0300 Subject: emacs: Add support for "triplet" package inputs. Fixes . * 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 file changed, 12 insertions(+), 1 deletion(-) diff --git a/emacs/guix-main.scm b/emacs/guix-main.scm index 8d3a88152d..623da884f6 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)) -- cgit v1.2.3 '/guix/log/gnu/installer.scm'>
AgeCommit message (Expand)Author
2019-08-26installer: Partition as the last step....Tobias Geerinckx-Rice
2019-07-25maint: Switch to Guile-JSON 3.x....Ludovic Courtès
2019-05-15installer: Increase backtrace verbosity....Mathieu Othacehe
2019-05-14installer: Add btrfs-progs to PATH....Danny Milosavljevic
2019-05-13installer: Use 'glibc-supported-locales'....Ludovic Courtès
2019-04-26installer: Actually reboot when the user presses "Reboot."...Ludovic Courtès
2019-04-26installer: Run wrapped program with 'execl', not 'system'....Ludovic Courtès
2019-04-17installer: Translate keyboard layout names....Ludovic Courtès
2019-04-17installer: Display language and territory names natively....Ludovic Courtès
2019-04-12installer: Choosing a locale opens the translated manual on tty2....Ludovic Courtès
2019-04-07installer: Generalize desktop environments to system services....Ludovic Courtès
2019-04-07installer: Move the 'locale' step before the 'welcome' step....Ludovic Courtès
2019-03-27installer: Produce an 'initrd-modules' field if needed....Ludovic Courtès
2019-03-25installer: Set the system's 'keyboard-layout' field....Ludovic Courtès
2019-01-28gnu: Move most packages from guile.scm to new module....Ricardo Wurmus
2019-01-17installer: Various renamings....Mathieu Othacehe
2019-01-17installer: partionment: Add encryption support....Mathieu Othacehe
2019-01-17installer: Display an eventual backtrace in a page....Mathieu Othacehe
2019-01-17installer: Reorder partitionment step....Mathieu Othacehe
2019-01-17installer: Add partitioning support....Mathieu Othacehe
2019-01-17installer: Fix comments....Mathieu Othacehe
2019-01-17installer: Add hostname....Mathieu Othacehe
2019-01-17installer: Add services page....Mathieu Othacehe
2019-01-17installer: Do not ask for keyboard model....Mathieu Othacehe
2019-01-17installer: Add configuration formatter....Mathieu Othacehe
2019-01-17installer: Fix locale installation....Mathieu Othacehe
2019-01-17installer: Move everything to the build side....Mathieu Othacehe
2019-01-17gnu: Add graphical installer support....Mathieu Othacehe