From patchwork Tue Apr 13 16:28:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 28484 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 732CF27BC75; Tue, 13 Apr 2021 17:35:02 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 92AC427BC74 for ; Tue, 13 Apr 2021 17:35:01 +0100 (BST) Received: from localhost ([::1]:50684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWM0C-0001K2-MQ for patchwork@mira.cbaines.net; Tue, 13 Apr 2021 12:35:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47606) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWLyI-00005g-DL for guix-patches@gnu.org; Tue, 13 Apr 2021 12:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49094) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWLyI-0001hI-4G for guix-patches@gnu.org; Tue, 13 Apr 2021 12:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWLyH-0002jh-Uo for guix-patches@gnu.org; Tue, 13 Apr 2021 12:33:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47754] [PATCH] gnu: transformations: fix with-latest option for git source package. Resent-From: Z572 <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 13 Apr 2021 16:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47754 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47754@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161833156210489 (code B ref -1); Tue, 13 Apr 2021 16:33:01 +0000 Received: (at submit) by debbugs.gnu.org; 13 Apr 2021 16:32:42 +0000 Received: from localhost ([127.0.0.1]:60640 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWLxx-0002j6-JU for submit@debbugs.gnu.org; Tue, 13 Apr 2021 12:32:41 -0400 Received: from lists.gnu.org ([209.51.188.17]:48916) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1lWLxw-0002j0-Up for submit@debbugs.gnu.org; Tue, 13 Apr 2021 12:32:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47482) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <873216071@qq.com>) id 1lWLxv-0008CD-Ox for guix-patches@gnu.org; Tue, 13 Apr 2021 12:32:40 -0400 Received: from out203-205-221-210.mail.qq.com ([203.205.221.210]:53980 helo=qq.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <873216071@qq.com>) id 1lWLxl-0001QG-9L for guix-patches@gnu.org; Tue, 13 Apr 2021 12:32:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1618331537; bh=qaST4mbGcm2/ggfjxjkXYomG2/uEell/HZb6E/rQ4V8=; h=From:To:Subject:Date; b=qFCOJtE7IXax4/eF8N8mcWHymxeX1ECGyvp0hoHL6eNJ1/gM2EixNyDWIduICzdoB 6JcNQsrmJVmI8L572kM3LwyXX3Gegpb3NG7ecd39/lcxXv1dTOE4t8aEEsQwAwPq/f 2ocIdG9a6a22CPAXsMJ+TEEWVlUIU5GVlRCi+lTc= Received: from Z572 ([2409:8928:1254:168c:4be9:6ad0:366:f8d9]) by newxmesmtplogicsvrszc9.qq.com (NewEsmtp) with SMTP id 73918C29; Wed, 14 Apr 2021 00:28:57 +0800 X-QQ-mid: xmsmtpt1618331337t0il9nqwx Message-ID: X-QQ-XMAILINFO: OcBT4SkMQhJmaXD7nfUclmIuoX86JzrRQNxkH8hVp0WVkCwhxVjhNMGq0tilZn U5hISqnwt6qhZuIxHkYzqtQl1WmrFMbMDvitzL0o8KbHzfMxknTzBE6AETU5GUaWH+PDe48MCEkf eetrY4mZu6PB9+mozFAbGe97Su8lDsrMHFuoZ+F2BDPnx2nWKJU9uOmCnpkxoapJaYb7kSe8LrLU 698ZvFgtaNUZpgB35RCVWfaNi0btjKmUeLCmh0k7LiTyegVPA37Og5nfexHDZgck8Z/tyKcxvRJy /QfKlT6SZw3W7Qh+j4mVMwNWn6EfyTtArBrX2tFXOW1Ucnd1AmApl8bd6hmTOGH6lzoOpe/9N2vk jdjhEEcoj5znujw0R4tTEhVOZNMBQzPElfU78FS4oQ80QDJ2324EfVCa5frPkgsORkcm7mSEGa3T Tnk8y+mAHyk5dptDm9MC1NjQBjSgR+JolMEVNzEp1C2UQy0hv2I65XlSUkxqpsokDMC7RiOS58Vs YbzDb4UC1yL6/6W+SXrTs81zYBZGPE55/dyzp7/LYnyPm0axIFI+oNfHz7puojshpFw95pX4VYLW yhaV6gIvoxMBPpvE123LWN4iwrTULVXYhFtUB4ZjhSGmG34hneH/EYS9ZaoHmRMuXVrL2a1scIso G/vqia61CvBKcGmtl8noVoGAv3L9z0CGn0P3J/VCxBq//3Q93+Tsr+QAi0OB+nVj6y3bUTKKpyST 7z9O28TFEeyS8= From: Z572 <873216071@qq.com> Date: Wed, 14 Apr 2021 00:28:57 +0800 Message-ID: <87a6q2i1x2.fsf@qq.com> MIME-Version: 1.0 Content-Disposition: inline; filename=0001-gnu-transformations-fix-with-latest-option-for-git-s.patch Received-SPF: pass client-ip=203.205.221.210; envelope-from=873216071@qq.com; helo=qq.com X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_DYNAMIC=0.982, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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" X-getmail-retrieved-from-mailbox: Patches From 52bd30a6ac967375aa9a178345f1bdea8388457a Mon Sep 17 00:00:00 2001 From: Zheng Junjie <873216071@qq.com> Date: Tue, 13 Apr 2021 23:00:10 +0800 Subject: [PATCH] gnu: transformations: fix with-latest option for git source package. gnu/transformations.scm: (transform-package-latest): (package-with-latest-upstream): use git-checkout if p is a git source package. --- guix/transformations.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/guix/transformations.scm b/guix/transformations.scm index 4e9260350c..559e408c37 100644 --- a/guix/transformations.scm +++ b/guix/transformations.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès +;;; Copyright @ 2021 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,7 @@ #:autoload (guix git-download) (git-reference? git-reference-url) #:autoload (guix git) (git-checkout git-checkout? git-checkout-url) #:autoload (guix upstream) (package-latest-release* + upstream-source-urls upstream-source-version upstream-source-signature-urls) #:use-module (guix utils) @@ -537,7 +539,11 @@ are replaced by their latest upstream version." (package (inherit p) (version (upstream-source-version source)) - (source source)))))) + (source (cond ((false-if-exception (package-git-url p)) + (git-checkout + (url (car (upstream-source-urls source))) + (recursive? #t))) + (else source)))))))) (define rewrite (package-input-rewriting/spec -- 2.31.1