From patchwork Wed Jan 12 12:08:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 36240 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 D426427BBEA; Wed, 12 Jan 2022 13:23:01 +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,FREEMAIL_FROM,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 3F0A127BBE9 for ; Wed, 12 Jan 2022 13:23:01 +0000 (GMT) Received: from localhost ([::1]:44488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7dae-0000xr-Cb for patchwork@mira.cbaines.net; Wed, 12 Jan 2022 08:23:00 -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 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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(-) 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 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