From patchwork Mon Dec 27 18:39:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Timothy Sample X-Patchwork-Id: 35711 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 C976E27BBEA; Mon, 27 Dec 2021 18:40:40 +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,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 5129E27BBE9 for ; Mon, 27 Dec 2021 18:40:40 +0000 (GMT) Received: from localhost ([::1]:47444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n1uvH-0004MP-EV for patchwork@mira.cbaines.net; Mon, 27 Dec 2021 13:40:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1uuh-0004MD-1f for guix-patches@gnu.org; Mon, 27 Dec 2021 13:40:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60962) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n1uug-0005xU-5D for guix-patches@gnu.org; Mon, 27 Dec 2021 13:40:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n1uug-0004gf-2E for guix-patches@gnu.org; Mon, 27 Dec 2021 13:40:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52828] [PATCH] Fix Disarchive fallback on Guix System Resent-From: Timothy Sample Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Dec 2021 18:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52828 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52828@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164063038317971 (code B ref -1); Mon, 27 Dec 2021 18:40:01 +0000 Received: (at submit) by debbugs.gnu.org; 27 Dec 2021 18:39:43 +0000 Received: from localhost ([127.0.0.1]:44275 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1uuM-0004fm-Jl for submit@debbugs.gnu.org; Mon, 27 Dec 2021 13:39:42 -0500 Received: from lists.gnu.org ([209.51.188.17]:48998) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n1uuK-0004fe-RD for submit@debbugs.gnu.org; Mon, 27 Dec 2021 13:39:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1uuK-0004GH-Bb for guix-patches@gnu.org; Mon, 27 Dec 2021 13:39:40 -0500 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:47933) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n1uuH-0005tw-U6 for guix-patches@gnu.org; Mon, 27 Dec 2021 13:39:39 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id E73AB3200645 for ; Mon, 27 Dec 2021 13:39:29 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 27 Dec 2021 13:39:30 -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=VDALH5f5JIJ96Ef/cQRHRlevtdw8i /1fF1jq57bBEbY=; b=j5H2tLddtJ8OMYdRhBLiccfqSf4tM+EHuErFyAgGupg1h LvHcxLDTGakLyGbbKisa7vCgeNL9qTM1/T2iD6et9NJxPEo8Ywm1zzLcfL/hlL7n aVg7k7lovv4/xSJzS7VC0XrpBd5BZfd88jaH3B+QQJSJiBlEnjGYdZj/wZGwDcuL RoTWzcKP0IjxcqiWQsddzmy1WyBqBb+325EWuueUhrqze7kPUP0B0XLLsqCaQc2H m0DMkPozPmt3sMV6UrXynStzm/WKYHBGz14MKpWwFAYR+QlFzqD0h0zAEq0Uvx6a vcHi5XOtrJLuyiEX3a9SyAU98S+EF8ApQpTBaa2Qg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddruddujedguddtgecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkfgfgggtsehmtderre dtreejnecuhfhrohhmpefvihhmohhthhihucfurghmphhlvgcuoehsrghmphhlvghtsehn ghihrhhordgtohhmqeenucggtffrrghtthgvrhhnpedvleelvdeiffffudefhfffhfekke fggfeftddugefhudegtdeklefggeffledvtdenucevlhhushhtvghrufhiiigvpedtnecu rfgrrhgrmhepmhgrihhlfhhrohhmpehsrghmphhlvghtsehnghihrhhordgtohhm X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 27 Dec 2021 13:39:29 -0500 (EST) From: Timothy Sample Date: Mon, 27 Dec 2021 13:39:28 -0500 Message-ID: <877dbpuc2n.fsf@ngyro.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Received-SPF: pass client-ip=64.147.123.20; envelope-from=samplet@ngyro.com; helo=wout4-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_H2=-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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi everyone, I noticed recently that Disarchive fallback does not work on Guix System. This is because the ‘(guix swh)’ module shells out to ‘tar’ to extract the tarball that it downloads from SWH. However, when used as part of ‘guix perform-download’ via the daemon, ‘tar’ is not available. AFAICS, that the daemon is run with no ‘PATH’ at all. You can confirm this by running (on Guix System): $ GUIX_DOWNLOAD_FALLBACK_TEST=disarchive-mirrors \ guix build --check -S python-flask You should see: [...] Downloading [...] from Software Heritage... In procedure fport_write: Broken pipe [...] This patch adds ‘tar’ and ‘gzip’ to the daemon’s ‘PATH’. To me, this is the most straight-forward way to fix the issue, but there are others. Any opinions? -- Tim From 2893252c16f3e447eccd0f8d216bfb44b1965c43 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Thu, 23 Dec 2021 22:32:07 -0500 Subject: [PATCH] services: guix: Add tar and gzip to PATH. * gnu/services/base.scm (guix-shepherd-service): Add the PATH environment-variable and populate it with tar and gzip. --- gnu/services/base.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 88869e40d2..2fad07097b 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -55,7 +55,8 @@ (define-module (gnu services base) #:select (alsa-utils crda eudev e2fsprogs fuse gpm kbd lvm2 rng-tools)) #:use-module (gnu packages bash) #:use-module ((gnu packages base) - #:select (coreutils glibc glibc-utf8-locales)) + #:select (coreutils glibc glibc-utf8-locales tar)) + #:use-module ((gnu packages compression) #:select (gzip)) #:autoload (gnu packages guile-xyz) (guile-netlink) #:autoload (gnu packages hurd) (hurd) #:use-module (gnu packages package-management) @@ -1709,7 +1710,14 @@ (define (guix-shepherd-service config) (string-append "GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale") - "LC_ALL=en_US.utf8") + "LC_ALL=en_US.utf8" + ;; Make 'tar' and 'gzip' available so + ;; that 'guix perform-download' can use + ;; them when downloading from Software + ;; Heritage via '(guix swh)'. + (string-append "PATH=" + #$(file-append tar "/bin") ":" + #$(file-append gzip "/bin"))) (if proxy (list (string-append "http_proxy=" proxy) (string-append "https_proxy=" proxy)) -- 2.34.0