From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id aArZDnbXd2YdnAAA62LTzQ:P1 (envelope-from ) for ; Sun, 23 Jun 2024 08:06:14 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id aArZDnbXd2YdnAAA62LTzQ (envelope-from ) for ; Sun, 23 Jun 2024 10:06:14 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=imAY99RY; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1719129974; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=maQJz3WaiRbFjFPLZLySk8qPnPRFhZmVYlRp3ymIk2U=; b=Y9+VrWmzfWAQkXoiansAG6Pen2W6r+nbG00xmbKYW87fZvRUsOFoKtGG+yeyidyDUiWsr2 Xw5NdWl7f3j0d+QahJhDREBvGJqTav5ZjkyEoGVdWNza1VV+o3ZNRe3qDKAkIXULTIuoFc Cd5bExluopXK5qDGRsUcBaISibFd6RQGcR6LTXwWzbt+NDQoZppOr+bNSG802dDb6TMyLp zKORvej5qTXIyRDdiQl4/dS8YTDhkAOk0YIPncYwKcKTourFrEbjb5ndxDmbw2ZQx/mv7y aYZUB7BqO5kAmkgDhpq7hcpS7ZcunDrmthiRTWJ1fuLTv5UQyn61nyG03MGKVQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1719129974; a=rsa-sha256; cv=none; b=t/NfsPSa94OVs6QS28aQXUAZK53WFPpO1h2qQ+BkeWAgPyhTGnMKlKaLjGLoKAxDRwl4mK 8KhIK6AHRZ8UTmIaBkzCaw4wNNSmKmIo+4466m4BszrNPYUcfNkf3pEfrV+McWDI+EEt29 ttmwVHgRbY8+v7RdUYlmXe5cNW+UI8Mo7pIaDitZy1nczN0mAle/lRbXAWg703fmpBvxQI ZgKWgR8wDCCXp0LX+s2Eemg3SIHOzEBzGsrJw0v6om+w7aLEESaa0JVLybMuScpIlBHmk3 lgzL5/aAtvElIx+Gp8bRdKsXMS6ewuQMtL6IbmDb9S/c//JQiDnLyGw51HkDlA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=imAY99RY; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (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" 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 2A28473C8D for ; Sun, 23 Jun 2024 10:06:14 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sLIEd-0007RG-8t; Sun, 23 Jun 2024 04:06:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sLIEb-0007R6-Lc for guix-patches@gnu.org; Sun, 23 Jun 2024 04:06:01 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sLIEb-0001Rw-Dm for guix-patches@gnu.org; Sun, 23 Jun 2024 04:06:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sLIEb-0006AW-ML for guix-patches@gnu.org; Sun, 23 Jun 2024 04:06:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71653] [PATCH] import/github: Honor upstream-name property. Resent-From: Dariqq Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Jun 2024 08:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71653 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Zheng Junjie Cc: 71653@debbugs.gnu.org Received: via spool by 71653-submit@debbugs.gnu.org id=B71653.171912991723630 (code B ref 71653); Sun, 23 Jun 2024 08:06:01 +0000 Received: (at 71653) by debbugs.gnu.org; 23 Jun 2024 08:05:17 +0000 Received: from localhost ([127.0.0.1]:49154 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLIDt-000694-4n for submit@debbugs.gnu.org; Sun, 23 Jun 2024 04:05:17 -0400 Received: from mout02.posteo.de ([185.67.36.66]:58017) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sLIDq-00068k-Dh for 71653@debbugs.gnu.org; Sun, 23 Jun 2024 04:05:14 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id E9DE7240101 for <71653@debbugs.gnu.org>; Sun, 23 Jun 2024 10:05:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1719129905; bh=1K4P9lUgnNi1TyMKeHUotLS3L0qBrpM2Tx+tQ5DxYMI=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:From:Content-Type: Content-Transfer-Encoding:From; b=imAY99RYRgLT5lM1Gqo+mVFWABfcEAstLxpAljI4Ir7Mu0jDa6zLNUT14Ri6zo1xo cbN2J7TO19A912z/7yvIn/tx3A22QCjkfOtwQDSnEQpNHMpMiRqcHTFrj5WlkwbHrc IXd8pEcmSihiwg5H4CTxv51Lq3ZI71bm0QFJYRJIwujVcqI8uNp7rMnbqPcRKqWV2h 4kS0kDFBWCXySHoCUQKwcO9l7h3Lz+IskEj5ScjaC6t8TV1oMz1Slnytc8v+3Y6jTO N8Lj8fkRHJfD3OiRPSGC3XaBp/Trn3hGa9aTuNqvrYT33XAbNuX0YdADMnIjkulm8p fhPeXmngMkbXg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4W6NtR71gdz9rxD; Sun, 23 Jun 2024 10:05:03 +0200 (CEST) Message-ID: Date: Sun, 23 Jun 2024 08:05:01 +0000 MIME-Version: 1.0 References: <9c451854e49750ed14b11b0cee3d4c2ccea51e3a.1718814397.git.dariqq@posteo.net> <87tthkji0y.fsf@iscas.ac.cn> Content-Language: en-US From: Dariqq In-Reply-To: <87tthkji0y.fsf@iscas.ac.cn> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -2.46 X-Spam-Score: -2.46 X-Migadu-Queue-Id: 2A28473C8D X-Migadu-Scanner: mx11.migadu.com X-TUID: uC9fpsbMZ0Im On 23.06.24 08:21, Zheng Junjie wrote: > Dariqq writes: > >> * guix/import/github.scm (import-release): Use 'upstream-name if available. >> >> Change-Id: I9a4999a01156ce02584270837ceab70996b49106 >> --- >> guix/import/github.scm | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/guix/import/github.scm b/guix/import/github.scm >> index c5556d78ee..164fcde458 100644 >> --- a/guix/import/github.scm >> +++ b/guix/import/github.scm >> @@ -328,8 +328,9 @@ (define* (import-release pkg #:key (version #f)) >> (let* ((original-uri (origin-uri (package-source pkg))) >> (source-uri (github-uri original-uri)) >> (name (package-name pkg)) > ^------------ I think maybe just use "package-upstream-name" on this? > Thanks, i think this is better. Have sent a v2 now. THis will also change the package field of the resulting upstream-source to the upstream name, but this matches what other updaters do (i have checked with gnu-maintenance) >> + (upstream-name (assoc-ref (package-properties pkg) 'upstream-name)) >> (newest-version version-tag >> - (latest-released-version source-uri name >> + (latest-released-version source-uri (or upstream-name name) >> #:version version))) >> (if newest-version >> (upstream-source >> >> base-commit: c551e406a75273583ae3fef92f32468f905cc07f