From 56728668485dfcba457e64748ab709eacf39b6ce Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Thu, 7 Jan 2016 22:40:53 +0300 Subject: emacs: Remove 'generation' search type. Use 'installed' search type instead. * emacs/guix-main.scm (%patterns-makers): Remove 'generation'. (package/output-sexps): Adjust accordingly. * emacs/guix-ui-generation.el (guix-generation-info-insert-number): Replace 'generation' search with 'installed'. (guix-generation-list-show-packages): Likewise. * emacs/guix-messages.el (guix-messages): Remove 'generation'. --- emacs/guix-main.scm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'emacs/guix-main.scm') diff --git a/emacs/guix-main.scm b/emacs/guix-main.scm index dfa9cba8e4..1199679975 100644 --- a/emacs/guix-main.scm +++ b/emacs/guix-main.scm @@ -668,7 +668,6 @@ (define %patterns-makers (id . ,(apply-to-rest ids->package-patterns)) (name . ,(apply-to-rest specifications->package-patterns)) (installed . ,manifest-package-proc) - (generation . ,manifest-package-proc) (obsolete . ,(apply-to-first obsolete-package-patterns)) (regexp . ,regexp-proc) (all-available . ,all-proc) @@ -677,7 +676,6 @@ (define %patterns-makers (id . ,(apply-to-rest ids->output-patterns)) (name . ,(apply-to-rest specifications->output-patterns)) (installed . ,manifest-output-proc) - (generation . ,manifest-output-proc) (obsolete . ,(apply-to-first obsolete-output-patterns)) (regexp . ,regexp-proc) (all-available . ,all-proc) @@ -692,10 +690,7 @@ (define (package/output-sexps profile params entry-type search-type search-vals) "Return information about packages or package outputs. See 'entry-sexps' for details." - (let* ((profile (if (eq? search-type 'generation) - (generation-file-name profile (car search-vals)) - profile)) - (manifest (profile-manifest profile)) + (let* ((manifest (profile-manifest profile)) (patterns (if (and (eq? entry-type 'output) (eq? search-type 'profile-diff)) (match search-vals -- cgit v1.2.3