From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id MFwSFq9zaGYYQgEAqHPOHw:P1 (envelope-from ) for ; Tue, 11 Jun 2024 15:56:31 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id MFwSFq9zaGYYQgEAqHPOHw (envelope-from ) for ; Tue, 11 Jun 2024 17:56:31 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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-Seal: i=1; s=key1; d=yhetil.org; t=1718121391; a=rsa-sha256; cv=none; b=lbZnTPzW7KBZykqQpnuSc7KeUlJ965M3cbrOeD0WsgEwm1tUJeTNCzuIAmiiuUjd5xqzOQ NmJPFhsp6IR0yfR+FMpZQz5TgQkwkmnwLVbFPQRAmEl0HCANzvJF3s9FRleZldmxQQC0NP 0smjL3ba7mYPITxEBnDyRi+jnrPVcSvC8eh8+M8wQe71OMXABUY3v9R8RY/0eH6X23JFVY rNmOx4IXIHJwEa4ony2xz720Et5zfFS4dO6fcLo4+NI+/FBUfuK32RzBJgE/MuoHFgt/Qf mQqrUzSLJvZWZ4L2PbZF8BAlDdnvt17TN0bjfsi8V38wsLfz3aVPlJFSArfqhQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=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=1718121391; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-to: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; bh=DwvDD2K/nIzjMpZtHbA/DmvzGh24EZHetER4alk3pB8=; b=nFCoJ26JagNiZiojxN6opf6yIZk6aNcinvdH9iIr9qcaMPStrZK+AQQD4WrOUNxYiHWSfX UOt87brwNIwynulsHGxaViKoNxR9clv2Nz/b1Bb/3dnz3T3Klsr4NNKlbu1P0Gl0v8ikUP 4mdC+YtE6FrYpIIn1JLLWBwHW5zF/zGQS9XOhOPvqMQlzSLsCzSrzRAcQSPfmNA8SnpFlc zutfwHWuWadIiFgYkqJu3Hb2PwK+zeuAW6fetUk5yOX6O/aXFZZ6rHXclHOtKUpFaHeOvt 5dW2AbvL+oajCe66or8F3v/gzB6GDSt5QC6HkyvHlZFu1wMyPn+Dqe2q4pNIkw== 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 36A7C37717 for ; Tue, 11 Jun 2024 17:56:30 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sH3qx-0007zE-PG; Tue, 11 Jun 2024 11:56:07 -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 1sH3qu-0007xn-Gm for guix-patches@gnu.org; Tue, 11 Jun 2024 11:56:04 -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 1sH3qu-0003DV-8b for guix-patches@gnu.org; Tue, 11 Jun 2024 11:56:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sH3qs-0000pP-He for guix-patches@gnu.org; Tue, 11 Jun 2024 11:56:02 -0400 Subject: bug#70878: [PATCH 0/4] Reduce download builder duplication. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Tue, 11 Jun 2024 15:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 70878 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70878-done@debbugs.gnu.org Mail-Followup-To: 70878@debbugs.gnu.org, mail@cbaines.net, mail@cbaines.net Received: via spool by 70878-done@debbugs.gnu.org id=D70878.17181213453155 (code D ref 70878); Tue, 11 Jun 2024 15:56:02 +0000 Received: (at 70878-done) by debbugs.gnu.org; 11 Jun 2024 15:55:45 +0000 Received: from localhost ([127.0.0.1]:35845 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sH3qb-0000op-85 for submit@debbugs.gnu.org; Tue, 11 Jun 2024 11:55:45 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43804) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sH3qZ-0000og-1b for 70878-done@debbugs.gnu.org; Tue, 11 Jun 2024 11:55:43 -0400 Received: from localhost (unknown [212.132.255.10]) by mira.cbaines.net (Postfix) with ESMTPSA id 99C7327BBEA for <70878-done@debbugs.gnu.org>; Tue, 11 Jun 2024 12:05:51 +0100 (BST) Received: from felis (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id d079bb3a for <70878-done@debbugs.gnu.org>; Tue, 11 Jun 2024 11:05:51 +0000 (UTC) From: Christopher Baines In-Reply-To: <87h6f48g83.fsf@cbaines.net> (Christopher Baines's message of "Sat, 11 May 2024 17:29:16 +0100") References: <87h6f48g83.fsf@cbaines.net> User-Agent: mu4e 1.12.4; emacs 29.3 Date: Tue, 11 Jun 2024 12:05:50 +0100 Message-ID: <871q53buy9.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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 X-Migadu-Queue-Id: 36A7C37717 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -8.44 X-Spam-Score: -8.44 X-TUID: x1ZrZa07e9P1 --=-=-= Content-Type: text/plain Christopher Baines writes: > I think we currently have an issue where the builder scripts for several > download approaches are very numerous, svn-multi-download is probably > the extreme example as that's used for the numerous texlive packages. > > I noticed this when wondering why bayfront is spending so much time > substituting svn-multi-download files from data.guix.gnu.org, and it's > probably taking up extra space in the data.guix.gnu.org database too. > > These commits should address the issue in svn-multi-fetch, svn-fetch, > hg-fetch and git-fetch (although this issue doesn't affect users of > builtin:git-download). The main change is to pass the hash through to > the builder as an environment variable, rather than generating a > different builder script for each different hash. > > I've also restructured the code to try and avoid this problem in the > future. While there was a comment about the intent to not duplicate the > builder scripts, it's too easy to miss. By moving the builder to it's > own procedure and moving the comment to the call site, it'll be clearer > when a new source of variation is added. > > > Christopher Baines (4): > svn-download: Reduce svn-multi-fetch builder duplication. > svn-download: Reduce svn-fetch builder duplication. > hg-download: Reduce builder duplication. > git-download: Reduce builder duplication. > > guix/git-download.scm | 123 +++++++++++--------- > guix/hg-download.scm | 127 +++++++++++--------- > guix/svn-download.scm | 264 +++++++++++++++++++++++------------------- > 3 files changed, 291 insertions(+), 223 deletions(-) I've tweaked the commit messages a little and pushed these patches to master as 0daa72e34d7fafc927e2d476ef613c582107781d. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmZoL49fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XddqBAAhbDXkQ3sbAd0hkdyuFp0Sjmuy6BBlnif Tkx4N0SLHxgj6s+I/NlxPDuFT7DjhCRm6X7nFrjgS6Kmhw7sd+qNFCStP9jVTNd/ Fs9yfXn9SchdJG4J4j9UEjyw2io+xtZdKIAukSS1s4kbJeR4j3zIUaZfKUCL1Y49 gXH+Bm/6dxvg5xVJtwmDi9bj3CJiTx8U2YBr6Lu+kcXSECjdbDwyLJzjtE5oBdKN 0VbGQ900dv/ZYGDskbb9/BpkGkFFyolA8JpAHf70ZszDezTugGJQYGAGtRPw0qp7 BvTHkFQ/Mka4WdYraTMR+RyMMC0LIU7GannZZlcOuZBQ07ka083INJ0H7C6G8ppN 7f6y9iwWSMnmr61z3lPO6EcSUW/NZAStBXDCdq+TjpNki38aU3U/kOutmeeQnvpU RyQ7S62Ga6jkRE5jpk0QENLOQTb2HxFEO42lZAnMzqqWKFYrLKWKqIoDHhurohQ6 zZbsOujLHAGl+VDl1umJ2C77RTc5fKpQMZvQAfFAwXV8gzjMUevICI0z/ZRVlH7/ dVPj4TU5s5NzxK7+cePvk1DEDOnCe2SdoqdCoNfbMgGgNbiOTPC/foBlP3X8KPSX dLtq51Ry8lijsal8BbQnh5m1EBu9tc2BaWqcTAIqj2juumv/7mF1ozutw9xotvWD pPUHLk9HEdk= =ju2B -----END PGP SIGNATURE----- --=-=-=--