From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id ONlWBgrA1WHjhwAAgWs5BA (envelope-from ) for ; Wed, 05 Jan 2022 16:58:02 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id wFCCAwrA1WGpNQAA9RJhRA (envelope-from ) for ; Wed, 05 Jan 2022 16:58:02 +0100 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 CE82127847 for ; Wed, 5 Jan 2022 16:58:01 +0100 (CET) Received: from localhost ([::1]:42966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n58fp-0000J6-1v for larch@yhetil.org; Wed, 05 Jan 2022 10:58:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58968) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n58eu-0008BA-Qa for guix-patches@gnu.org; Wed, 05 Jan 2022 10:57:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58242) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n58eu-0008Hr-HT for guix-patches@gnu.org; Wed, 05 Jan 2022 10:57:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n58eu-0007vN-H4 for guix-patches@gnu.org; Wed, 05 Jan 2022 10:57:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#50072] [PATCH v5 3/4] refresh: Support non-tarball sources. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Jan 2022 15:57:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50072 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50072@debbugs.gnu.org Cc: Sarah Morgensen Received: via spool by 50072-submit@debbugs.gnu.org id=B50072.164139820630369 (code B ref 50072); Wed, 05 Jan 2022 15:57:04 +0000 Received: (at 50072) by debbugs.gnu.org; 5 Jan 2022 15:56:46 +0000 Received: from localhost ([127.0.0.1]:41544 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n58eb-0007te-Sk for submit@debbugs.gnu.org; Wed, 05 Jan 2022 10:56:46 -0500 Received: from andre.telenet-ops.be ([195.130.132.53]:43604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n58eW-0007t0-KV for 50072@debbugs.gnu.org; Wed, 05 Jan 2022 10:56:41 -0500 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by andre.telenet-ops.be with bizsmtp id f3we2600K4UW6Th013wg8T; Wed, 05 Jan 2022 16:56:40 +0100 From: Maxime Devos Date: Wed, 5 Jan 2022 15:56:36 +0000 Message-Id: <20220105155637.20153-3-maximedevos@telenet.be> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220105155637.20153-1-maximedevos@telenet.be> References: <20220105155637.20153-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1641398200; bh=1C9ahprOwcy10Tnk5guGYz+QxZ/hL2vALCXNKEI79wE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dJbgsbl6fgWS6IXlR2TjuVFPkOz/NYMJmYyxj8i2/hsm9oJOGETdJ8oD20h73u0BZ gTUdBwQvz6pliy7CdYS+YCjm0m08qdVkJ3DWGoc1i1DtnLWz1r0L2+FN/G0rGwPo0E 4nvddQY7HGytjowS3R7j4LpOCYfMog1e4OsuABWGa5gItnMKm8Cty+USs/0F+2mByS pgXjTbOyhCyRbzg0/G9WdiCczEH1HEqw29vOfxYvmZK5uo5icFFgH9D671lgeIJYte IRlugjXeWYd1NHRpnCWOFY1GwCJH4PTrCd/xIE5mohFg22thRgYkSfJpPSMsSUxkZk GbS2G87ptdEmQ== 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" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1641398281; 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=1C9ahprOwcy10Tnk5guGYz+QxZ/hL2vALCXNKEI79wE=; b=Y/730hk/mDKLxRBD0r8Wb4ucCqaD6zCbDydDJuQnebD9PMK744Dao3NbZfNOijUMl2DHLQ j6qtObIi/RKT7/H2oCMoU3WdpToMZHjqYahOCKWZuyDM+AjDQHB2sYeZd3LuLjeRrzP2// vZPw1/7cpjvLdb8o0M6DU3WOd0kPMVl+hsai0lrqSyFMa/UW8pKZfQ9ZCiZqD7sWTdY786 NuJ3AiRz1ghK1dSHGWlx/cR6piGTCO/AfmkvfKgMEheQurS143hpeEEF7uGTq+ha1l/X6x D1W8cO0M84iQ4rfgAemwgjQpFyJUUXmBIwPhe3AVnWwyYOGmU+1v15jUXAqw0A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1641398281; a=rsa-sha256; cv=none; b=O9I4/PqyFQURkEno99/fRnKg9+L5US+PX4Y8fquWt2y3gz5q5OzqIp6reqzffTW8T8egL4 wS6mROTwXYmzvyHLWZXwrA2Usz4ZnHIVQBcnKN6nXa6fXJFynpADTTEXvEIR38e3JhxYaG 9zUqVkKJJ8js/iWNwgPfo3Pj/svFT1e1Rim5iPk0RLcWFoeJJlyIi8R8CL7ztwW/+gWooj sNqqxy4aX6U0+cOvXVEP7kIuhKufluUDpmU/eqx218c6rX3+Uv/K651Fyf0ClDnD1al+vn Hj5vaC0Vh9+GLbPipvM9sUSGMeXyYgXYRdLx1Iaa05kgq4lusdOwpgEXeUGCrw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r22 header.b=dJbgsbl6; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (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: -1.10 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r22 header.b=dJbgsbl6; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (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-Queue-Id: CE82127847 X-Spam-Score: -1.10 X-Migadu-Scanner: scn1.migadu.com X-TUID: UvpPRVglBfKA From: Sarah Morgensen * guix/scripts/refresh.scm (update-package): Use 'file-hash*' instead of 'port-sha256'. Rename TARBALL to OUTPUT. --- guix/scripts/refresh.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm index 8806f0f740..68bb9040d8 100644 --- a/guix/scripts/refresh.scm +++ b/guix/scripts/refresh.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2019 Ricardo Wurmus ;;; Copyright © 2020 Simon Tournier +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,7 +27,6 @@ (define-module (guix scripts refresh) #:use-module (guix ui) - #:use-module (gcrypt hash) #:use-module (guix scripts) #:use-module ((guix scripts build) #:select (%standard-build-options)) #:use-module (guix store) @@ -38,6 +38,7 @@ #:use-module (guix scripts graph) #:use-module (guix monads) #:use-module (guix gnupg) + #:use-module (guix hash) #:use-module (gnu packages) #:use-module ((gnu packages commencement) #:select (%final-inputs)) #:use-module (ice-9 match) @@ -314,14 +315,14 @@ KEY-DOWNLOAD specifies a download policy for missing OpenPGP keys; allowed values: 'interactive' (default), 'always', and 'never'. When WARN? is true, warn about packages that have no matching updater." (if (lookup-updater package updaters) - (let-values (((version tarball source) + (let-values (((version output source) (package-update store package updaters #:key-download key-download)) ((loc) (or (package-field-location package 'version) (package-location package)))) (when version - (if (and=> tarball file-exists?) + (if (and=> output file-exists?) (begin (info loc (G_ "~a: updating from version ~a to version ~a...~%") @@ -363,8 +364,7 @@ warn about packages that have no matching updater." (info loc (G_ "~a: consider removing this propagated input: ~a~%") name change-name)))) (upstream-source-input-changes source)) - (let ((hash (call-with-input-file tarball - port-sha256))) + (let ((hash (file-hash* output))) (update-package-source package source hash))) (warning (G_ "~a: version ~a could not be \ downloaded and authenticated; not updating~%") -- 2.30.2