From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 2PirKJyc6F96bAAA0tVLHw (envelope-from ) for ; Sun, 27 Dec 2020 14:39:24 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id WMODJJyc6F/ZeQAAB5/wlQ (envelope-from ) for ; Sun, 27 Dec 2020 14:39: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 4770B9402A5 for ; Sun, 27 Dec 2020 14:39:24 +0000 (UTC) Received: from localhost ([::1]:35196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktXCd-00042R-8t for larch@yhetil.org; Sun, 27 Dec 2020 09:39:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktXCJ-0003gL-Oj for guix-patches@gnu.org; Sun, 27 Dec 2020 09:39:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48961) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktXCJ-0003Ot-H6 for guix-patches@gnu.org; Sun, 27 Dec 2020 09:39:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktXCJ-0000Js-F4 for guix-patches@gnu.org; Sun, 27 Dec 2020 09:39:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45460] [PATCH 4/5] substitute: Add zstd support. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Dec 2020 14:39:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45460 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45460@debbugs.gnu.org Received: via spool by 45460-submit@debbugs.gnu.org id=B45460.16090799091150 (code B ref 45460); Sun, 27 Dec 2020 14:39:03 +0000 Received: (at 45460) by debbugs.gnu.org; 27 Dec 2020 14:38:29 +0000 Received: from localhost ([127.0.0.1]:60502 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktXBk-0000IN-Vt for submit@debbugs.gnu.org; Sun, 27 Dec 2020 09:38:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33746) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktXBf-0000HY-LL for 45460@debbugs.gnu.org; Sun, 27 Dec 2020 09:38:23 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:49703) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktXBZ-0003At-IM; Sun, 27 Dec 2020 09:38:17 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=51504 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1ktXBZ-0001Rq-2y; Sun, 27 Dec 2020 09:38:17 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Sun, 27 Dec 2020 15:38:08 +0100 Message-Id: <20201227143809.18554-4-ludo@gnu.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201227143809.18554-1-ludo@gnu.org> References: <20201227143809.18554-1-ludo@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-Spam-Score: 2.18 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@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 4770B9402A5 X-Spam-Score: 2.18 X-Migadu-Scanner: scn1.migadu.com X-TUID: oQs7WDVV2phE * guix/scripts/substitute.scm (%compression-methods): Add zstd. (compresses-better?): "lzip" always wins. --- guix/scripts/substitute.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index 8084c89ae5..32ebcf1bb9 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -944,6 +944,8 @@ authorized substitutes." ;; supported. See 'decompressed-port' in (guix utils). `(("gzip" . ,(const #t)) ("lzip" . ,(const #t)) + ("zstd" . ,(lambda () + (resolve-module '(zstd) #t #f #:ensure #f))) ("xz" . ,(const #t)) ("bzip2" . ,(const #t)) ("none" . ,(const #t)))) @@ -961,6 +963,7 @@ this is a rough approximation." (match compression1 ("none" #f) ("gzip" (string=? compression2 "none")) + ("lzip" #t) (_ (or (string=? compression2 "none") (string=? compression2 "gzip"))))) -- 2.29.2