summary refs log tree commit diff
path: root/emacs/guix-main.scm
diff options
context:
space:
mode:
authorAlex Kost <alezost@gmail.com>2016-01-07 22:40:53 +0300
committerAlex Kost <alezost@gmail.com>2016-01-16 13:02:21 +0300
commit56728668485dfcba457e64748ab709eacf39b6ce (patch)
tree0f6a6efc251c02eb840b98d69cc71ab45de21a3f /emacs/guix-main.scm
parent54c3c284d7f319d6db7c665c612fdbeefe81ae5f (diff)
downloadguix-56728668485dfcba457e64748ab709eacf39b6ce.tar.gz
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'.
Diffstat (limited to 'emacs/guix-main.scm')
-rw-r--r--emacs/guix-main.scm7
1 files changed, 1 insertions, 6 deletions
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 @@ ENTRIES is a list of installed manifest entries."
        (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 @@ ENTRIES is a list of installed manifest entries."
        (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 @@ ENTRIES is a list of installed manifest entries."
                               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