From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kLYpK6T5vGHo0AAAgWs5BA (envelope-from ) for ; Fri, 17 Dec 2021 21:57:08 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 4BLrJqT5vGENdQAAB5/wlQ (envelope-from ) for ; Fri, 17 Dec 2021 20:57:08 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 592641028F for ; Fri, 17 Dec 2021 21:57:08 +0100 (CET) Received: from localhost ([::1]:38364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myKHr-0005LM-HE for larch@yhetil.org; Fri, 17 Dec 2021 15:57:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50222) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myKHn-0005L6-0y for guix-patches@gnu.org; Fri, 17 Dec 2021 15:57:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57394) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myKHm-0002zQ-PK for guix-patches@gnu.org; Fri, 17 Dec 2021 15:57:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1myKHm-0006Rw-F9 for guix-patches@gnu.org; Fri, 17 Dec 2021 15:57:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52586] [PATCH] import: elpa: Support =?UTF-8?Q?=E2=80=98upstream-name=E2=80=99?= property. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Dec 2021 20:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52586 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52586@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163977457324723 (code B ref -1); Fri, 17 Dec 2021 20:57:02 +0000 Received: (at submit) by debbugs.gnu.org; 17 Dec 2021 20:56:13 +0000 Received: from localhost ([127.0.0.1]:40707 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myKGz-0006Qg-6u for submit@debbugs.gnu.org; Fri, 17 Dec 2021 15:56:13 -0500 Received: from lists.gnu.org ([209.51.188.17]:39996) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1myKGx-0006QY-Oe for submit@debbugs.gnu.org; Fri, 17 Dec 2021 15:56:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myKGw-0005Cf-I5 for guix-patches@gnu.org; Fri, 17 Dec 2021 15:56:11 -0500 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:58454 helo=mail.yoctocell.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myKGq-0002oy-Gf for guix-patches@gnu.org; Fri, 17 Dec 2021 15:56:09 -0500 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1639774555; bh=YBkfoEouK/cJiKlbJR9uo5E35ud97jDsNVaCuoUFPLM=; h=From:To:Subject:Date; b=pjU0AzBlB42u66JUYQS+XPvWEJhvcTVppoPz2NTW/sNxWqP3eoSoh1ogmg7z7sMsz ZF2a/FnoqRMcyCw4hMBbBhvR4USqI3cZoB3k7yDLRx6D2LFxNa15sGg1zmihBGTgAv lNPSYj+YNOWFQOsY8EmBJbC3Inarba/wWbDcdiTk= Message-Id: Date: Fri, 17 Dec 2021 21:55:54 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=87.96.130.155; envelope-from=public@yoctocell.xyz; helo=mail.yoctocell.xyz X-Spam_score_int: 53 X-Spam_score: 5.3 X-Spam_bar: +++++ X-Spam_report: (5.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FROM_SUSPICIOUS_NTLD=0.498, FROM_SUSPICIOUS_NTLD_FP=0.295, PDS_OTHER_BAD_TLD=1.997, PDS_RDNS_DYNAMIC_FP=0.001, RCVD_IN_PBL=3.335, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TO_NO_BRKTS_DYNIP=0.245 autolearn=no autolearn_force=no X-Spam_action: reject 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1639774628; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=ukKjl4CG5JAlq9lfjg7mTisw7+yRvTuMLec3nVmww4w=; b=APLFWOVNSUhQnf/mKyLOx3l/3wGGNULzXrbjuApHMn4YJ/ISX1nKOkLk6WvbM5gJiC9evz AX/0+fVAOniB0Yv5mCw1isIfaL+SpNLZh7HBWKhRkXNsoTRpBu1EJ3sfepzWRxQ0uoyMBL Flor29wgqEpEm6OhRErKxEfmUzrlHY/HWw58bB+gEjeZmavMFIdJ5OxwxKwi3ekXA9BynK ZN3JFuZMme10M4aZd4ru8WU5PmJFRmSnICkZ/JCeuvNfBNF3MLRodYuMNGgtWnrc1ahEAr svkXo4jCTdrTyFoRkU9xNk7E1LRG5XMKGns1ZXZNg7FV+fPeGh8N1b8LWlndGQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1639774628; a=rsa-sha256; cv=none; b=Fa2goihUQBo3sn9eKTNSb2UKc0/SpvgsHxpiG6E0HPVSeJ3tUxlgnXxx7wUzQnH+2ffmDg I8l98VHXhBjRxK3d0NxpKe5+oBYawU9lGqMMc3c5UDlNwMzQJFZjbCnOnu8vd/+EXIJ7zu QHdh9nlbQ2T6P3E/yUvPu9YtyFdsZOPVPfpx2aT7A6HipV2TJqwFahPTb4gGQdy68LQe/1 d6/wsbdBCVQtpd9gyNWwqlg0MspVhlVX+gJKUraIXpN6FBVqkqWl29wVKvvCyAgc05anPB i+fM0zCkHSRXhSmLoDFYvUwc4Zl2mgxLAP09eiHQjtb76Wnd+nNNMV7lpV0wjA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=pjU0AzBl; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.60 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=pjU0AzBl; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 592641028F X-Spam-Score: -1.60 X-Migadu-Scanner: scn0.migadu.com X-TUID: WPpe7GxaIlS5 * guix/import/elpa.scm: (guix-package->elpa-name): New procedure. (latest-release): Use it. * tests/elpa.scm ("guix-package->elpa-name: without 'upstream-name' propert= y") ("guix-package->elpa-name: with 'upstream-name' property"): Test it. --- guix/import/elpa.scm | 15 ++++++++++----- tests/elpa.scm | 12 ++++++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm index dd539cd945..edabb88b7a 100644 --- a/guix/import/elpa.scm +++ b/guix/import/elpa.scm @@ -46,6 +46,7 @@ (define-module (guix import elpa) #:use-module (guix packages) #:use-module ((guix utils) #:select (call-with-temporary-output-file)) #:export (elpa->guix-package + guix-package->elpa-name %elpa-updater elpa-recursive-import)) =20 @@ -412,13 +413,17 @@ (define* (elpa->guix-package name #:key (repo 'gnu) v= ersion) ;;; Updates. ;;; =20 +(define (guix-package->elpa-name package) + "Given a Guix package, PACKAGE, return the upstream name on ELPA." + (or (and=3D> (package-properties package) + (cut assq-ref <> 'upstream-name)) + (if (string-prefix? "emacs-" (package-name package)) + (string-drop (package-name package) 6) + (package-name package)))) + (define (latest-release package) "Return an for the latest release of PACKAGE." - (define name - (if (string-prefix? "emacs-" (package-name package)) - (string-drop (package-name package) 6) - (package-name package))) - + (define name (guix-package->elpa-name package)) (define repo 'gnu) =20 (match (elpa-package-info name repo) diff --git a/tests/elpa.scm b/tests/elpa.scm index 01ef948b2e..1efdf2457f 100644 --- a/tests/elpa.scm +++ b/tests/elpa.scm @@ -2,6 +2,7 @@ ;;; Copyright =C2=A9 2015 Federico Beffa ;;; Copyright =C2=A9 2020 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2020 Martin Becze +;;; Copyright =C2=A9 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +21,7 @@ =20 (define-module (test-elpa) #:use-module (guix import elpa) + #:use-module (guix tests) #:use-module (guix tests http) #:use-module (srfi srfi-1) #:use-module (srfi srfi-64) @@ -71,6 +73,16 @@ (define (eval-test-with-elpa pkg) (test-assert "elpa->guix-package test 1" (eval-test-with-elpa "auctex")) =20 +(test-equal "guix-package->elpa-name: without 'upstream-name' property" + "auctex" + (guix-package->elpa-name (dummy-package "emacs-auctex"))) + +(test-equal "guix-package->elpa-name: with 'upstream-name' property" + "project" + (guix-package->elpa-name + (dummy-package "emacs-fake-name" + (properties '((upstream-name . "project")))))) + (test-end "elpa") =20 ;; Local Variables: base-commit: d627fbad8f4e157103251b07d7543dd2f5647cea --=20 2.33.1