From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id MKekBlq80GFJdQEAgWs5BA (envelope-from ) for ; Sat, 01 Jan 2022 21:40:58 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id iH7rA1q80GEklwAA9RJhRA (envelope-from ) for ; Sat, 01 Jan 2022 21:40:58 +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 BCDD737FBA for ; Sat, 1 Jan 2022 21:40:57 +0100 (CET) Received: from localhost ([::1]:58032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n3lBQ-0008GQ-VI for larch@yhetil.org; Sat, 01 Jan 2022 15:40:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45614) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n3lAZ-0007ZG-D6 for guix-patches@gnu.org; Sat, 01 Jan 2022 15:40:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47923) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n3lAY-0003sT-Ms for guix-patches@gnu.org; Sat, 01 Jan 2022 15:40:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n3lAY-0003CD-H6 for guix-patches@gnu.org; Sat, 01 Jan 2022 15:40:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#50072] [PATCH v2 3/4] refresh: Support non-tarball sources. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 01 Jan 2022 20:40:02 +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: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Sarah Morgensen Received: via spool by 50072-submit@debbugs.gnu.org id=B50072.164106959112230 (code B ref 50072); Sat, 01 Jan 2022 20:40:02 +0000 Received: (at 50072) by debbugs.gnu.org; 1 Jan 2022 20:39:51 +0000 Received: from localhost ([127.0.0.1]:59461 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n3lAN-0003B6-8r for submit@debbugs.gnu.org; Sat, 01 Jan 2022 15:39:51 -0500 Received: from michel.telenet-ops.be ([195.130.137.88]:42650) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n3lAL-0003Ah-3H for 50072@debbugs.gnu.org; Sat, 01 Jan 2022 15:39:50 -0500 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by michel.telenet-ops.be with bizsmtp id dYfm2600C4UW6Th06YfnkH; Sat, 01 Jan 2022 21:39:47 +0100 From: Maxime Devos Date: Sat, 1 Jan 2022 20:39:39 +0000 Message-Id: <20220101203940.149517-4-maximedevos@telenet.be> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220101203940.149517-1-maximedevos@telenet.be> References: <20220101203940.149517-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=r21; t=1641069587; bh=1C9ahprOwcy10Tnk5guGYz+QxZ/hL2vALCXNKEI79wE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FKdn9ZFqw8pxmg2m/zKR+EIuxbCcapC+z2jJGo7GS/aTMMf1G/nWxGYcUPHz6K8/f yWZXIVLz4WROwwJpl+elwbhGhoMtRZfSbq9MKlHSwFby5X6HONr0Y9Jx/XBATG+Xdd nj4udm/sEKRJ0jjzlgBUD52n3Yb3PgVTzu3Vp3Ftigm1wxJvQ2wDGxWGIR+5A5XABK 1wyHejDLoK7UK1qhgY8J24xvGOaQf3Cy2FwSsuEHDpVZFPk2bO7Pr2RNJPdzRuv6JG ViwRDGGv/oAYLibPst0C5fZiNoBX/V6Lx7dB/O1YZ7mDxHxyLQrRb0DIAwBTOMBwRM 5Op3xp2u+Oxyw== 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=1641069657; 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=MaJu16e3Xo4bV5/cNGTSJILcTK11wDZ83l9rAGAcWrFCmPd8DQdhJ2jmS6yWtPOwavq3uM SWET42CLnL2jSs/tUtS1RongzH1r/3bWMRlbBMSZFxyufTKGZddEddgIneqw0e6Bt/Wabn cpsNiKtjP2H3VcyxmUzlEm++/rlhIc8cKBXjLAAtVhU+UnM/g0cl52s1XepxYXC/kjtZ2W T1XKrax8GugWAvSqHrdexL51Fyc2/Rw8jhDxjH3p/lG6NvJ5qovKosI1SQMbw2M9EM1dYW SBI49341X+3wfz7pgqzAHj8KVTn66s3LLVT6VWJ6AfPE9IFVpJ6ERXA5A7RC2w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1641069657; a=rsa-sha256; cv=none; b=iwWOjdPonoUDQp741syuaTVTphfwdOh3CIV2QVMaR7+XjSAaDvjXou17j/tkIuhpTIlqnG D86EmqrER/6EVsto4h8yl4d7u6vO1yGDlyddfiZOCE7KrlDLLHicMFPW/6bBZK4z0EHYa4 k9vi4qYU5tMg5MF31x4RgAKPRiBCoO5SP5JGkoEvHUKsIFZTeRaM/ru2bprYECumu+76Z6 lK+vfim9SvS7zmRr36JgDgQYarjpHKHtXhZ2GZ0CbFCNNTDjX+l1b7YnFipruOdb3CgSmZ iQrOpeWlrK6MlKnK9l09w7vaGw3Zb1ugX3CW/K3baOojEW0wyHtPb/xkiUKV5Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=FKdn9ZFq; 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.08 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=FKdn9ZFq; 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: BCDD737FBA X-Spam-Score: -1.08 X-Migadu-Scanner: scn1.migadu.com X-TUID: BWMlq9koedeB 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