all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#52774] [PATCH] import: elpa: Also check NonGNU ELPA for updates.
@ 2021-12-24 11:25 Xinglu Chen
  2021-12-24 12:17 ` Liliana Marie Prikler
  0 siblings, 1 reply; 11+ messages in thread
From: Xinglu Chen @ 2021-12-24 11:25 UTC (permalink / raw)
  To: 52774

* elpa.scm (latest-release): Determine the repository based on the URL of the
source.
(package-from-gnu.org?): Rename to ...
(package-from-gnu.org-or-nongnu.org?): ...this.
(%elpa-updater): Adjust accordingly.
---
 guix/import/elpa.scm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm
index edabb88b7a..038379e01b 100644
--- a/guix/import/elpa.scm
+++ b/guix/import/elpa.scm
@@ -424,7 +424,11 @@ (define (guix-package->elpa-name package)
 (define (latest-release package)
   "Return an <upstream-release> for the latest release of PACKAGE."
   (define name (guix-package->elpa-name package))
-  (define repo 'gnu)
+  (define repo
+    (let ((url (origin-uri (package-source package))))
+      (if (string-prefix? "https://elpa.nongnu.org" url)
+          'nongnu
+          'gnu)))
 
   (match (elpa-package-info name repo)
     (#f
@@ -443,11 +447,12 @@ (define repo 'gnu)
         (urls (list url))
         (signature-urls (list (string-append url ".sig"))))))))
 
-(define package-from-gnu.org?
+(define package-from-gnu.org-or-nongnu.org?
   (url-predicate (lambda (url)
                    (let ((uri (string->uri url)))
                      (and uri
-                          (string=? (uri-host uri) "elpa.gnu.org"))))))
+                          (or (string=? (uri-host uri) "elpa.gnu.org")
+                              (string=? (uri-host uri) "elpa.nongnu.org")))))))
 
 (define %elpa-updater
   ;; The ELPA updater.  We restrict it to packages hosted on elpa.gnu.org
@@ -455,7 +460,7 @@ (define %elpa-updater
   (upstream-updater
    (name 'elpa)
    (description "Updater for ELPA packages")
-   (pred package-from-gnu.org?)
+   (pred package-from-gnu.org-or-nongnu.org?)
    (latest latest-release)))
 
 (define elpa-guix-name (cut guix-name "emacs-" <>))

base-commit: e8c1562599c7ebee8b7b228237fb0d75d4472a61
-- 
2.33.1







^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2022-01-05 23:13 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-24 11:25 [bug#52774] [PATCH] import: elpa: Also check NonGNU ELPA for updates Xinglu Chen
2021-12-24 12:17 ` Liliana Marie Prikler
2021-12-25  9:44   ` Xinglu Chen
2021-12-25 10:15     ` Liliana Marie Prikler
2021-12-25 14:31       ` Xinglu Chen
2021-12-25 15:23         ` Liliana Marie Prikler
2021-12-26 12:44           ` Xinglu Chen
2021-12-26 13:08             ` Liliana Marie Prikler
2022-01-05 22:18             ` bug#52774: " Ludovic Courtès
2022-01-05 23:03               ` [bug#52774] " Liliana Marie Prikler
2022-01-05 23:12                 ` Liliana Marie Prikler

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.