From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id sI0XGcHbMWR6sAAASxT56A (envelope-from ) for ; Sat, 08 Apr 2023 23:25:21 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id INz/F8HbMWRyOwAAG6o9tA (envelope-from ) for ; Sat, 08 Apr 2023 23:25:21 +0200 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 10F469C03 for ; Sat, 8 Apr 2023 23:25:20 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1plG3V-0004S8-Qg; Sat, 08 Apr 2023 17:25:05 -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 1plG3T-0004QP-DL for guix-patches@gnu.org; Sat, 08 Apr 2023 17:25:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1plG3T-0004hq-3r for guix-patches@gnu.org; Sat, 08 Apr 2023 17:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1plG3S-0005U2-GN for guix-patches@gnu.org; Sat, 08 Apr 2023 17:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62712] [PATCH 0/2] Disable keyword expansion for Subversion downloads Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 Apr 2023 21:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62712 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Timothy Sample Cc: 62712@debbugs.gnu.org, Christopher Baines Received: via spool by 62712-submit@debbugs.gnu.org id=B62712.168098904220983 (code B ref 62712); Sat, 08 Apr 2023 21:25:02 +0000 Received: (at 62712) by debbugs.gnu.org; 8 Apr 2023 21:24:02 +0000 Received: from localhost ([127.0.0.1]:59736 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plG2T-0005SH-Od for submit@debbugs.gnu.org; Sat, 08 Apr 2023 17:24:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54970) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plG2R-0005S3-H3 for 62712@debbugs.gnu.org; Sat, 08 Apr 2023 17:24:00 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1plG2L-0004Uu-C0; Sat, 08 Apr 2023 17:23:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=sLz5W3yVxOJ+9jdiTNmKIedLoOst2dGZyZVG+xAvquI=; b=hLIkrNRwZ6O3qgCBEtVj 2jiaYfaK8B2hSPxZSssoFrLmBUVPpNdJ0Az1Gy8hf52OBBC0tEVqrxm5QaMinvzpd4bBTN3/yYPtU 76gTeJS1U9APXyXy/JQm7vKnWPZJYjR4JLO6qStQkdJoqWOIlK31B4tdZ+sv68K/mht+EI22sL6bO aon2aoFsTl+75gT5iGCEuY7ozlczsvCYs+4iFqP+qCagfayA2HKG3nNqdgB8vzT3ZGIzIvDxSWO6A innmy6/JZFPrKAUOQwRTrGueRdi0h9vaFhuSA/2ejJMul9wArwMR0yZWpj/SkCIvPgWgIPRZjPhGv Xip2aT7HmeTL3g==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1plG2L-0003bN-0n; Sat, 08 Apr 2023 17:23:53 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20230407140551.8776-1-ludo@gnu.org> <20230407140724.8815-1-ludo@gnu.org> <87jzyny6oi.fsf_-_@ngyro.com> Date: Sat, 08 Apr 2023 23:23:50 +0200 In-Reply-To: <87jzyny6oi.fsf_-_@ngyro.com> (Timothy Sample's message of "Fri, 07 Apr 2023 10:54:05 -0600") Message-ID: <871qkuax09.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1680989121; a=rsa-sha256; cv=none; b=gKRccSPqNjIC8aYTZo2sce1Fz1O0E35Nqvztg6GD+MSkgZ6oUkLDzBR+n0hfTWXfl83Y/p G0rWHlz6s0Uf58XU01HPM/u/r7cF2dUhKqb+n6sL0E7/ji8kMeb2gx08/JczkU//zKklRl eg0PETzVGqcqS5RtY9E1v8dJjx3c7sHKeX8bcQ1HNALbmBWESANkPJ8ZHVyoY8HzWq45Il nIVbR7XAOaJD2tbbyXMP/mJ9wvyjFaMbY5zkhWSwnAo4mU3gGj3CDvNpL+7NmIMYO54WGe BuutwZc6EeTe6fcK+1QPirTw8I0o4QwzjWk5o69RmNww4zi64sU0aRFdVXMoQQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=hLIkrNRw; dmarc=pass (policy=none) header.from=gnu.org; 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=1680989121; 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=sLz5W3yVxOJ+9jdiTNmKIedLoOst2dGZyZVG+xAvquI=; b=OOv6ooAQhujQ1Et5SGHUMHwJP5IXKNw0AMKitYFiNRcqEZgmDcfCPNRy+i/uYydiOxrKIX zrfezeXq1OcaG9kM1yS58gU/0OSgNTKrF7wkwQM3jY3T2RJ+k0oL2SW8SAROlV3VWfkp3k jz+Tg7H0PeczaAlu/VxlbT0Ncav9EG7v1qMhZBCwVRuV/cI7S+YjOj1YmjlkDu3NZ1G4Ir 1ZENMQ/rnlWZBtRlksefNtxx3Eau+88ydlz08+JTzD4SEKVVBqd/zdU2PNI/xXX4iHKaqq tjjLOcpLhMpvAc+o5Armeulqxl+H3QUWS2XZyIQEQKHSXDx+XXTK3e3ITjUbig== X-Migadu-Spam-Score: -2.62 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=hLIkrNRw; dmarc=pass (policy=none) header.from=gnu.org; 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-Spam-Score: -2.62 X-Migadu-Queue-Id: 10F469C03 X-TUID: kFc5p769A1ns Hi Timothy! Timothy Sample skribis: > Whoops! I guess I was a little slow getting my patch in. No problem! I had it on my to-do list. > I=E2=80=99ve highlighted a few sources you missed below, as well as attac= hed > my patch (for comparison and for listing the new hashes of the missing > sources). Oh, good that you were able to find some more! > I generated a big diff for all 17 sources that I found (mostly because > it excites me that Guix can do stuff like that). Basically all the > changes were boring (as we expected). Excellent. > For =E2=80=9Ctexlive-scripts=E2=80=9D, I added a phase that approximates = keyword > expansion for the few scripts that use it to output version information. > It=E2=80=98s not exactly the same as what Subversion does. Subversion us= es the > last revision that updated the given file, and I just use > =E2=80=98%texlive-revision=E2=80=99 for every file. I=E2=80=99m not too = attached to this > approach, but it felt like the right thing to do. I wouldn=E2=80=99t mind doing nothing, but what you did sounds good. >> The second patch makes =E2=80=98recursive?=E2=80=99 default to #f, which= AFAICS is >> what all the SVN-using packages that were not explicit expected (no >> changes required). > > I also carefully checked turning recursion off by default. I=E2=80=99m > confident that nothing changes. Excellent. I=E2=80=99ll push it to =E2=80=98master=E2=80=99. >>>From 19c14a09e9e1d92a1035d15dbbb8d12fb3b59d17 Mon Sep 17 00:00:00 2001 > From: Timothy Sample > Date: Wed, 5 Apr 2023 13:46:28 -0600 > Subject: [PATCH] svn-download: Do not expand keywords. > MIME-Version: 1.0 > Content-Type: text/plain; charset=3DUTF-8 > Content-Transfer-Encoding: 8bit > > See . For posterity, you can add something along the lines of what I had: Subversion keyword expansion is potentially non-reproducible as some of them expand time strings relative to the local time zone: https://issues.guix.gnu.org/43442#18 In practice this is not a problem in Guix since Subversion checkouts happen in an isolated environment using the "default timezone" (UTC). However, Software Heritage disables keyword expansion for this very reason. By following suit, we make sure content can be retrieved from there. > + ;; Disable keyword substitution (keywords are CVS-like strings > + ;; like "$Date$", "$Id$", and so on). > + "--ignore-keywords" Likewise: + ;; Disable keyword substitutions (keywords are CVS-like strings + ;; like "$Date$", "$Id$", and so on) for two reasons: (1) some + ;; expansions depend on the local time zone, and (2) SWH disabl= es + ;; it in its archive for this very reason. + "--ignore-keywords" Chris, should we get it built on qa.guix? It=E2=80=99s on the order of 7K rebuilds per architecture since =E2=80=98texlive-bin=E2=80=99 is modified. Alternatively we can set up ci.guix for it, if you think it=E2=80=99s more appropriate resource-wise. WDYT? Ludo=E2=80=99. PS: I=E2=80=99ll be AFK for the next few days.