X-Loop: help-debbugs@HIDDEN
Subject: [bug#47754] [PATCH] gnu: transformations: fix with-latest option for git source package.
Resent-From: Z572 <873216071@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 13 Apr 2021 16:33:01 +0000
Resent-Message-ID: <handler.47754.B.161833156210489 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 47754
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 47754 <at> debbugs.gnu.org
X-Debbugs-Original-To: guix-patches@HIDDEN
Received: via spool by submit <at> 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 <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1lWLxx-0002j6-JU
for submit <at> 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@HIDDEN>) id 1lWLxw-0002j0-Up
for submit <at> 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@HIDDEN>) id 1lWLxv-0008CD-Ox
for guix-patches@HIDDEN; 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@HIDDEN>) id 1lWLxl-0001QG-9L
for guix-patches@HIDDEN; 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: <tencent_44B54DBA54BC2CDBBF121D82F2AC1283DA07@HIDDEN>
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@HIDDEN>
Date: Wed, 14 Apr 2021 00:28:57 +0800
Message-ID: <87a6q2i1x2.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/x-patch; charset=utf-8
Content-Disposition: inline;
filename=0001-gnu-transformations-fix-with-latest-option-for-git-s.patch
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass client-ip=203.205.221.210; envelope-from=873216071@HIDDEN;
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-Spam-Score: 0.4 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.1 (--)
From 52bd30a6ac967375aa9a178345f1bdea8388457a Mon Sep 17 00:00:00 2001
From: Zheng Junjie <873216071@HIDDEN>
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-u=
pstream):
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 =C2=A9 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Court=C3=
=A8s <ludo@HIDDEN>
+;;; Copyright @ 2021 Zheng Junjie <873216071@HIDDEN>
;;;
;;; 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))))))))
=20
(define rewrite
(package-input-rewriting/spec
--=20
2.31.1
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Z572 <873216071@HIDDEN> Subject: bug#47754: Acknowledgement ([PATCH] gnu: transformations: fix with-latest option for git source package.) Message-ID: <handler.47754.B.161833156210489.ack <at> debbugs.gnu.org> References: <87a6q2i1x2.fsf@HIDDEN> X-Gnu-PR-Message: ack 47754 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 47754 <at> debbugs.gnu.org Date: Tue, 13 Apr 2021 16:33:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 47754 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 47754: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D47754 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN
Subject: [bug#47754] [PATCH] gnu: transformations: fix with-latest option for git source package.
Resent-From: zimoun <zimon.toutoune@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 03 Nov 2021 11:04:01 +0000
Resent-Message-ID: <handler.47754.B47754.16359374239933 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 47754
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Z572 <873216071@HIDDEN>
Cc: 47754 <at> debbugs.gnu.org
Received: via spool by 47754-submit <at> debbugs.gnu.org id=B47754.16359374239933
(code B ref 47754); Wed, 03 Nov 2021 11:04:01 +0000
Received: (at 47754) by debbugs.gnu.org; 3 Nov 2021 11:03:43 +0000
Received: from localhost ([127.0.0.1]:39213 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1miE3T-0002a9-2X
for submit <at> debbugs.gnu.org; Wed, 03 Nov 2021 07:03:43 -0400
Received: from mail-wr1-f50.google.com ([209.85.221.50]:43797)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zimon.toutoune@HIDDEN>) id 1miE3O-0002ZE-C5
for 47754 <at> debbugs.gnu.org; Wed, 03 Nov 2021 07:03:42 -0400
Received: by mail-wr1-f50.google.com with SMTP id t30so2906875wra.10
for <47754 <at> debbugs.gnu.org>; Wed, 03 Nov 2021 04:03:38 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
h=from:to:cc:subject:references:date:in-reply-to:message-id
:user-agent:mime-version;
bh=awrDvQYBjjWfbzh/Y8gVedmuKHXvcsyZAzVid9V7I8k=;
b=aGKOtvj0SLHKNu0c6DbV8S8V0wJnWaTuc6jfith7q/YdAGYj+zIxeMKVovUqm56tmx
wzntr7QSkyC4v0hh5PtfJYNw9AiAPbpPP6MKhBtMyIQmrQFLzmeNOUJHxisxF6iiEKfJ
+i4F58Viye2JrYCQTFLAM8b+xHOY1cSED2lj0UjvPIRfB4+mgOYv0gd7pOQb79IzsI+r
xasKrPyFc+UHOjGY2xnNYV6YRJ/NzmOkG9ETwmXNNPnoaEpFkhKJWHoLpaZbRJFPU/85
W6Gg7R5tnMrKdkWKMUNppHszTOO7BIJjnsErYUq2rHzLyd9Xiaxch84s0mgzkQhcrNdW
EWzw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to
:message-id:user-agent:mime-version;
bh=awrDvQYBjjWfbzh/Y8gVedmuKHXvcsyZAzVid9V7I8k=;
b=tWDn/3qm9+c1XvbDpFSsRjSbaFRQgarHBWab216hbZH4g+56/CUqYdSldkRJqfObh9
AtXFMSQIlCCAicmJ8T6YhDC0vDV5eembVAubiGKc3P6L1MclJZtvSSPawt++Tq+NP6kf
QULGJEK/GSi03hQjGCoE19Hfv9MVAaKJ+e+gCOBtJHUfb/Wc/qPWWh5OBjqEBEas7UM5
sy54hSloYlBY47N/VYSHFiQ5lQKeZnLwPSwQh3NX6zWXQckDGZK5RE0YOWY8H+b8+/d5
B6lBkZAQ8VD4CJvVr7704VKg3kijmsoBDRV5uVXtoaNBhd3m+bnjvymid5pnXdqfXQCz
RcbA==
X-Gm-Message-State: AOAM533TkkisjcGEp5Iu0Dd1QpZkAaLT5Pt3uRrQBVm4BnqHbi74QBal
5kdHBZoPwBk35KiXLjLln/YrmG9rTGE=
X-Google-Smtp-Source: ABdhPJy7j/YazMjRlbbp/QXwLullus1HBskCu4/BNXNQJ0C6+F0W6I7yavY6P7OKcD/308RGnCJjzw==
X-Received: by 2002:a05:6000:1541:: with SMTP id
1mr29687198wry.347.1635937412703;
Wed, 03 Nov 2021 04:03:32 -0700 (PDT)
Received: from pfiuh02 ([193.48.40.241])
by smtp.gmail.com with ESMTPSA id n66sm1647101wmn.2.2021.11.03.04.03.32
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 03 Nov 2021 04:03:32 -0700 (PDT)
From: zimoun <zimon.toutoune@HIDDEN>
References: <tencent_44B54DBA54BC2CDBBF121D82F2AC1283DA07@HIDDEN>
Date: Wed, 03 Nov 2021 11:18:44 +0100
In-Reply-To: <tencent_44B54DBA54BC2CDBBF121D82F2AC1283DA07@HIDDEN>
(873216071@HIDDEN's message of "Wed, 14 Apr 2021 00:28:57 +0800")
Message-ID: <87y265sfsr.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi,
Thanks for the patch.
On Wed, 14 Apr 2021 at 00:28, Z572 <873216071@HIDDEN> wrote:
>>From 52bd30a6ac967375aa9a178345f1bdea8388457a Mon Sep 17 00:00:00 2001
> From: Zheng Junjie <873216071@HIDDEN>
> 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(-)
[...]
> #: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))))))))
Could you provide an example for an use-case?
Cheers,
simon
X-Loop: help-debbugs@HIDDEN
Subject: [bug#47754] [PATCH] gnu: transformations: fix with-latest option for git source package.
Resent-From: Z572 <873216071@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 03 Nov 2021 15:35:01 +0000
Resent-Message-ID: <handler.47754.B47754.163595365317714 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 47754
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: zimoun <zimon.toutoune@HIDDEN>
Cc: 47754 <at> debbugs.gnu.org
Received: via spool by 47754-submit <at> debbugs.gnu.org id=B47754.163595365317714
(code B ref 47754); Wed, 03 Nov 2021 15:35:01 +0000
Received: (at 47754) by debbugs.gnu.org; 3 Nov 2021 15:34:13 +0000
Received: from localhost ([127.0.0.1]:40958 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1miIHE-0004bd-MB
for submit <at> debbugs.gnu.org; Wed, 03 Nov 2021 11:34:13 -0400
Received: from out203-205-221-233.mail.qq.com ([203.205.221.233]:53099)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <873216071@HIDDEN>) id 1miIH5-0004aq-U0
for 47754 <at> debbugs.gnu.org; Wed, 03 Nov 2021 11:34:11 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512;
t=1635953631; bh=boAeYADCeSXqjX4bCqdPXdPIYKm+3LJ9oqaBjjyHR2E=;
h=References:From:To:Cc:Subject:Date:In-reply-to;
b=XFMuir2gqscshZChTs4RQDbdSvBDUJpwg0Daf3Yt98vFKkMDxAJm9aVYpcMzJuPxz
aQA7QMNSr9fufusX+iDlc5RrDeznehcizAEdEYkRZ5W7oqSAor2yTZt1uD1lA6qwJa
6c6hd4nhCpOCHZUD2Hz1HGCY6t3qr+X2LBr4O5VQ=
Received: from asus ([2409:8928:1202:1ee0:a576:a4f0:ac3d:afe2])
by newxmesmtplogicsvrszc9.qq.com (NewEsmtp) with SMTP
id 87033A9E; Wed, 03 Nov 2021 23:33:48 +0800
X-QQ-mid: xmsmtpt1635953628t2soa96wb
Message-ID: <tencent_3C87B11CAA04B856667334552A6BE88F4405@HIDDEN>
X-QQ-XMAILINFO: M/JROGx4T0PuL52Dc4gWPGlxFWu5UTlPtbGFgfIsJoZjpgU7w4DFG5CU+yVBz1
DloW9N2SimpAc9giWTOhMR30G78DIa8gT0wJjxeTr94k4P+w6nIEWYWBCcMDoTv7z/XnHVjk7wTI
io8bJz2XD0mCS0De3PF6E2z0LY4s4liZsUBfmq71dP544jcEPd/xC3HT2QmZRpGh3NifgXUNPx20
8KOJSOPrHJ7UdazZlHnSRznDQhN6ZSg1gfyJKV/u83fBh32opDLclO7glQmxg/hPOIuH0l6BAQMr
aYdswR95vnBHSUghgC3QWe2gcV+dyNOXMaIDABRk+ZYjLL4B6t5jjoTBjYm6NB6AZ7RmpxRMztBN
mjBCVfqocdThdPA7Z1Ab1H2ockpllMTqIMcdiqjARD+bASV38nM8DuQY5xIWrfR8ElEZq2sp3Dat
aoCz/xD8ZLpDiTKVT3By0nfifidXGjbYEurNsSmLeb53eKZ/9KSU+dqFG9GxhWQXcSmALCRZwPed
3nWQ1qlHAAx8s9dKieAc9MhHGM7VgyT7MQZBwwLMJsDqGSwFPmp/fmEFzL17wr4q9oMxi7wnlTTw
Ib4ANv/n2Np14LQAJPyljezI7yZqBE6YQ4golcj8sN5gTdENk3kKZMYZUM7dfEU3UwvOAePodeb/
CoBZgIjDCnon7NBbJdEQANy+Q6xmF6zYhgwcunDu9LktuB3SFNL7wTQpeAa9yzWIh8rncUmJdpXo
RSXIVcp90D/vE2nwf/htlnKNAf6oqTgxqX0T2yoYO/WjWZsr2AHWWxv87rVL4hmL+lJ5bxJ1/DL/
fswqjQgE7NwhXJFmhlh9jt
References: <tencent_44B54DBA54BC2CDBBF121D82F2AC1283DA07@HIDDEN>
<87y265sfsr.fsf@HIDDEN>
User-agent: mu4e 1.6.9; emacs 28.0.50
From: Z572 <873216071@HIDDEN>
Date: Wed, 03 Nov 2021 22:54:40 +0800
In-reply-to: <87y265sfsr.fsf@HIDDEN>
Message-ID: <87wnlp45k3.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 3.9 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: Hi, zimoun writes: > Hi, > > Thanks for the patch. > > On
Wed, 14 Apr 2021 at 00:28,
Z572 wrote: > >>>From 52bd30a6ac967375aa9a178345f1bdea8388457a
Mon Sep 17 00:00:00 2001 >> From: Zheng Junjie >> Date: Tue, 13 Apr [...]
Content analysis details: (3.9 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
no trust [203.205.221.233 listed in list.dnswl.org]
-0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2)
[203.205.221.233 listed in wl.mailspike.net]
-0.0 SPF_PASS SPF: sender matches SPF record
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (873216071[at]qq.com)
0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends
in digit (873216071[at]qq.com)
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
0.4 RDNS_DYNAMIC Delivered to internal network by host with
dynamic-looking rDNS
3.2 HELO_DYNAMIC_IPADDR Relay HELO'd using suspicious hostname (IP
addr 1)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.9 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: Hi, zimoun writes: > Hi, > > Thanks for the patch. > > On
Wed, 14 Apr 2021 at 00:28, Z572 wrote: > >>>From 52bd30a6ac967375aa9a178345f1bdea8388457a
Mon Sep 17 00:00:00 2001 >> From: Zheng Junjie >> Date: Tue, 13 Apr [...]
Content analysis details: (2.9 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
-0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2)
[203.205.221.233 listed in wl.mailspike.net]
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
no trust
[203.205.221.233 listed in list.dnswl.org]
-0.0 SPF_PASS SPF: sender matches SPF record
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (873216071[at]qq.com)
0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends
in digit (873216071[at]qq.com)
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
0.4 RDNS_DYNAMIC Delivered to internal network by host with
dynamic-looking rDNS
3.2 HELO_DYNAMIC_IPADDR Relay HELO'd using suspicious hostname (IP
addr 1)
-1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list
manager
Hi,
zimoun <zimon.toutoune@HIDDEN> writes:
> Hi,
>
> Thanks for the patch.
>
> On Wed, 14 Apr 2021 at 00:28, Z572 <873216071@HIDDEN> wrote:
>
>>>From 52bd30a6ac967375aa9a178345f1bdea8388457a Mon Sep 17 00:00:00 2001
>> From: Zheng Junjie <873216071@HIDDEN>
>> 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(-)
>
> [...]
>
>> #: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))))))))
>
> Could you provide an example for an use-case?
Just try this:
``` bash
$ file `guix build fbreader --with-latest=fbreader -S`
/gnu/store/rdqkmjpiig9gddzsxj4mdyw8lvn944xg-FBReader: HTML document, UTF-8 Unicode text, with very long lines
```
If a package is a git source package, after use "with-latest" option, it's url
will become to it's source. and build will fail.
This patch just fix this.
But i think this patch not good, maybe need a new patch(use latest version
not latest commit). But i'm not familiar with this part.
>
> Cheers,
> simon
--
over
X-Loop: help-debbugs@HIDDEN
Subject: [bug#47754] [PATCH] gnu: transformations: fix with-latest option for git source package.
Resent-From: zimoun <zimon.toutoune@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 03 Nov 2021 16:20:02 +0000
Resent-Message-ID: <handler.47754.B47754.163595634322706 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 47754
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Z572 <873216071@HIDDEN>
Cc: 47754 <at> debbugs.gnu.org
Received: via spool by 47754-submit <at> debbugs.gnu.org id=B47754.163595634322706
(code B ref 47754); Wed, 03 Nov 2021 16:20:02 +0000
Received: (at 47754) by debbugs.gnu.org; 3 Nov 2021 16:19:03 +0000
Received: from localhost ([127.0.0.1]:40977 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1miIyc-0005uA-RQ
for submit <at> debbugs.gnu.org; Wed, 03 Nov 2021 12:19:03 -0400
Received: from mail-qk1-f173.google.com ([209.85.222.173]:40539)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zimon.toutoune@HIDDEN>) id 1miIyX-0005tV-BM
for 47754 <at> debbugs.gnu.org; Wed, 03 Nov 2021 12:19:01 -0400
Received: by mail-qk1-f173.google.com with SMTP id ay20so2812238qkb.7
for <47754 <at> debbugs.gnu.org>; Wed, 03 Nov 2021 09:18:57 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
h=mime-version:references:in-reply-to:from:date:message-id:subject:to
:cc; bh=u9wQCXREZ4q5bcG2UlrBFoSRMQmJeOgpLrp84sxg5SY=;
b=ghG4bdlNEG6TgCu4f0klAdUmTwh249I2eyvZCMkPK5tOsa5uY6pPuiLeQgsDXm9RPg
EZY0r2QYe8km94WxsJooKK4FvSdkAhd3YTiCU/U6XvRqWGNI3jIxCxfG6JJearQEnf6J
SNYyKLO6jqQ74KlJavkEnOhCXeAGNqFS/qqDq+0vglpf2pBpCj+5e3oLexH9/yWi0Qvq
XuTI31ughwue0JBzmrI5eqNVHRxMS26PpOWxL5cPMUZlKcKAhj4EYG8siRqR/s6HJXyZ
oD1ykLbICBXr5b8cjkeQPtn/E8QxKy8i9WrIH+YxNsu1LaHh96vX0CXuY1rhbEb9tYGD
0Gcw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=x-gm-message-state:mime-version:references:in-reply-to:from:date
:message-id:subject:to:cc;
bh=u9wQCXREZ4q5bcG2UlrBFoSRMQmJeOgpLrp84sxg5SY=;
b=vnBc8k8+Sd/JxmPRUgy8Z70sWx9ILrjiAYBOkGwnFJgu0qhoUVpQ+N3rDYPup6o8JZ
6aKvoR/P3CVSFQ2K8T7A355X468fuSpBRFNluAsq8LQHEnispsbWTqELAYoY1wu1qv/g
uIUB340h6+sPoxJXge/yP6G3PzT4LqhLbbHtq8Mmt83Tw5xDdg8bJSQPw0NtKU6bcOvO
7c6jtArIgll70sPxJdXC2PL4sxE6r9hpSFAh7WufrmePkXoiFbvGFAcDBo+1dawDklHu
CYLZYZZnK7TrFQDw3fjjjP1SEIPxmk258ru2PUrpCutOenrE4ju3nCXE0S07pwa4Kigo
tbMg==
X-Gm-Message-State: AOAM532LRW+GhXDSCXcoglLmc5nI9NAfm231j9rLCkOcOclcjdsr0dod
LyVW2xjzy8AhXxguN5km64jffjbWNTcwa6f3H4A=
X-Google-Smtp-Source: ABdhPJyZDn+/O2NftG8sEKy+uO/2zd2Fw6zqq1GiGNynDvGrkOF7m9/06nWp5xFoC8/PYOn8NflqppUvIV3KcdnVKF4=
X-Received: by 2002:a05:620a:843:: with SMTP id
u3mr12892013qku.463.1635956331772;
Wed, 03 Nov 2021 09:18:51 -0700 (PDT)
MIME-Version: 1.0
References: <tencent_44B54DBA54BC2CDBBF121D82F2AC1283DA07@HIDDEN>
<87y265sfsr.fsf@HIDDEN>
<tencent_3C87B11CAA04B856667334552A6BE88F4405@HIDDEN>
In-Reply-To: <tencent_3C87B11CAA04B856667334552A6BE88F4405@HIDDEN>
From: zimoun <zimon.toutoune@HIDDEN>
Date: Wed, 3 Nov 2021 17:18:40 +0100
Message-ID: <CAJ3okZ3EcDmmPJ2nHjtv+dH_rGQT-cWVeGZ66AmZQyDaE+hxfA@HIDDEN>
Content-Type: text/plain; charset="UTF-8"
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi,
On Wed, 3 Nov 2021 at 16:34, Z572 <873216071@HIDDEN> wrote:
> $ file `guix build fbreader --with-latest=fbreader -S`
> /gnu/store/rdqkmjpiig9gddzsxj4mdyw8lvn944xg-FBReader: HTML document, UTF-8 Unicode text, with very long lines
> If a package is a git source package, after use "with-latest" option, it's url
> will become to it's source. and build will fail.
>
> This patch just fix this.
I see. However, I am not convinced your example is correct, because
for instance,
--8<---------------cut here---------------start------------->8---
$ file $(guix build r-soupx -S)
/gnu/store/1z0j6i4a9xwwd8d3955m7vq3f1x4p3aq-r-soupx-0.3.1-1.a3354be-checkout:
directory
--8<---------------cut here---------------end--------------->8---
What you are seeing is: Git upstream source is modified by Guix (for
instance, patches are applied or files are removed; in the field
'origin') and "guix build -S" returns what Guix actually builds, not
what upstream provides. Therefore, in this case, the modified source
is returned as compressed archive. However, when using the
transformation 'with-latest', in this case, "guix build -S
--with-latest" returns what upstream provides, thus a directory (or
something else as a file).
Maybe I miss something, but from me, the inconsistency comes from the
behavior of "guix build -S", not about the behaviour of 'with-latest'
transformation. And I also miss why the build would fail.
Cheers,
simon
X-Loop: help-debbugs@HIDDEN
Subject: [bug#47754] [PATCH] gnu: transformations: fix with-latest option for git source package.
Resent-From: Z572 <873216071@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Thu, 04 Nov 2021 11:58:01 +0000
Resent-Message-ID: <handler.47754.B47754.163602705324037 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 47754
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: zimoun <zimon.toutoune@HIDDEN>
Cc: 47754 <at> debbugs.gnu.org
Received: via spool by 47754-submit <at> debbugs.gnu.org id=B47754.163602705324037
(code B ref 47754); Thu, 04 Nov 2021 11:58:01 +0000
Received: (at 47754) by debbugs.gnu.org; 4 Nov 2021 11:57:33 +0000
Received: from localhost ([127.0.0.1]:42180 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mibN7-0006Fd-1b
for submit <at> debbugs.gnu.org; Thu, 04 Nov 2021 07:57:33 -0400
Received: from out203-205-251-72.mail.qq.com ([203.205.251.72]:57813)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <873216071@HIDDEN>) id 1mibN0-0006FH-Cm
for 47754 <at> debbugs.gnu.org; Thu, 04 Nov 2021 07:57:31 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512;
t=1636027038; bh=HCwXUcrZLfxnWHFULJgDEe0d6CrDv4+Zp6a6C0RHFdA=;
h=References:From:To:Cc:Subject:Date:In-reply-to;
b=iyeYvGbxsIwRKCYU/R2bZm3TMFvHTt4YK/K/INLnCO0Ld3bhsEhqedToXrQzP8B3F
Wq1mka9Q2De/ZfkVSwN1U7rzsm2TpSnePP1SgdD9qmFxD+fDTk6Pdo9Wd3sTowvlX7
jwdt1I3m3zZ8DvAPsHbjVNruoel9kbagjpWlGXLQ=
Received: from asus ([2409:8928:1202:153f:198d:cdf:6e3a:f9d1])
by newxmesmtplogicsvrszc6.qq.com (NewEsmtp) with SMTP
id DF7A6632; Thu, 04 Nov 2021 19:55:55 +0800
X-QQ-mid: xmsmtpt1636026955twr10c8qn
Message-ID: <tencent_5BF03A4AE5EB25D5B5999B7AA98559627F08@HIDDEN>
X-QQ-XMAILINFO: OE2SNMSfMbmO4VnJlJf/UZPqrkQ6rwnyPQg/cgTkRTSPK5fatS291oEnBmiRSY
btJpP3XYI1vueLJcl3e21ruAiLYq74TgRyvUmzBsoyUA9gaRshoUT16p3N7awaxo+e3B+FQSD6+r
on+vxssIFUqsZhDvCFuBPJBRnYRm9bc56lU55+kiVirW5BDZM4vr0rJy7+ZKWgPGb/+eLccFLIfL
201/4MyhgROQa1Khg7oU23QiGz6kRH/BM9NxHo63IHWPFlZ6hYkkOVX6VjIubQr1jqvwPGgxXY91
CSleztKNzPnn8o/DAIzh5Du6/eRHyBObMMSQQf8ztc8dbi68nUfj8GVSodHJQ2G2eKeXTKKrYmak
EIT+Lv0ksGbEZxj/bIuDtJvPQ3qFDBo3z9hYCk3BwXjTWg5a4xrfQDJiMzUQdmQeyZSaXOInjX0M
H5DBvyZ6BkVZI/jQjTcDiu9lHS67HQHvYuyz3l5by5nR+yP4HpiSvwAZubykG7HgzBOdRFR/ltrV
WTXA7Iy2s/bGeUofDrjVmQbgugMkHx/6ASglAIRUwjLL8SOHt45VaW2TrEcxyVchOM3Mi56Inx/K
pN2ZSpJ14A7/f3epvTc2ShzaKIEc9ck3rHfFd6a79hMbGuZv3tyTr6u1x48DzxKqvQMNvew4aQiZ
OECAHaTaBhke+3wD60j8rMN0D8gjaYOyro3jVr25ilLOOg6It4xaVXsIWOxyyWU6qeTMmp5v0jky
/g5SlwPGfWv2SdwQ9IwZA0ccvqb+ABaG3ApLlVD3JDWK8Vu0Sew1++Wv0qwLyQkYKywErqWHAs/K
dvIttAGXQvknVcyujeYu6r
References: <tencent_44B54DBA54BC2CDBBF121D82F2AC1283DA07@HIDDEN>
<87y265sfsr.fsf@HIDDEN>
<tencent_3C87B11CAA04B856667334552A6BE88F4405@HIDDEN>
<CAJ3okZ3EcDmmPJ2nHjtv+dH_rGQT-cWVeGZ66AmZQyDaE+hxfA@HIDDEN>
User-agent: mu4e 1.6.9; emacs 28.0.50
From: Z572 <873216071@HIDDEN>
Date: Thu, 04 Nov 2021 19:17:38 +0800
In-reply-to: <CAJ3okZ3EcDmmPJ2nHjtv+dH_rGQT-cWVeGZ66AmZQyDaE+hxfA@HIDDEN>
Message-ID: <87v918ceyc.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 3.8 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: zimoun writes: > Hi, > > On Wed, 3 Nov 2021 at 16:34, Z572
wrote: > >> $ file `guix build fbreader --with-latest=fbreader -S` >>
/gnu/store/rdqkmjpiig9gddzsxj4mdyw8lvn944xg-FBReader:
HTML document, >> UTF-8 Unicod [...]
Content analysis details: (3.8 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
no trust [203.205.251.72 listed in list.dnswl.org]
-0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3)
[203.205.251.72 listed in wl.mailspike.net]
-0.0 SPF_PASS SPF: sender matches SPF record
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (873216071[at]qq.com)
0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends
in digit (873216071[at]qq.com)
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
0.4 RDNS_DYNAMIC Delivered to internal network by host with
dynamic-looking rDNS
-0.0 RCVD_IN_MSPIKE_WL Mailspike good senders
3.2 HELO_DYNAMIC_IPADDR Relay HELO'd using suspicious hostname (IP
addr 1)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.8 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: zimoun writes: > Hi, > > On Wed, 3 Nov 2021 at 16:34, Z572
wrote: > >> $ file `guix build fbreader --with-latest=fbreader -S` >> /gnu/store/rdqkmjpiig9gddzsxj4mdyw8lvn944xg-FBReader:
HTML document, >> UTF-8 Unicod [...]
Content analysis details: (2.8 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
-0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3)
[203.205.251.72 listed in wl.mailspike.net]
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
no trust
[203.205.251.72 listed in list.dnswl.org]
-0.0 SPF_PASS SPF: sender matches SPF record
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (873216071[at]qq.com)
0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends
in digit (873216071[at]qq.com)
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
0.4 RDNS_DYNAMIC Delivered to internal network by host with
dynamic-looking rDNS
-0.0 RCVD_IN_MSPIKE_WL Mailspike good senders
3.2 HELO_DYNAMIC_IPADDR Relay HELO'd using suspicious hostname (IP
addr 1)
-1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list
manager
zimoun <zimon.toutoune@HIDDEN> writes:
> Hi,
>
> On Wed, 3 Nov 2021 at 16:34, Z572 <873216071@HIDDEN> wrote:
>
>> $ file `guix build fbreader --with-latest=fbreader -S`
>> /gnu/store/rdqkmjpiig9gddzsxj4mdyw8lvn944xg-FBReader: HTML document,
>> UTF-8 Unicode text, with very long lines
>
>> If a package is a git source package, after use "with-latest"
>> option, it's url
>> will become to it's source. and build will fail.
>>
>> This patch just fix this.
>
> I see. However, I am not convinced your example is correct, because
> for instance,
>
> $ file $(guix build r-soupx -S)
> /gnu/store/1z0j6i4a9xwwd8d3955m7vq3f1x4p3aq-r-soupx-0.3.1-1.a3354be-checkout:
> directory
>
> What you are seeing is: Git upstream source is modified by Guix (for
> instance, patches are applied or files are removed; in the field
> 'origin') and "guix build -S" returns what Guix actually builds, not
> what upstream provides. Therefore, in this case, the modified source
> is returned as compressed archive. However, when using the
> transformation 'with-latest', in this case, "guix build -S
> --with-latest" returns what upstream provides, thus a directory (or
> something else as a file).
I looked source again, just because of "upstream-source-compiler" don't support
git source package, all will become to use url-fetch.
See (guix upstream) module:
``` scheme
(define-gexp-compiler (upstream-source-compiler (source <upstream-source>)
system target)
"Download SOURCE from its first URL and lower it as a fixed-output
derivation that would fetch it."
(mlet* %store-monad ((url -> (first (upstream-source-urls source)))
(signature
-> (and=> (upstream-source-signature-urls source)
first))
(tarball ((store-lift download-tarball) url signature)))
(unless tarball
(raise (formatted-message (G_ "failed to fetch source from '~a'")
url)))
;; Instead of returning TARBALL, return a fixed-output derivation that
;; would be able to re-download it. In practice, since TARBALL is already
;; in the store, no extra download will happen, but having the derivation
;; in store improves provenance tracking.
(let ((hash (call-with-input-file tarball port-sha256)))
(url-fetch url 'sha256 hash (store-path-package-name tarball)
#:system system))))
```
I'm have no idea how to change it, so i just check if package is
git-source, use "git-checkout" instead of "upstream-source".
>
> Maybe I miss something, but from me, the inconsistency comes from the
> behavior of "guix build -S", not about the behaviour of 'with-latest'
> transformation. And I also miss why the build would fail.
>
>
> Cheers,
> simon
--
over
X-Loop: help-debbugs@HIDDEN
Subject: [bug#47754] [PATCH] gnu: transformations: fix with-latest option for git source package.
Resent-From: zimoun <zimon.toutoune@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Sat, 06 Nov 2021 19:07:02 +0000
Resent-Message-ID: <handler.47754.B47754.163622561014404 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 47754
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Z572 <873216071@HIDDEN>
Cc: 47754 <at> debbugs.gnu.org
Received: via spool by 47754-submit <at> debbugs.gnu.org id=B47754.163622561014404
(code B ref 47754); Sat, 06 Nov 2021 19:07:02 +0000
Received: (at 47754) by debbugs.gnu.org; 6 Nov 2021 19:06:50 +0000
Received: from localhost ([127.0.0.1]:50693 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1mjR1e-0003kG-2E
for submit <at> debbugs.gnu.org; Sat, 06 Nov 2021 15:06:50 -0400
Received: from mail-wm1-f53.google.com ([209.85.128.53]:37614)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <zimon.toutoune@HIDDEN>) id 1mjR1c-0003jy-BZ
for 47754 <at> debbugs.gnu.org; Sat, 06 Nov 2021 15:06:49 -0400
Received: by mail-wm1-f53.google.com with SMTP id
y84-20020a1c7d57000000b00330cb84834fso12013470wmc.2
for <47754 <at> debbugs.gnu.org>; Sat, 06 Nov 2021 12:06:48 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
h=from:to:cc:subject:in-reply-to:references:date:message-id
:mime-version; bh=o44N8jhjiCLIahEvQ5ESYjaO0rttJGnBPyr4ZzvyBgw=;
b=C3xfAroySoaGDcUHMglPy1ac3lPzlGHyZi7XYM9xaYBSrp0mlZceUez+knH/40t7pv
le8g0modAJcSymm6UGDnzv4x970dM9AJJPSJhRtDVZ0Z5WmLlQSusHFkDn/5RDhERzDX
BN+g2f0l0ziiAfa6XIkHxJbpN4JSGmsb1Tbxb701vuRMQf1u0oiS5qlTySQ9cQ+Qrk2W
a/eBSgVYmHjKlVTANAdcIGToJsj4A4PYt92twFZZD10y7ebCxH73pBAza3WWegixisen
t7P+3hcVkrbKdpDdfAaEk/jmE7xUKCoqHBg9b9y9HTk+Ay335LqvaPxo2nZpxYSiFwea
4OyQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date
:message-id:mime-version;
bh=o44N8jhjiCLIahEvQ5ESYjaO0rttJGnBPyr4ZzvyBgw=;
b=wPGMBkun0byT8d6Nlupe0ybHZrwx5hKYodruC6erno4BxbExX0tSM4rMeQRcJFJIJJ
jHNig1j/V2SVT89sQhfkjBtR138mhakLmUkNPY51ILsh+3hcV4Ot1yDrNIIRdjq8k3m1
yQ9gSsui4ErdT7wOR/He1YRUfu2L/20gwEnVORf/hM4UelGHoeMr1WcWR0y3yiyEGtHz
uaVmwp8y3XhBgbDiJ2tmGsxrAaziux4SvRJrsjZbmJBNL5SYJguuC8JVgYK94icnyomn
T+RIE9K8vB0vkF6kZEJ4GtAFuvVcyB6tXzheENNLsl3cYX85E3txccNzoIpZ5bLSexd8
0SPg==
X-Gm-Message-State: AOAM533uqV5s4pVQEZwKaKf3Ssx8vvcd5Qc9k9rikfHGBZ7W7bLtnmq/
s3Q55EauFacGutl4whQp+Q/AMF5p0zFl/A==
X-Google-Smtp-Source: ABdhPJyOuiPVCZ5JkJVQxGpYZ3BehpCFupkHZOmAPYkDhtl/q56w+XBKtfBT0w12w1QN8/l/+WYlMg==
X-Received: by 2002:a05:600c:4f0f:: with SMTP id
l15mr21937472wmq.25.1636225602304;
Sat, 06 Nov 2021 12:06:42 -0700 (PDT)
Received: from lili (pop.92-184-112-12.mobile.abo.orange.fr. [92.184.112.12])
by smtp.gmail.com with ESMTPSA id
k21sm10948053wmj.45.2021.11.06.12.06.41
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 06 Nov 2021 12:06:41 -0700 (PDT)
From: zimoun <zimon.toutoune@HIDDEN>
In-Reply-To: <tencent_5BF03A4AE5EB25D5B5999B7AA98559627F08@HIDDEN>
References: <tencent_44B54DBA54BC2CDBBF121D82F2AC1283DA07@HIDDEN>
<87y265sfsr.fsf@HIDDEN>
<tencent_3C87B11CAA04B856667334552A6BE88F4405@HIDDEN>
<CAJ3okZ3EcDmmPJ2nHjtv+dH_rGQT-cWVeGZ66AmZQyDaE+hxfA@HIDDEN>
<tencent_5BF03A4AE5EB25D5B5999B7AA98559627F08@HIDDEN>
Date: Sat, 06 Nov 2021 19:17:05 +0100
Message-ID: <867ddldu8u.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hi,
On Thu, 04 Nov 2021 at 19:17, Z572 <873216071@HIDDEN> wrote:
>>> If a package is a git source package, after use "with-latest"
>>> option, it's url
>>> will become to it's source. and build will fail.
>>>
>>> This patch just fix this.
>>
>> I see. However, I am not convinced your example is correct, because
>> for instance,
>>
>> $ file $(guix build r-soupx -S)
>> /gnu/store/1z0j6i4a9xwwd8d3955m7vq3f1x4p3aq-r-soupx-0.3.1-1.a3354be-checkout:
>> directory
>>
>> What you are seeing is: Git upstream source is modified by Guix (for
>> instance, patches are applied or files are removed; in the field
>> 'origin') and "guix build -S" returns what Guix actually builds, not
>> what upstream provides. Therefore, in this case, the modified source
>> is returned as compressed archive. However, when using the
>> transformation 'with-latest', in this case, "guix build -S
>> --with-latest" returns what upstream provides, thus a directory (or
>> something else as a file).
>
> I looked source again, just because of "upstream-source-compiler" don't support
> git source package, all will become to use url-fetch.
[...]
> I'm have no idea how to change it, so i just check if package is
> git-source, use "git-checkout" instead of "upstream-source".
>> Maybe I miss something, but from me, the inconsistency comes from the
>> behavior of "guix build -S", not about the behaviour of 'with-latest'
>> transformation. And I also miss why the build would fail.
I am sorry if I misread you. What are you trying to solve?
Cheers,
simon
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.