From: Xinglu Chen <public@yoctocell.xyz>
To: Liliana Marie Prikler <liliana.prikler@gmail.com>, 52774@debbugs.gnu.org
Subject: [bug#52774] [PATCH] import: elpa: Also check NonGNU ELPA for updates.
Date: Sat, 25 Dec 2021 10:44:43 +0100 [thread overview]
Message-ID: <87r1a1auic.fsf@yoctocell.xyz> (raw)
In-Reply-To: <76a91a888e6d4df4d46aa4dcc0fc3719c91e4c39.camel@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2851 bytes --]
Liliana schrieb am Freitag der 24. Dezember 2021 um 13:17 +01:
> Am Freitag, dem 24.12.2021 um 12:25 +0100 schrieb Xinglu Chen:
>> * 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
> Could we make it so that package-from-gnu.org? becomes elpa-package?
> s.t. (member (elpa-package? pkg) '(gnu nongnu #f)) and its evaluation
> can be reused?
Wouldn’t it be enough with just '(gnu nongnu)?
We could make the ‘elpa-package?’ procedure memoized to avoid evaluating
the same thing twice.
> Otherwise LGTM, cheers!
Cool, thanks for taking a look!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 861 bytes --]
next prev parent reply other threads:[~2021-12-25 9:46 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r1a1auic.fsf@yoctocell.xyz \
--to=public@yoctocell.xyz \
--cc=52774@debbugs.gnu.org \
--cc=liliana.prikler@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).