From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id mP+SOfAKXmQr+AAASxT56A (envelope-from ) for ; Fri, 12 May 2023 11:46:25 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id EO5oOfAKXmRHIgAAauVa8A (envelope-from ) for ; Fri, 12 May 2023 11:46:24 +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 827BCFAB7 for ; Fri, 12 May 2023 11:46:24 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxPLq-0002ap-4y; Fri, 12 May 2023 05:46:14 -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 1pxPLe-0002aH-Bb for guix-patches@gnu.org; Fri, 12 May 2023 05:46:02 -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 1pxPLe-0002L0-3R for guix-patches@gnu.org; Fri, 12 May 2023 05:46:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pxPLd-00045W-OQ for guix-patches@gnu.org; Fri, 12 May 2023 05:46:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63462] [PATCH maintenance] hydra: build-package-metadata: Update fields in sources.json. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 May 2023 09:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63462 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63462@debbugs.gnu.org Cc: Simon Tournier X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168388472115660 (code B ref -1); Fri, 12 May 2023 09:46:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 May 2023 09:45:21 +0000 Received: from localhost ([127.0.0.1]:54089 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxPKz-00044U-52 for submit@debbugs.gnu.org; Fri, 12 May 2023 05:45:21 -0400 Received: from lists.gnu.org ([209.51.188.17]:52518) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxPKw-00044K-Rg for submit@debbugs.gnu.org; Fri, 12 May 2023 05:45:19 -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 1pxPKw-0002Wl-Ad for guix-patches@gnu.org; Fri, 12 May 2023 05:45:18 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pxPKr-00025x-FT for guix-patches@gnu.org; Fri, 12 May 2023 05:45:18 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3079b59230eso777695f8f.1 for ; Fri, 12 May 2023 02:45:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683884712; x=1686476712; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=j0g0V8R5xnvYgiYW4AEIEA0EzzEzYdplAIpl+Rip5Bk=; b=TvpWERo5QQK8bUCBsW/ryrf75b9k6G9t3OOLSaOmKD/NyXeTBTEWuUXLDaE78QIJFi eDWf2f1CDp6uQ2/D8X3asYOykU0DTCEVX7mIF3QFZg7PWeeFS11MbXs0sBzu4lkTh506 32dwH/rORPAf2TxOcbKXmIWAvx01YLApmRejPYH3+M7G9FLdBS9PeX/CUixl2bWuQh3v asePWpP6zLgLJwhFJSZJFYVBQn7xMwIZ/fyEXhvSp0ZWOokZUqhZnRv3cQfSF0LSqiIl dPQjHGcZIS5b1bni6kq/5+my1dZxvAYjmBMi9QSZ+Fdm2DjkIlJ18aP93Xa+xvY7dL8v dkMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683884712; x=1686476712; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=j0g0V8R5xnvYgiYW4AEIEA0EzzEzYdplAIpl+Rip5Bk=; b=G+lJa7MNrqkgsVD57KjrIPtQ0YeHP+eVOxfTeT6YAtwUo4sAQzxd18vYb70peXqnVd TvrNKailwIwfnS3Td3J0FLATObLttCTgtThmoqpdmXRoq7rhYuf1wbnAHM2mwWOvBqFU HDAnSTyAe05ltowUdfcNZB4lBjxxTzEWKloftxMK+hyS7ROWvjya3Rw3zcEkKMBskOsM xGbr8LjOLfjicEwLEtd+VrRChs1El6AhnnjS57OnErmjb8X5U+VfF1o8Bdv3Q1wWyNNO 9lTzc61XmI7tT45yxLYrPEr3CEF4N78v2CfCAi8zFjRz8ZKhC97Z95eozuVkDSQ/oBf8 MaxA== X-Gm-Message-State: AC+VfDwg9YD4InwWTPo9dNqoZ+lPsjjxlfiK5v88jbunSOeqcA3CPNla lhEP9y7/aHcKfbpz5YfoeG9XBWTpK8Y= X-Google-Smtp-Source: ACHHUZ6pA/DJRB6spZE4OXZicMsAGLUTEIvFZTLTMWtEWe/z0j9oNPMxyyrKFyRV77fBOtyevuQ+PA== X-Received: by 2002:a5d:67c6:0:b0:2f9:12ae:4a29 with SMTP id n6-20020a5d67c6000000b002f912ae4a29mr15425286wrw.5.1683884711912; Fri, 12 May 2023 02:45:11 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id s2-20020a5d4ec2000000b003063a92bbf5sm23050711wrv.70.2023.05.12.02.45.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 May 2023 02:45:11 -0700 (PDT) From: Simon Tournier Date: Fri, 12 May 2023 11:45:04 +0200 Message-Id: <20230512094504.2675076-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=zimon.toutoune@gmail.com; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1683884784; a=rsa-sha256; cv=none; b=jVzEmkkxeTCnyufg/WOBvvU8+jW2JJcFxLPvQ3YgwFAlxOeOkng+PgfDegJozUeiQJd0J/ V0x/NjGb0oAis62vpGYZPYa23gN79XvosRDKgAVhF0TjNl1lc3q2SXoimJi+/OdnHbFr+W hnbtNPyORzskohEPbhBfEvI7cRCe1ZTzU5ThpZg0wZB23VZAj+dEX1Cw9YXqPnVpE+4J3e cyfXnyZ/3bgomP6/JIVXCSkEKbk/seMYzwP/AOiH3wZjbqe9oud3uN/KMc2Xc+uDPD3BQ9 sAxk+G434dN5ZMFMeL1i6q+gCTvbwYBujX38CjUlmgzJ1zIfZGRs5esoO4wo/g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=TvpWERo5; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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=1683884784; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=j0g0V8R5xnvYgiYW4AEIEA0EzzEzYdplAIpl+Rip5Bk=; b=qkbpoY9ol7L0khKEELEblKGkts1LVGpin+lQuGHwfNZ3uu6qSaa9vNke4cNWgdVrQPpJ0j 7VTqtmKMXq9kSN4xhM3HVUklUYsIU6K+q4L/MrgBLz42fBICRnaeOd/u6Pcckv/zv1coPN FsbMesCzTSd8kDoLlzIF0wEzkiFai3qXsatJnDpSWBupBaNlbCwTvZXk1HtBYNDbrJVcuk sjSepFYRj9DaSp9MdgyASeqJzHHKd7Rt2600uqjvNP5NZHPzaz+9DhSPV1DT9LZlQemhHj Tf6KbeKfrMLrjT1hkkCiN0VDTaBQtA3nLbTbw+fGKUIrWAnnDLGSLm2NiYkECQ== X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=TvpWERo5; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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" X-Migadu-Spam-Score: 5.62 X-Spam-Score: 5.62 X-Migadu-Queue-Id: 827BCFAB7 X-TUID: Z34IRfyNgzYD This format had been discussed in . * hydra/build-package-metadata.scm (origin->json)[resolve]: Add the fields 'outputHashAlgo' and 'outputHashMode'. --- hydra/build-package-metadata.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/hydra/build-package-metadata.scm b/hydra/build-package-metadata.scm index 1ddb409..d110d4d 100755 --- a/hydra/build-package-metadata.scm +++ b/hydra/build-package-metadata.scm @@ -1,7 +1,7 @@ #!/usr/bin/env -S guix repl -- !# ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2020, 2021 Simon Tournier +;;; Copyright © 2020, 2021, 2023 Simon Tournier ;;; Copyright © 2023 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. @@ -160,13 +160,23 @@ superseded packages." (else '())) ,@(if (or (eq? url-fetch method) (eq? url-fetch/tarbomb method) - (eq? url-fetch/zipbomb method)) + (eq? url-fetch/zipbomb method) + (eq? git-fetch method) + (eq? svn-fetch method) + (eq? svn-multi-fetch method) + (eq? hg-fetch method)) (let* ((content-hash (origin-hash origin)) (hash-value (content-hash-value content-hash)) (hash-algorithm (content-hash-algorithm content-hash)) (algorithm-string (symbol->string hash-algorithm))) `(("integrity" . ,(string-append algorithm-string "-" - (base64-encode hash-value))))) + (base64-encode hash-value))) + ("outputHashAlgo" . ,algorithm-string) + ("outputHashMode" . ,(if (or (eq? url-fetch method) + (eq? url-fetch/tarbomb method) + (eq? url-fetch/zipbomb method)) + "flat" + "recursive")))) '()) ,@(if (eq? method git-fetch) `(("git_ref" . ,(git-reference-commit uri))) base-commit: 5a6b8cd7286d1c8906beaa35ebba6eff5bae3a79 -- 2.38.1