From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6o2x-0000MR-Jx for guix-patches@gnu.org; Fri, 05 May 2017 20:58:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d6o2s-0000ay-OD for guix-patches@gnu.org; Fri, 05 May 2017 20:58:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:58769) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d6o2s-0000at-KL for guix-patches@gnu.org; Fri, 05 May 2017 20:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d6o2s-0004wo-Bo for guix-patches@gnu.org; Fri, 05 May 2017 20:58:02 -0400 Subject: bug#26792: Fix output of --help in package fish Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:51791) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6o1z-0007vA-Id for guix-patches@gnu.org; Fri, 05 May 2017 20:57:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d6o1u-00009w-Lj for guix-patches@gnu.org; Fri, 05 May 2017 20:57:07 -0400 Received: from 93-95-228-241.1984.is ([93.95.228.241]:42564 helo=sharknado9001.pragmatique.xyz) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d6o1u-00008w-9k for guix-patches@gnu.org; Fri, 05 May 2017 20:57:02 -0400 Received: by sharknado9001.pragmatique.xyz (OpenSMTPD) with ESMTPSA id 23c57231 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for ; Sat, 6 May 2017 00:56:47 +0000 (UTC) Date: Sat, 6 May 2017 00:56:54 +0000 From: ng0 Message-ID: <20170506005654.6fmz6ojzieve7mnv@abyayala> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="wral7qz4fqzdg4fo" Content-Disposition: inline List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 26792@debbugs.gnu.org --wral7qz4fqzdg4fo Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Currently the output of fish --help fails if the nroff binary is not found. The patch fixes the issue by embeding a reference to the groff provided nroff, fish --help produces correct output after this is applied. -- https://pragmatique.xyz PGP: https://people.pragmatique.xyz/ng0/ --wral7qz4fqzdg4fo Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-fish-Reference-groff-to-fix-output-of-fish-help.patch" Content-Transfer-Encoding: quoted-printable =46rom 5a22ffdccef3266f6a4050f715f304c10c259ba3 Mon Sep 17 00:00:00 2001 =46rom: ng0 Date: Sat, 6 May 2017 00:12:58 +0000 Subject: [PATCH] gnu: fish: Reference 'groff' to fix output of 'fish --help= '. * gnu/packages/shells.scm (fish)[native-inputs]: Add 'groff'. (arguments): Add 'nroff' substitution in 'embed-store-paths' phase. --- gnu/packages/shells.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index d87d58e5c..6f06acfa4 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -31,6 +31,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages bison) #:use-module (gnu packages documentation) + #:use-module (gnu packages groff) #:use-module (gnu packages libedit) #:use-module (gnu packages ncurses) #:use-module (gnu packages pcre) @@ -112,7 +113,8 @@ direct descendant of NetBSD's Almquist Shell (@command{= ash}).") ((".*INSTALL.*sysconfdir.*fish.*") ""))))) (build-system gnu-build-system) (native-inputs - `(("doxygen" ,doxygen))) + `(("doxygen" ,doxygen) + ("groff" ,groff))) (inputs `(("bc" ,bc) ("ncurses" ,ncurses) @@ -133,6 +135,8 @@ direct descendant of NetBSD's Almquist Shell (@command{= ash}).") "/bin/bc"))) (substitute* "share/functions/fish_update_completions.fish" (("python") (which "python"))) + (substitute* "share/functions/__fish_print_help.fish" + (("nroff") (which "nroff"))) #t))))) (synopsis "The friendly interactive shell") (description --=20 2.12.2 --wral7qz4fqzdg4fo--