From patchwork Wed Jan 5 14:07:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 35984 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 966DA27BBEA; Wed, 5 Jan 2022 15:14:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5459627BBE9 for ; Wed, 5 Jan 2022 15:14:10 +0000 (GMT) Received: from localhost ([::1]:47346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n57zN-0004Vc-4t for patchwork@mira.cbaines.net; Wed, 05 Jan 2022 10:14:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54482) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n56xT-0007JH-LE for guix-patches@gnu.org; Wed, 05 Jan 2022 09:08:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:56472) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n56xO-0006bf-Rs for guix-patches@gnu.org; Wed, 05 Jan 2022 09:08:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n56xO-0004Wg-ON for guix-patches@gnu.org; Wed, 05 Jan 2022 09:08:02 -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 14:08: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: Sarah Morgensen Received: via spool by 50072-submit@debbugs.gnu.org id=B50072.164139167917364 (code B ref 50072); Wed, 05 Jan 2022 14:08:02 +0000 Received: (at 50072) by debbugs.gnu.org; 5 Jan 2022 14:07:59 +0000 Received: from localhost ([127.0.0.1]:39779 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n56xL-0004Vt-GA for submit@debbugs.gnu.org; Wed, 05 Jan 2022 09:07:59 -0500 Received: from michel.telenet-ops.be ([195.130.137.88]:59590) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n56xF-0004VS-JH for 50072@debbugs.gnu.org; Wed, 05 Jan 2022 09:07:54 -0500 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by michel.telenet-ops.be with bizsmtp id f27s2600F4UW6Th0627sNF; Wed, 05 Jan 2022 15:07:53 +0100 From: Maxime Devos Date: Wed, 5 Jan 2022 14:07:49 +0000 Message-Id: <20220105140750.18214-3-maximedevos@telenet.be> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220105140750.18214-1-maximedevos@telenet.be> References: <20220105140750.18214-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1641391673; bh=1C9ahprOwcy10Tnk5guGYz+QxZ/hL2vALCXNKEI79wE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=mrNU9OuZ6bLKjlioVstON2ONFyvngww/oILFAg9qjXdqMpcgq6NseQ0QToYaV/uKj bcAuVl0RtC279jvU/+8aHKWObepkx1hm4r6BN5gKCtDna8SVeixIfeaMk0TMd1tXHf 5ba7ISKRdityFjNsRzT4rKVOCCAPOaq6kRM96CXJ5P/L4yWbsCfirxeer2HPlUMkXR J/et30vHGZJVkdylY1wvxAP1v8B7kMgoVypad69TpwpRNZ31S4nKBuKoDUzG6cR+ci h4a/wFqjKHNKthQNGQy/FQ4OFpj7gJY9hc69FhtlwGzk4CoD0b6VnNflljhLxXQ2Uf 0DN55QE0SI/Bg== 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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~%")