From patchwork Wed Jun 19 16:26:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dariqq X-Patchwork-Id: 65495 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 0A38F27BBE2; Wed, 19 Jun 2024 17:28:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 8EE9327BBE9 for ; Wed, 19 Jun 2024 17:28:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJyAD-0004dm-DO; Wed, 19 Jun 2024 12:28:01 -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 1sJyAB-0004bF-I1 for guix-patches@gnu.org; Wed, 19 Jun 2024 12:27:59 -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 1sJyAB-0000Ul-9l for guix-patches@gnu.org; Wed, 19 Jun 2024 12:27:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sJyAE-0006xp-Hg for guix-patches@gnu.org; Wed, 19 Jun 2024 12:28:02 -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: Wed, 19 Jun 2024 16:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71653 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71653@debbugs.gnu.org Cc: Dariqq X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171881446826730 (code B ref -1); Wed, 19 Jun 2024 16:28:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Jun 2024 16:27:48 +0000 Received: from localhost ([127.0.0.1]:50510 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJyA0-0006x2-Al for submit@debbugs.gnu.org; Wed, 19 Jun 2024 12:27:48 -0400 Received: from lists.gnu.org ([209.51.188.17]:50102) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sJy9z-0006wr-0q for submit@debbugs.gnu.org; Wed, 19 Jun 2024 12:27:47 -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 1sJy9v-0004L5-EW for guix-patches@gnu.org; Wed, 19 Jun 2024 12:27:43 -0400 Received: from mout02.posteo.de ([185.67.36.66]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sJy9t-0000OZ-2K for guix-patches@gnu.org; Wed, 19 Jun 2024 12:27:43 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 54573240101 for ; Wed, 19 Jun 2024 18:27:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1718814456; bh=2mZDk8SZCDt2/fvEqZ/9ArxojxJHWmaSDCJ7hyxqesk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=Rr8AhfLIwuTJvPG5+QJ124MghrhaBaBLKWh5vzBI1a6gim9VNwiEpIfyOsuTszZ5/ t8dmNOQECHlG9fO5daC+UoEjU7hN6tjW/5hY1mKrbN9bmyNidnK/jmCIMSR+m/UWgv PN5rNGM4jsn9cHXxpfCdY/S7JJ6OzguAfaNzSkRsXeNfLSI5t7q+PdFUaHZ21mYWES X6WzcA6MyvnfNQcFvN4I/7TExWp9Q4js3zp6l9tt0uLoZjH0AWKCYKYItrS8F11ztW i+vWzI8EDRhcbrsiwjil4F0rG6DpM3f8JjVUxHfLDJLZJqBSmOMhQ3ACHydJfL2RF2 HQoC/ypMw/uog== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4W48D76V9cz6v00; Wed, 19 Jun 2024 18:27:35 +0200 (CEST) From: Dariqq Date: Wed, 19 Jun 2024 16:26:37 +0000 Message-ID: <9c451854e49750ed14b11b0cee3d4c2ccea51e3a.1718814397.git.dariqq@posteo.net> MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.66; envelope-from=dariqq@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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(-) base-commit: c551e406a75273583ae3fef92f32468f905cc07f 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)) + (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