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'.
This commit is contained in:
parent
54c3c284d7
commit
5672866848
|
@ -668,7 +668,6 @@ ENTRIES is a list of installed manifest entries."
|
||||||
(id . ,(apply-to-rest ids->package-patterns))
|
(id . ,(apply-to-rest ids->package-patterns))
|
||||||
(name . ,(apply-to-rest specifications->package-patterns))
|
(name . ,(apply-to-rest specifications->package-patterns))
|
||||||
(installed . ,manifest-package-proc)
|
(installed . ,manifest-package-proc)
|
||||||
(generation . ,manifest-package-proc)
|
|
||||||
(obsolete . ,(apply-to-first obsolete-package-patterns))
|
(obsolete . ,(apply-to-first obsolete-package-patterns))
|
||||||
(regexp . ,regexp-proc)
|
(regexp . ,regexp-proc)
|
||||||
(all-available . ,all-proc)
|
(all-available . ,all-proc)
|
||||||
|
@ -677,7 +676,6 @@ ENTRIES is a list of installed manifest entries."
|
||||||
(id . ,(apply-to-rest ids->output-patterns))
|
(id . ,(apply-to-rest ids->output-patterns))
|
||||||
(name . ,(apply-to-rest specifications->output-patterns))
|
(name . ,(apply-to-rest specifications->output-patterns))
|
||||||
(installed . ,manifest-output-proc)
|
(installed . ,manifest-output-proc)
|
||||||
(generation . ,manifest-output-proc)
|
|
||||||
(obsolete . ,(apply-to-first obsolete-output-patterns))
|
(obsolete . ,(apply-to-first obsolete-output-patterns))
|
||||||
(regexp . ,regexp-proc)
|
(regexp . ,regexp-proc)
|
||||||
(all-available . ,all-proc)
|
(all-available . ,all-proc)
|
||||||
|
@ -692,10 +690,7 @@ ENTRIES is a list of installed manifest entries."
|
||||||
search-type search-vals)
|
search-type search-vals)
|
||||||
"Return information about packages or package outputs.
|
"Return information about packages or package outputs.
|
||||||
See 'entry-sexps' for details."
|
See 'entry-sexps' for details."
|
||||||
(let* ((profile (if (eq? search-type 'generation)
|
(let* ((manifest (profile-manifest profile))
|
||||||
(generation-file-name profile (car search-vals))
|
|
||||||
profile))
|
|
||||||
(manifest (profile-manifest profile))
|
|
||||||
(patterns (if (and (eq? entry-type 'output)
|
(patterns (if (and (eq? entry-type 'output)
|
||||||
(eq? search-type 'profile-diff))
|
(eq? search-type 'profile-diff))
|
||||||
(match search-vals
|
(match search-vals
|
||||||
|
|
|
@ -55,14 +55,7 @@
|
||||||
(obsolete
|
(obsolete
|
||||||
(0 "No obsolete packages in profile '%s'." profile)
|
(0 "No obsolete packages in profile '%s'." profile)
|
||||||
(1 "A single obsolete package in profile '%s'." profile)
|
(1 "A single obsolete package in profile '%s'." profile)
|
||||||
(many "%d obsolete packages in profile '%s'." count 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)))
|
|
||||||
|
|
||||||
(output
|
(output
|
||||||
(id
|
(id
|
||||||
|
@ -91,13 +84,6 @@
|
||||||
(0 "No obsolete package outputs in profile '%s'." profile)
|
(0 "No obsolete package outputs in profile '%s'." profile)
|
||||||
(1 "A single obsolete package output in profile '%s'." profile)
|
(1 "A single obsolete package output in profile '%s'." profile)
|
||||||
(many "%d obsolete package outputs in profile '%s'." count 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
|
(profile-diff
|
||||||
guix-message-outputs-by-diff))
|
guix-message-outputs-by-diff))
|
||||||
|
|
||||||
|
|
|
@ -127,8 +127,9 @@ current profile's GENERATION."
|
||||||
(lambda (btn)
|
(lambda (btn)
|
||||||
(guix-buffer-get-display-entries
|
(guix-buffer-get-display-entries
|
||||||
'list guix-package-list-type
|
'list guix-package-list-type
|
||||||
(list (guix-ui-current-profile)
|
(list (guix-generation-current-packages-profile
|
||||||
'generation (button-get btn 'number))
|
(button-get btn 'number))
|
||||||
|
'installed)
|
||||||
'add))
|
'add))
|
||||||
"Show installed packages for this generation"
|
"Show installed packages for this generation"
|
||||||
'number number)
|
'number number)
|
||||||
|
@ -202,8 +203,8 @@ VAL is a boolean value."
|
||||||
"List installed packages for the generation at point."
|
"List installed packages for the generation at point."
|
||||||
(interactive)
|
(interactive)
|
||||||
(guix-package-get-display
|
(guix-package-get-display
|
||||||
(guix-ui-current-profile)
|
(guix-generation-current-packages-profile (guix-list-current-id))
|
||||||
'generation (guix-list-current-id)))
|
'installed))
|
||||||
|
|
||||||
(defun guix-generation-list-generations-to-compare ()
|
(defun guix-generation-list-generations-to-compare ()
|
||||||
"Return a sorted list of 2 marked generations for comparing."
|
"Return a sorted list of 2 marked generations for comparing."
|
||||||
|
|
Loading…
Reference in New Issue