From patchwork Sun Dec 26 12:44:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 35662 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5B08F27BBEA; Sun, 26 Dec 2021 12:45:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B6ADF27BBE9 for ; Sun, 26 Dec 2021 12:45:27 +0000 (GMT) Received: from localhost ([::1]:40340 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n1Sty-0004lf-Sd for patchwork@mira.cbaines.net; Sun, 26 Dec 2021 07:45:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1Sta-0004lV-NH for guix-patches@gnu.org; Sun, 26 Dec 2021 07:45:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57024) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n1StZ-0000ja-ND for guix-patches@gnu.org; Sun, 26 Dec 2021 07:45:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n1StZ-00020w-KP for guix-patches@gnu.org; Sun, 26 Dec 2021 07:45:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52774] [PATCH] import: elpa: Also check NonGNU ELPA for updates. References: <87wnjub5y6.fsf@yoctocell.xyz> Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 Dec 2021 12:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52774 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler , 52774@debbugs.gnu.org Received: via spool by 52774-submit@debbugs.gnu.org id=B52774.16405226867703 (code B ref 52774); Sun, 26 Dec 2021 12:45:01 +0000 Received: (at 52774) by debbugs.gnu.org; 26 Dec 2021 12:44:46 +0000 Received: from localhost ([127.0.0.1]:40337 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1StK-00020B-0P for submit@debbugs.gnu.org; Sun, 26 Dec 2021 07:44:46 -0500 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:49258 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1StH-0001zr-V4 for 52774@debbugs.gnu.org; Sun, 26 Dec 2021 07:44:45 -0500 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yoctocell.xyz; s=mail; t=1640522676; bh=d2wRikRUkZUqXEVYb5J9yNktpBaUCL/ftD0XYTRwA8c=; h=From:To:Subject:In-Reply-To:Date; b=uUrym/bNHjdAq7jJE0eGEEUuTN/0O5ddovT6SGrGevczX+9DPTjMhEqxUABNXAt1N Hyh6D8R3XYqH8au7y8pxcBOqUx//28NwSw2ak/OfMxEh9avTGOEzq896A824mJ8Upl x03aOkbd14eabC5AbktRwQrFltfvdwlJHxEFdxho= In-Reply-To: <5ba4b071c95b0db888ad3290d1aa569e979acec5.camel@gmail.com> Date: Sun, 26 Dec 2021 13:44:34 +0100 Message-ID: <87ee5zbknh.fsf@yoctocell.xyz> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Liliana schrieb am Samstag der 25. Dezember 2021 um 16:23 +01: > Am Samstag, dem 25.12.2021 um 15:31 +0100 schrieb Xinglu Chen: >> Liliana schrieb am Samstag der 25. Dezember 2021 um 11:15 +01: >> >> > Am Samstag, dem 25.12.2021 um 10:44 +0100 schrieb Xinglu Chen: >> > > 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 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. >> > The reason for #f is so that packages that are neither from GNU nor >> > NonGNU ELPA are still excluded from the updater. >> >> I am not sure I follow.  If ‘elpa-package?’ returned #f, the >> following would return #f. >> >>   (member (elpa-package? pkg) '(gnu nongnu)) >> >> Meaning that PKG is not hosted on GNU or NonGNU ELPA, and thus, >> should not be checked for updates. >> >> When including #f in the list, the value returned by the ‘member’ >> expression would be '(#f), which means that PKG would be checked for >> updates, even though it shouldn’t. > I think you're misunderstanding what I'm saying, but that might be > because I worded it badly. My suggestion was to make elpa-package? a > "predicate with meaning", which returns #f if PKG is not an ELPA > package, and a truthy value otherwise, said truthy value being the > symbol 'gnu or 'nongnu at the moment That was what I had in mind as well, but I don’t see why we would need '(gnu nongnu #f) instead of just '(gnu nongnu). If PKG is not in ELPA, we _don’t_ want to check for updates, and therefore, #f shouldn’t be a member of the list. I took a stab at the problem (patch attached below), and the result seems to be what would be expected. --8<---------------cut here---------------start------------->8--- $ ./pre-inst-env guix refresh -t elpa emacs-caml emacs-project emacs-helm gnu/packages/emacs-xyz.scm:10870:2: warning: no updater for emacs-helm ;github gnu/packages/emacs-xyz.scm:636:13: 0.8.1 is already the latest version of emacs-project ;gnu gnu/packages/emacs-xyz.scm:2751:13: 4.9 is already the latest version of emacs-caml ;nongnu --8<---------------cut here---------------end--------------->8--- From 4332502000bd06a2be900c236666d10f07777807 Mon Sep 17 00:00:00 2001 Message-Id: <4332502000bd06a2be900c236666d10f07777807.1640522590.git.public@yoctocell.xyz> From: Xinglu Chen Date: Thu, 23 Dec 2021 22:08:33 +0100 Subject: [PATCH] import: elpa: Also check NonGNU ELPA for updates. * elpa.scm (latest-release): Determine the repository based on the URL of the source. (package-from-gnu.org?): Rename to ... (elpa-repository): ...this; memoize. (elpa-package?): New procedure. (%elpa-updater): Adjust accordingly. --- guix/import/elpa.scm | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm index edabb88b7a..a03df5167e 100644 --- a/guix/import/elpa.scm +++ b/guix/import/elpa.scm @@ -44,6 +44,7 @@ (define-module (guix import elpa) #:use-module (guix base32) #:use-module (guix upstream) #:use-module (guix packages) + #:use-module (guix memoization) #:use-module ((guix utils) #:select (call-with-temporary-output-file)) #:export (elpa->guix-package guix-package->elpa-name @@ -424,7 +425,7 @@ (define (guix-package->elpa-name package) (define (latest-release package) "Return an for the latest release of PACKAGE." (define name (guix-package->elpa-name package)) - (define repo 'gnu) + (define repo (elpa-repository package)) (match (elpa-package-info name repo) (#f @@ -443,11 +444,20 @@ (define repo 'gnu) (urls (list url)) (signature-urls (list (string-append url ".sig")))))))) -(define package-from-gnu.org? - (url-predicate (lambda (url) - (let ((uri (string->uri url))) - (and uri - (string=? (uri-host uri) "elpa.gnu.org")))))) +(define elpa-repository + (memoize + (url-predicate (lambda (url) + (let ((uri (string->uri url))) + (and uri + (cond + ((string=? (uri-host uri) "elpa.gnu.org") + 'gnu) + ((string=? (uri-host uri) "elpa.nongnu.org") + 'nongnu) + (else #f)))))))) + +(define (elpa-package? package) + (member (elpa-repository package) '(gnu nongnu))) (define %elpa-updater ;; The ELPA updater. We restrict it to packages hosted on elpa.gnu.org @@ -455,7 +465,7 @@ (define %elpa-updater (upstream-updater (name 'elpa) (description "Updater for ELPA packages") - (pred package-from-gnu.org?) + (pred elpa-package?) (latest latest-release))) (define elpa-guix-name (cut guix-name "emacs-" <>)) base-commit: 2495582e08cf411163f0799d290fda5101141949 -- 2.33.1