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 WIeNJP2xw2FytQAAgWs5BA (envelope-from ) for ; Thu, 23 Dec 2021 00:17:17 +0100 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 mLE7IP2xw2F6IAAAbx9fmQ (envelope-from ) for ; Wed, 22 Dec 2021 23:17:17 +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 1DE69EB94 for ; Thu, 23 Dec 2021 00:17:16 +0100 (CET) Received: from localhost ([::1]:55162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0ArD-0002k6-4k for larch@yhetil.org; Wed, 22 Dec 2021 18:17:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41764) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0Ar0-0002ig-Kd for guix-patches@gnu.org; Wed, 22 Dec 2021 18:17:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48440) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0Ar0-00080c-9G for guix-patches@gnu.org; Wed, 22 Dec 2021 18:17:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n0Ar0-00080v-6v for guix-patches@gnu.org; Wed, 22 Dec 2021 18:17:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52742] [PATCH] self: Add guile-lzma as a dependency. Resent-From: Timothy Sample Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Dec 2021 23:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52742 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52742@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164021497330740 (code B ref -1); Wed, 22 Dec 2021 23:17:02 +0000 Received: (at submit) by debbugs.gnu.org; 22 Dec 2021 23:16:13 +0000 Received: from localhost ([127.0.0.1]:59986 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0AqC-0007zk-NI for submit@debbugs.gnu.org; Wed, 22 Dec 2021 18:16:12 -0500 Received: from lists.gnu.org ([209.51.188.17]:55610) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0AqB-0007zd-Oi for submit@debbugs.gnu.org; Wed, 22 Dec 2021 18:16:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0Aq8-0001ot-JC for guix-patches@gnu.org; Wed, 22 Dec 2021 18:16:09 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:49049) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0Aq5-0007c5-Pj for guix-patches@gnu.org; Wed, 22 Dec 2021 18:16:08 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id CECB15C00E5 for ; Wed, 22 Dec 2021 18:16:04 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Wed, 22 Dec 2021 18:16:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=5V6KofmHLtPvy5M3txsDj2wW6q9/y ttd3HbATnpdfik=; b=NW4+ks4v5Mh8TUlWLvMT/1tIswwAR8DTH9ii9tPLXHvDB gGt17ZVdW7D9zyi9F/sz4ksuqvIE07HUcyU3vBUOvuYmrhPMgRiQhjhjQVgE/x2a p2nmB9OuNEdI/SZgSjggxtzMewqp7a2C1Ucs9GgonVDeBRzZAsJlCfMbpbAW1vKT qsyeXMsWup05iwuqumv2c0ESl+5Eiu50aFxxfpMgt1MQX2aftcqsAPL+e5zZ2M+A 4myjcDirHqp/wbIFoVq6jiWWbvU6e3ENxyfzBBqoMfYEeFiIHn7oDAxEJuhBc9Db W8F18olPdms/6GoRqKWMZZ3/RNnkDKQeKAMvJ0L2A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddruddtjedgtdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkfgggtgesmhdtreertd ertdenucfhrhhomhepvfhimhhothhhhicuufgrmhhplhgvuceoshgrmhhplhgvthesnhhg hihrohdrtghomheqnecuggftrfgrthhtvghrnhepgfelhfeggeehveeltddvffevvdehie fhvefgveejtedvuddtudeltefgtddtkedvnecuvehluhhsthgvrhfuihiivgeptdenucfr rghrrghmpehmrghilhhfrhhomhepshgrmhhplhgvthesnhhghihrohdrtghomh X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Wed, 22 Dec 2021 18:16:04 -0500 (EST) From: Timothy Sample Date: Wed, 22 Dec 2021 18:16:03 -0500 Message-ID: <878rwcp6x8.fsf@ngyro.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=66.111.4.28; envelope-from=samplet@ngyro.com; helo=out4-smtp.messagingengine.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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=1640215037; 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:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=5V6KofmHLtPvy5M3txsDj2wW6q9/yttd3HbATnpdfik=; b=rM7tstyubScUSlcF8xroHJY3aDpNLzLnLFaLCIqzrkFL6lcDGP8UVvb37z5bH0y4bJt7u+ m6NBbjgkvOnm9nhkq3xkOg+UUfm9raszgeP8V56OzWasMrQf6WSO7GPOQJ6HDzoPL1KHEw tdy5T96AKcpjTFMjMYDP/NBFDZ7mRpXxEc+8/FBFDOdQK9QyqvzSjbXfSfuGMItHgTmVPN 45uoYqrxOV28O7VzBu/gQnYOO7S5YKDii/9Xa66TZSgSdCSEzOfh2afs1gi3AJMsAkmZZv HtytDJIpe59Xds/mX/N3Y47idfc5eYEwZmkMa/u0JB09HICsMVzQhEkSAx/xGg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1640215037; a=rsa-sha256; cv=none; b=Wc3v0imrIC47RDwopeMlqExxvCFvQa4+9BaqsqHefQQO8v+lC1TboxbqCfkBynvVpuBWBP TnkjgIF1WRVNB+TYT8RtW96IxEkSeAbGArXdmHmOx2CH7We/t6cuS9B+9AQNJ68MpwpF6w OVG9P/lrVrs377CjrwR60aMtJgQm+Smeq7j/7xvoMJG5djcESmSz57Uq7tL75qMexysWZo vRGJltG6l1un0i7OGiaXGuZM0o3+jz29FAAyzX2haSnSNR+U4+aQtQoTNmD8NIH+NdR1vA Mb6kXYRCvDDyjXA8KupyrugP3CipaVcyn9F5Dap3cgNxwF7fdvwYkVhrR++qKQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b=NW4+ks4v; dmarc=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: -3.84 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b=NW4+ks4v; dmarc=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: 1DE69EB94 X-Spam-Score: -3.84 X-Migadu-Scanner: scn0.migadu.com X-TUID: mYdJNO4QtNQK --=-=-= Content-Type: text/plain Hello, This patch fixes an omission in my previous Disarchive patch. -- Tim --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-self-Add-guile-lzma-as-a-dependency.patch >From 47053d6250a7fb3fa0f33b2df308200cf5f1e4a6 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 22 Dec 2021 17:35:56 -0500 Subject: [PATCH] self: Add guile-lzma as a dependency. This is a follow-up to 35ce3e5de6d39d4959ecae31e8f8ce2bbb645e0a, fixing Disarchive recovery when the download script is run from a 'guix pull' profile. * guix/self.scm (specification->package): Add "guile-lzma". (compiled-guix): Add GUILE-LZMA to DEPENDENCIES in the #:dependencies argument to 'guix-command'. --- guix/self.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/guix/self.scm b/guix/self.scm index bd9a71de45..943bb0b498 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -64,6 +64,7 @@ (define specification->package ("guile-gcrypt" (ref '(gnu packages gnupg) 'guile-gcrypt)) ("gnutls" (ref '(gnu packages tls) 'gnutls)) ("disarchive" (ref '(gnu packages backup) 'disarchive)) + ("guile-lzma" (ref '(gnu packages guile) 'guile-lzma)) ("gzip" (ref '(gnu packages compression) 'gzip)) ("bzip2" (ref '(gnu packages compression) 'bzip2)) ("xz" (ref '(gnu packages compression) 'xz)) @@ -789,6 +790,9 @@ (define* (compiled-guix source #:key (define disarchive (specification->package "disarchive")) + (define guile-lzma + (specification->package "guile-lzma")) + (define dependencies (append-map transitive-package-dependencies (list guile-gcrypt gnutls guile-git guile-avahi @@ -1009,7 +1013,9 @@ (define* (compiled-guix source #:key (command (guix-command modules #:source source #:dependencies - (cons disarchive dependencies) + (cons* disarchive + guile-lzma + dependencies) #:guile guile-for-build #:guile-version guile-version))) (whole-package name modules dependencies -- 2.34.0 --=-=-=--