From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id SAy5H6CiGWEvKwEAgWs5BA (envelope-from ) for ; Mon, 16 Aug 2021 01:26:24 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id +aRDG6CiGWH8cwAAbx9fmQ (envelope-from ) for ; Sun, 15 Aug 2021 23:26:24 +0000 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 1191FBB75 for ; Mon, 16 Aug 2021 01:26:24 +0200 (CEST) Received: from localhost ([::1]:57836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mFPWJ-0000BX-2p for larch@yhetil.org; Sun, 15 Aug 2021 19:26:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37846) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mFPVz-0008Io-2O for guix-patches@gnu.org; Sun, 15 Aug 2021 19:26:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36404) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mFPVy-0004ye-SO for guix-patches@gnu.org; Sun, 15 Aug 2021 19:26:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mFPVy-0001qm-PS for guix-patches@gnu.org; Sun, 15 Aug 2021 19:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50072] [PATCH WIP 3/4] refresh: Support non-tarball sources. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Aug 2021 23:26: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 Received: via spool by 50072-submit@debbugs.gnu.org id=B50072.16290699407064 (code B ref 50072); Sun, 15 Aug 2021 23:26:02 +0000 Received: (at 50072) by debbugs.gnu.org; 15 Aug 2021 23:25:40 +0000 Received: from localhost ([127.0.0.1]:47946 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFPVc-0001pr-Cs for submit@debbugs.gnu.org; Sun, 15 Aug 2021 19:25:40 -0400 Received: from out0.migadu.com ([94.23.1.103]:31065) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mFPVZ-0001pT-8L for 50072@debbugs.gnu.org; Sun, 15 Aug 2021 19:25:38 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1629069935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=i3sWwu6rP2yY7l+g2SazGbRfisouEZXzlss71KFp3gU=; b=M3pDhzn0gAYR/P6gLql49wXSbrh7B4Fk918vASVXGKs2Qg993jglgq4fruM4TMYuxAtn+J C2HQEqjSE9LSzO7TG9b8QyReAAaMuRjDGuoi5MvEf8cLYZkaQl1WL9zRO6N5gH4L61urKE apvb4MriGBP1r/4KOvf5WedHDyylgJ8= From: Sarah Morgensen Date: Sun, 15 Aug 2021 16:25:26 -0700 Message-Id: <54668cb99babc81db0edfcdf2a8fa870bde96863.1629068119.git.iskarian@mgsn.dev> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Migadu-Auth-User: iskarian@mgsn.dev 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1629069984; 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: 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=i3sWwu6rP2yY7l+g2SazGbRfisouEZXzlss71KFp3gU=; b=Jz62xrNdPN+YDwWmyCOPanjhWLygSgNroNtIQ27fzn7m0cFEnBPxkz8QlVzRM0jcjKMZXK fxkQ7NJafAmeZKw4+TNRax3MXCdTrA5GrWM6hL0Yua2EAZBrIpSW4/XSGzpTeOjQDbsuh2 HVfaloz6UFedTRjpNEfBUJSEqINtqK70afuFxHsXJhW3BEZYtQV/3sbkkYlwMFPZApZEuk bQxtyoqRv1IWZaJrUOwrBCyaS+nae164YdRiNv//R6fD8blk974uQSGj7XOz80r7aWGkM/ aUst6+wOhBbKOSOiCS1Zqtl+bp2NyPJjwZfRzBpQrxFxFbVPT3olAP2kdbUPdQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1629069984; a=rsa-sha256; cv=none; b=dP/i49atjcvSmQHf91aOtpnwv2ksjodpQwD9cFGZJNCYP8YXzMEC+WVW/eJsSl9xxXt+DT w7zPkpVW/a0a/xQOuIrODbJViQEfeRzE1nxpMv012q1J540oeC8AWP95oHsOqqzGuFCfRv OAEFvvlhzrIBwxJVN6QbiV2sd+NaU6aZ+2cn2MoT9vv02e5EFb41fk67AKLkKTehm0R21E NuDLhGzbIK/MD/EtwnQAO2/q36kK8hI6RNIgJxT2aNCRZ4meGZuXIIvz+nZDEKSqSm7QVv KbMXvUnz+dTIM40PY0+R4oVRtCGTNbm42fymwtbDAU5QW8L5Txd7Nk31Vzu0fQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=M3pDhzn0; dmarc=fail reason="SPF not aligned (relaxed)" header.from=mgsn.dev (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.31 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=M3pDhzn0; dmarc=fail reason="SPF not aligned (relaxed)" header.from=mgsn.dev (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 1191FBB75 X-Spam-Score: -0.31 X-Migadu-Scanner: scn0.migadu.com X-TUID: uYWLkfFST41o * 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 fb6c52a567..abb0c24e96 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...~%") @@ -347,8 +348,7 @@ warn about packages that have no matching updater." (package-name package) (upstream-input-change-name change))) (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.31.1