From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id cDgOHHsA02EVYgAAgWs5BA (envelope-from ) for ; Mon, 03 Jan 2022 14:56:11 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id aO9cGXsA02FRlwAA9RJhRA (envelope-from ) for ; Mon, 03 Jan 2022 14:56:11 +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 22320393A4 for ; Mon, 3 Jan 2022 14:56:11 +0100 (CET) Received: from localhost ([::1]:38700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4Noo-0003u9-6Y for larch@yhetil.org; Mon, 03 Jan 2022 08:56:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4Nog-0003t0-12 for guix-patches@gnu.org; Mon, 03 Jan 2022 08:56:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51129) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4Nof-0007Eg-Na for guix-patches@gnu.org; Mon, 03 Jan 2022 08:56:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n4Nof-00045G-N9 for guix-patches@gnu.org; Mon, 03 Jan 2022 08:56:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#50072] [PATCH v2 3/4] refresh: Support non-tarball sources. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 Jan 2022 13:56:01 +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: Maxime Devos Cc: Sarah Morgensen , 50072@debbugs.gnu.org Received: via spool by 50072-submit@debbugs.gnu.org id=B50072.164121813115657 (code B ref 50072); Mon, 03 Jan 2022 13:56:01 +0000 Received: (at 50072) by debbugs.gnu.org; 3 Jan 2022 13:55:31 +0000 Received: from localhost ([127.0.0.1]:34442 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n4NoA-00044S-Oe for submit@debbugs.gnu.org; Mon, 03 Jan 2022 08:55:30 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:58240) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n4No7-00044C-Ce for 50072@debbugs.gnu.org; Mon, 03 Jan 2022 08:55:28 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id EB62316B; Mon, 3 Jan 2022 14:55:20 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id klDrmj7b73O7; Mon, 3 Jan 2022 14:55:20 +0100 (CET) Received: from ribbon (91-160-117-201.subs.proxad.net [91.160.117.201]) by hera.aquilenet.fr (Postfix) with ESMTPSA id AB568120; Mon, 3 Jan 2022 14:55:19 +0100 (CET) From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20220101203940.149517-1-maximedevos@telenet.be> <20220101203940.149517-4-maximedevos@telenet.be> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 14 =?UTF-8?Q?Niv=C3=B4se?= an 230 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 03 Jan 2022 14:55:19 +0100 In-Reply-To: <20220101203940.149517-4-maximedevos@telenet.be> (Maxime Devos's message of "Sat, 1 Jan 2022 20:39:39 +0000") Message-ID: <87o84sly9k.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: / X-Rspamd-Server: hera X-Rspamd-Queue-Id: EB62316B X-Spamd-Result: default: False [-0.10 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[] 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=1641218171; 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; bh=XgzaUKROWFL40nhwBDl5vOIq8KqDrD5kNs6Et88bMnA=; b=K3Wx1WnpQBPTr3YLu6xBlSKqS8oc2FnEsKhvFdDW2v41zA0+KOJcSUfNYK8Ke3GbZLCYQ4 SqLtqWgFF98BZd0hqzt7EbOkiSXdWSDvk/sGlRQR9HDzLQZqHP1Xyacp3pCK0+MVPwN7nu 51j5FCjRqH+frL66pV3G0mm1HGz2XB2RVx/iktL8hLzM6B6NjziJIMjj1G4bfwq0ZAgb3H I6lrFgBGgbcTcR3/SUiOKILzDu36Yn2wEDeS7H3W9Gr8DJ6pH0UNHNuKRdvSO0FqKZ3VhT ZQ7Ul4lfuADOEyB1HfINDVxLoqVmuoQn8trrKB/BpmAXRAwvm/mwljKk/yAqOQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1641218171; a=rsa-sha256; cv=none; b=gaOy35vIJqFNaz6tKptvkq5dpnXSZcASRVEXy2rKKa037Wpeio4qWx78ytDaltrRDhuvUG FZXtCqk4vJko+bdiqz6fmxrAlIFpwdo+JE3XvCQWxxOHG/gBM5uUTdIPSZQZU6hBbpcJwb WOSohm/mzNm+WaVzZaYtJU5aSqckguRPBpFgCMLpMX3toetsqkSHrsCXHgOYozVtdIFByr 1ZFEAbGS2bD/upJXBzjIuwqWbJ3wmdGMJ0y5wuJwiVPc/8XLKP17Yv80rpAONyDJQnNate 7Iez8f9yDroLa25laKvJB+KiwEoVE+l2ZdiCrqi4PHLkz+S12zi3MbZJuqViXA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; 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: -3.59 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; 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: 22320393A4 X-Spam-Score: -3.59 X-Migadu-Scanner: scn0.migadu.com X-TUID: 3RAYQ6npXNfq Hi Maxime, Thanks for the updated patch set! Overall it LGTM. I found this one bug: Maxime Devos skribis: > From: Sarah Morgensen > > * guix/scripts/refresh.scm (update-package): Use 'file-hash*' instead of > 'port-sha256'. Rename TARBALL to OUTPUT. [...] > - (let ((hash (call-with-input-file tarball > - port-sha256))) > + (let ((hash (file-hash* output))) This is incorrect because =E2=80=98file-hash*=E2=80=99 defaults to #:recurs= ive? #t (IOW it computes the hash of a nar containing OUTPUT instead of the hash of OUTPUT). You can see the problem for instance by running: ./pre-inst-env guix refresh -u mailutils && \ ./pre-inst-env guix build -S mailutils # hash mismatch error I think we need to check whether OUTPUT is a file or a directory and pass #:recursive? accordingly. WDYT? Thanks, Ludo=E2=80=99.