From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kMSMKDjW3mEwhAAAgWs5BA (envelope-from ) for ; Wed, 12 Jan 2022 14:23:04 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id SGsdJTjW3mFp/wAAauVa8A (envelope-from ) for ; Wed, 12 Jan 2022 14:23:04 +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 3572E1B3C1 for ; Wed, 12 Jan 2022 14:23:04 +0100 (CET) Received: from localhost ([::1]:44488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7dag-0000xr-PN for larch@yhetil.org; Wed, 12 Jan 2022 08:23:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34590) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7cR6-00055s-0o for guix-patches@gnu.org; Wed, 12 Jan 2022 07:09:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35259) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7cR4-0001HU-AQ for guix-patches@gnu.org; Wed, 12 Jan 2022 07:09:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n7cR4-0001kw-6b for guix-patches@gnu.org; Wed, 12 Jan 2022 07:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53206] [PATCH] gnu: info-reader: Reference gzip by absolute path. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 12 Jan 2022 12:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53206 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53206@debbugs.gnu.org Cc: Maxime Devos X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16419893256713 (code B ref -1); Wed, 12 Jan 2022 12:09:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Jan 2022 12:08:45 +0000 Received: from localhost ([127.0.0.1]:56395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7cQm-0001kD-OC for submit@debbugs.gnu.org; Wed, 12 Jan 2022 07:08:45 -0500 Received: from lists.gnu.org ([209.51.188.17]:37044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7cQj-0001k4-Rx for submit@debbugs.gnu.org; Wed, 12 Jan 2022 07:08:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7cQj-0004ZR-Ji for guix-patches@gnu.org; Wed, 12 Jan 2022 07:08:41 -0500 Received: from [2a02:1800:110:4::f00:18] (port=37336 helo=michel.telenet-ops.be) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7cQh-0001Cv-0H for guix-patches@gnu.org; Wed, 12 Jan 2022 07:08:41 -0500 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by michel.telenet-ops.be with bizsmtp id ho8a2600c4UW6Th06o8aGH; Wed, 12 Jan 2022 13:08:35 +0100 From: Maxime Devos Date: Wed, 12 Jan 2022 12:08:34 +0000 Message-Id: <20220112120834.208761-1-maximedevos@telenet.be> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1641989315; bh=nvMxyG5tdw7PPzNFk/iVPasJJJj/5LE61aVNnVwCqi4=; h=From:To:Cc:Subject:Date; b=enEjhOMPqGEth5EEIRBNd7+Totc3AN2aOV/vg/Unk9nJOaVXdJ/meishpzlWZDHkd CQmxbV6nqSTY1p3/jqCYyp/7J92Rwh45OeCK1L6OPWmjcWtqK9fO7eD8D4yk7k7TjQ iUFxfsyYvU+YwIC+UiTgy8idib+RLow1hBsDIzmxYlWJVlhxuszNM7QCF5Ewa2g6gU jmk20FHMwh0X+IifBowwkgLsvdjNJvOcFS1vc1GAtvqWRlYRvu7hXpA8amWqLn9Zcv nheaI6462okWRPdKJMfnONSgomdIsm9TBOXy6X5mlRw4Nv/4INUobbuZEFQrBYFNYD 6epndqPl14lbA== X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a02:1800:110:4::f00:18 (failed) Received-SPF: pass client-ip=2a02:1800:110:4::f00:18; envelope-from=maximedevos@telenet.be; helo=michel.telenet-ops.be X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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=1641993784; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=nvMxyG5tdw7PPzNFk/iVPasJJJj/5LE61aVNnVwCqi4=; b=D09qOv9EouxD8Sgy6Bf2cZ6GUBS0MSvRFS+9tV1WD1gJWbbmY+MvCJAvlbaDfhWYhPf8fl tjCKgcHE7OUSFz93gYedryVQzu632AB1bSq2TERn4uhYz4VRrGuwFvc+lEI+w2ohIKDDaW AcT+S51pCoN7gARDC3GWW7/+EV3IkcXCGuznGQyEulyMVh7J/Zt8shxisuPwsHO7jIbc8e x0+VLTnY4teiFlRauEAJCHTMbWUOOnuCmJs4GnXSlbqtRd/AKd32OYyzv4clLv3ioMummE uhvOznDjBZiZDloeQY5/yI1hODFuiUgfFm82oCOZTnhlWMxCcPlbMAImaIOuRA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1641993784; a=rsa-sha256; cv=none; b=NYpEERmUknGsd5F3Jvf0kA7kHHtU9YgVKrnTJDB/f6I2o6VEqFJDVW3V2XGna6ZZES0Wb6 /sdOpS+wf2LIYV/bqZ31ufGbEC16bI6Dp3bRMDVU5W06tLkxrHWcBAiIHSZ3tGpMqSZ3+F YRK32uIIb28XSxfKsJA66YsM1a27IHMSUuin50W29IfQiIXOMWVwr8qFtyUZ1QwL7S7PQS 0b+Rf6ecPLll6w3FP9NJ5aJYmcL19sjOQgjrlySn8zqPePrUItP1w6Tykl3mrbs2k6j3qc hlFVTXG6zvbsLtKVf/QuGKc4LHrE9hnOheI1phHAxjdOjpJNcucE1MR0ITfRmA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r22 header.b=enEjhOMP; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=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: -2.52 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r22 header.b=enEjhOMP; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=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: 3572E1B3C1 X-Spam-Score: -2.52 X-Migadu-Scanner: scn0.migadu.com X-TUID: BUvt7uMpZ0lZ This allows doing "guix shell --pure info-reader guile -- info guile". * gnu/packages/texinfo.scm (info-reader)[arguments]: Add 'absolute-binary-path' phase to refer to gzip by the absolute store file name. [inputs]: Add 'gzip'. --- gnu/packages/texinfo.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 13fb92d14a..fc1dac9df9 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2019, 2020 Mathieu Othacehe ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -156,6 +157,17 @@ is on expressing the content semantically, avoiding physical markup commands.") `(,@(substitute-keyword-arguments (package-arguments texinfo) ((#:phases phases) `(modify-phases ,phases + ;; Make sure 'info-reader' can read compressed info files + ;; in a pure environment. There are also a few other + ;; uncompressors listed in this file (lzip, unxz, bunzip2, ...) + ;; but let's not include them because info manuals in Guix + ;; are always compressed with 'gzip'. + ;; TODO(core-updates): maybe move to the 'texinfo' package. + (add-after 'unpack 'absolute-binary-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "info/filesys.c" + (("gunzip") (search-input-file inputs "/bin/gunzip")) + (("gzip") (search-input-file inputs "/bin/gzip"))))) (add-after 'install 'keep-only-info-reader (lambda* (#:key outputs #:allow-other-keys) ;; Remove everything but 'bin/info' and associated @@ -179,7 +191,9 @@ is on expressing the content semantically, avoiding physical markup commands.") "perl") #:modules ((ice-9 ftw) (srfi srfi-1) ,@%gnu-build-system-modules))) - (synopsis "Standalone Info documentation reader"))) + (synopsis "Standalone Info documentation reader") + (inputs (modify-inputs (package-inputs texinfo) + (prepend gzip))))) (define-public texi2html (package base-commit: 9fd4f4b09cc0495d6b1418f171ff738a1086cc00 prerequisite-patch-id: 9e070819096a5b3df220706866de3f9a24700add prerequisite-patch-id: 9e081caf6df1e9b7fa4ecf0e816089cb65897d7b prerequisite-patch-id: 8fa14cb2d1fcc4b4d5be227bf8a2691a912500c0 prerequisite-patch-id: 3d4bf2cbd36e29a031c6ccd13fdf4edd51b67652 prerequisite-patch-id: b740911b2fab6e87f003e13ce21d3c726d7ffeb6 prerequisite-patch-id: 2495e12d0efbf42fe847e7411a9c7abbf6b09c38 prerequisite-patch-id: f281231d96059179b6b891d999dda798b099e2fb prerequisite-patch-id: c60b330f96721da1f7790dd29b5d428e312e7b2e prerequisite-patch-id: a3ab55eaf0dece586c513fa5671414ff902eb1cd prerequisite-patch-id: ff47ed0086837f18293d67e5edd01ca14c6f84c9 prerequisite-patch-id: 2c805f40c37fed3eb8e69456d4c90c0a75b643be prerequisite-patch-id: dfc9534307fd4365205bcd22cea57c3e196b29e8 prerequisite-patch-id: 5035d75f6463dbcc8d7e29782ba9b1f7a5867c42 prerequisite-patch-id: 25bcba14a4fe703d4e09169e2741526781ae3372 -- 2.30.2