summaryrefslogtreecommitdiff
path: root/emacs
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
parent54c3c284d7f319d6db7c665c612fdbeefe81ae5f (diff)
downloadpatches-56728668485dfcba457e64748ab709eacf39b6ce.tar
patches-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')
-rw-r--r--emacs/guix-main.scm7
-rw-r--r--emacs/guix-messages.el16
-rw-r--r--emacs/guix-ui-generation.el9
3 files changed, 7 insertions, 25 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
diff --git a/emacs/guix-messages.el b/emacs/guix-messages.el
index 234d3d11da..9f6d833252 100644
--- a/emacs/guix-messages.el
+++ b/emacs/guix-messages.el
@@ -55,14 +55,7 @@
(obsolete
(0 "No obsolete packages in profile '%s'." profile)
(1 "A single obsolete package in profile '%s'." profile)
- (many "%d obsolete packages in profile '%s'." count profile))
- (generation
- (0 "No packages installed in generation %d of profile '%s'."
- val profile)
- (1 "A single package installed in generation %d of profile '%s'."
- val profile)
- (many "%d packages installed in generation %d of profile '%s'."
- count val profile)))
+ (many "%d obsolete packages in profile '%s'." count profile)))
(output
(id
@@ -91,13 +84,6 @@
(0 "No obsolete package outputs in profile '%s'." profile)
(1 "A single obsolete package output in profile '%s'." profile)
(many "%d obsolete package outputs in profile '%s'." count profile))
- (generation
- (0 "No package outputs installed in generation %d of profile '%s'."
- val profile)
- (1 "A single package output installed in generation %d of profile '%s'."
- val profile)
- (many "%d package outputs installed in generation %d of profile '%s'."
- count val profile))
(profile-diff
guix-message-outputs-by-diff))
diff --git a/emacs/guix-ui-generation.el b/emacs/guix-ui-generation.el
index 752d8523b9..4047850f23 100644
--- a/emacs/guix-ui-generation.el
+++ b/emacs/guix-ui-generation.el
@@ -127,8 +127,9 @@ current profile's GENERATION."
(lambda (btn)
(guix-buffer-get-display-entries
'list guix-package-list-type
- (list (guix-ui-current-profile)
- 'generation (button-get btn 'number))
+ (list (guix-generation-current-packages-profile
+ (button-get btn 'number))
+ 'installed)
'add))
"Show installed packages for this generation"
'number number)
@@ -202,8 +203,8 @@ VAL is a boolean value."
"List installed packages for the generation at point."
(interactive)
(guix-package-get-display
- (guix-ui-current-profile)
- 'generation (guix-list-current-id)))
+ (guix-generation-current-packages-profile (guix-list-current-id))
+ 'installed))
(defun guix-generation-list-generations-to-compare ()
"Return a sorted list of 2 marked generations for comparing."