emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/nix-mode 7346057087 471/500: nix-flake: Show aliases in th


From: ELPA Syncer
Subject: [nongnu] elpa/nix-mode 7346057087 471/500: nix-flake: Show aliases in the registry as well
Date: Sat, 29 Jan 2022 08:27:57 -0500 (EST)

branch: elpa/nix-mode
commit 7346057087f52e03eaff6f7f9232dbfd5375e53c
Author: Akira Komamura <akira.komamura@gmail.com>
Commit: Akira Komamura <akira.komamura@gmail.com>

    nix-flake: Show aliases in the registry as well
    
    Show flake:* names as well for convenience in completing registry
    entries.
---
 nix-flake.el | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/nix-flake.el b/nix-flake.el
index bdf432f957..775eb3d846 100644
--- a/nix-flake.el
+++ b/nix-flake.el
@@ -83,23 +83,23 @@ already registered in either the user or the global 
registry."
 ;; just in case, but it may not be necessary.
 (defun nix-flake--select-flake (&optional prompt initial-input history)
   "Select a flake from the registry."
-  (let* ((registry-entries (thread-last (nix-flake--registry-list)
-                             (cl-remove-if-not (pcase-lambda (`(,type . ,_))
-                                                 (member type '("user" 
"global"))))))
+  (let* ((registered-flakes (thread-last (nix-flake--registry-list)
+                             ;; I don't know if I should include flakes in the
+                             ;; system registry. It's ugly to display full
+                             ;; checksums, so I won't include them for now.
+                              (cl-remove-if-not (pcase-lambda (`(,type . ,_))
+                                                  (member type '("user" 
"global"))))
+                              (mapcar (lambda (cells)
+                                       (list (nth 1 cells)
+                                              (nth 2 cells))))
+                              (flatten-list)))
          (input (string-trim
                  (completing-read (or prompt "Flake URL: ")
-                                  (thread-last registry-entries
-                                    (mapcar (pcase-lambda (`(,_ ,_ ,ref))
-                                             ref)))
+                                 registered-flakes
                                   nil nil nil history initial-input))))
     (prog1 input
       (when (and nix-flake-add-to-registry
-                 (not (member input
-                              (thread-last registry-entries
-                                (mapcar (lambda (cells)
-                                          (list (nth 1 cells)
-                                                (nth 2 cells))))
-                                (flatten-list)))))
+                 (not (member input registered-flakes)))
         (let ((name (read-string (format-message "Enter the registry name for 
%s: "
                                                  input))))
           (unless (or (not name)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]