From 614a1e3fa2d731d4719f03912b1b87fb4fd309cb Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 14 Dec 2019 17:46:27 +0100 Subject: gnu: info-reader: Fix cross-compilation. * gnu/packages/texinfo.scm (info-reader)[arguments]: Add keep-only-info-reader phase to inherited texinfo package phases, so that fix-cross-configure phase is preserved. --- gnu/packages/texinfo.scm | 49 ++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) (limited to 'gnu/packages/texinfo.scm') diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 1edeea2425..3d0894b84f 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014, 2016 Eric Bavier ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -108,32 +109,32 @@ is on expressing the content semantically, avoiding physical markup commands.") (inherit texinfo) (name "info-reader") (arguments - `(#:disallowed-references ,(assoc-ref (package-inputs texinfo) - "perl") + `(,@(substitute-keyword-arguments (package-arguments texinfo) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'keep-only-info-reader + (lambda* (#:key outputs #:allow-other-keys) + ;; Remove everything but 'bin/info' and associated + ;; files. + (define (files) + (scandir "." (lambda (file) + (not (member file '("." "..")))))) + (let ((out (assoc-ref outputs "out"))) + (with-directory-excursion out + (for-each delete-file-recursively + (fold delete (files) '("bin" "share")))) + (with-directory-excursion (string-append out "/bin") + (for-each delete-file (delete "info" (files)))) + (with-directory-excursion (string-append out "/share") + (for-each delete-file-recursively + (fold delete (files) + '("info" "locale")))) + #t)))))) + #:disallowed-references ,(assoc-ref (package-inputs texinfo) + "perl") #:modules ((ice-9 ftw) (srfi srfi-1) - ,@%gnu-build-system-modules) - - #:phases (modify-phases %standard-phases - (add-after 'install 'keep-only-info-reader - (lambda* (#:key outputs #:allow-other-keys) - ;; Remove everything but 'bin/info' and associated - ;; files. - (define (files) - (scandir "." (lambda (file) - (not (member file '("." "..")))))) - - (let ((out (assoc-ref outputs "out"))) - (with-directory-excursion out - (for-each delete-file-recursively - (fold delete (files) '("bin" "share")))) - (with-directory-excursion (string-append out "/bin") - (for-each delete-file (delete "info" (files)))) - (with-directory-excursion (string-append out "/share") - (for-each delete-file-recursively - (fold delete (files) - '("info" "locale")))) - #t)))))) + ,@%gnu-build-system-modules))) (synopsis "Standalone Info documentation reader"))) (define-public texi2html -- cgit v1.2.3 From a13116b60c803d8ba7ee99197bed16d7bdf2eaa5 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 15 Dec 2019 17:10:19 +0100 Subject: gnu: texinfo: Add missing include. * gnu/packages/texinfo.scm (info-reader): Fix missing include, introduced by f5d670606354728a453b8cc962c4f85516007d13. --- gnu/packages/texinfo.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/texinfo.scm') diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 3d0894b84f..7f95c29b9e 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -23,6 +23,7 @@ (define-module (gnu packages texinfo) #:use-module (guix licenses) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (gnu packages) -- cgit v1.2.3 From e703f6d8ef354d2c394c4f68bde5b9bf66237f70 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 15 Dec 2019 23:10:49 +0100 Subject: gnu: Add pinfo. * gnu/packages/texinfo.scm (pinfo): New variable. --- gnu/packages/texinfo.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) (limited to 'gnu/packages/texinfo.scm') diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 7f95c29b9e..de3f7c5d35 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2019 Mathieu Othacehe +;;; Copyright © 2019 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,11 +26,15 @@ #:use-module (guix packages) #:use-module (guix utils) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages compression) + #:use-module (gnu packages gettext) #:use-module (gnu packages ncurses) - #:use-module (gnu packages perl)) + #:use-module (gnu packages perl) + #:use-module (gnu packages readline)) (define-public texinfo (package @@ -183,3 +188,51 @@ of the GNU Texinfo implementation) do not intend to make further releases of Texi2HTML.") ;; Files in /lib under lgpl2.1+ and x11 (license gpl2+))) + +(define-public pinfo + (package + (name "pinfo") + (version "0.6.13") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/baszoetekouw/pinfo.git") + (commit (string-append "v" version)))) + (sha256 + (base32 + "173d2p22irwiabvr4z6qvr6zpr6ysfkhmadjlyhyiwd7z62larvy")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-Werror + (lambda _ + (substitute* "configure.ac" + (("-Werror") "")) + #t)) + (add-after 'unpack 'embed-reference-to-clear + (lambda* (#:key inputs #:allow-other-keys) + (substitute* '("src/manual.c" + "src/mainfunction.c" + "src/utils.c") + (("\"clear\"") + (string-append "\"" (which "clear") "\""))) + #t))))) + (inputs + `(("ncurses" ,ncurses) + ("readline" ,readline))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gnu-gettext) + ("libtool" ,libtool) + ("texinfo" ,texinfo))) + (home-page "https://github.com/baszoetekouw/pinfo") + (synopsis "Lynx-style Info file and man page reader") + (description + "Pinfo is an Info file viewer. Pinfo is similar in use to the Lynx web +browser. You just move across info nodes, and select links, follow them, etc. +It supports many colors. Pinfo also supports viewing of manual pages -- they +are colorized like in the midnight commander's viewer, and additionaly they +are hypertextualized.") + (license gpl2+))) -- cgit v1.2.3 From 8c4c5bf86ac57e2923f51f9dcc5794dedb85ed3c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 16 Dec 2019 15:08:01 +0100 Subject: Revert "gnu: info-reader: Fix cross-compilation." This reverts commit 614a1e3fa2d731d4719f03912b1b87fb4fd309cb. This is broken on master with the following error: output (`/gnu/store/6rnhfi8zrdajbahbq9ii8bpj7mwfcjba-info-reader-6.6') is not allowed to refer to path `/gnu/store/ziinjmbnq004866mwjrczsk12wf35qb8-perl-5.30.0' build of /gnu/store/nnfvr10713khxp1bkbpwi5wxbj8cm4wb-info-reader-6.6.drv failed View build log at '/var/log/guix/drvs/nn/fvr10713khxp1bkbpwi5wxbj8cm4wb-info-reader-6.6.drv.bz2'. --- gnu/packages/texinfo.scm | 49 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 25 deletions(-) (limited to 'gnu/packages/texinfo.scm') diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index de3f7c5d35..1162e77b07 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -3,7 +3,6 @@ ;;; Copyright © 2014, 2016 Eric Bavier ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2017 Efraim Flashner -;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2019 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. @@ -115,32 +114,32 @@ is on expressing the content semantically, avoiding physical markup commands.") (inherit texinfo) (name "info-reader") (arguments - `(,@(substitute-keyword-arguments (package-arguments texinfo) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'install 'keep-only-info-reader - (lambda* (#:key outputs #:allow-other-keys) - ;; Remove everything but 'bin/info' and associated - ;; files. - (define (files) - (scandir "." (lambda (file) - (not (member file '("." "..")))))) - - (let ((out (assoc-ref outputs "out"))) - (with-directory-excursion out - (for-each delete-file-recursively - (fold delete (files) '("bin" "share")))) - (with-directory-excursion (string-append out "/bin") - (for-each delete-file (delete "info" (files)))) - (with-directory-excursion (string-append out "/share") - (for-each delete-file-recursively - (fold delete (files) - '("info" "locale")))) - #t)))))) - #:disallowed-references ,(assoc-ref (package-inputs texinfo) + `(#:disallowed-references ,(assoc-ref (package-inputs texinfo) "perl") + #:modules ((ice-9 ftw) (srfi srfi-1) - ,@%gnu-build-system-modules))) + ,@%gnu-build-system-modules) + + #:phases (modify-phases %standard-phases + (add-after 'install 'keep-only-info-reader + (lambda* (#:key outputs #:allow-other-keys) + ;; Remove everything but 'bin/info' and associated + ;; files. + (define (files) + (scandir "." (lambda (file) + (not (member file '("." "..")))))) + + (let ((out (assoc-ref outputs "out"))) + (with-directory-excursion out + (for-each delete-file-recursively + (fold delete (files) '("bin" "share")))) + (with-directory-excursion (string-append out "/bin") + (for-each delete-file (delete "info" (files)))) + (with-directory-excursion (string-append out "/share") + (for-each delete-file-recursively + (fold delete (files) + '("info" "locale")))) + #t)))))) (synopsis "Standalone Info documentation reader"))) (define-public texi2html -- cgit v1.2.3 From ca825070e49cd7239fa80762cf2e64bc8c45858c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 17 Dec 2019 09:17:27 +0200 Subject: gnu: pinfo: Use a source file name. * gnu/packages/texinfo.scm (pinfo)[source]: Add 'file-name'. --- gnu/packages/texinfo.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/texinfo.scm') diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 1162e77b07..44800b3961 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2015, 2016, 2017, 2019 Ludovic Courtès ;;; Copyright © 2014, 2016 Eric Bavier ;;; Copyright © 2015 Mark H Weaver -;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2017, 2019 Efraim Flashner ;;; Copyright © 2019 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. @@ -197,6 +197,7 @@ Texi2HTML.") (uri (git-reference (url "https://github.com/baszoetekouw/pinfo.git") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "173d2p22irwiabvr4z6qvr6zpr6ysfkhmadjlyhyiwd7z62larvy")))) -- cgit v1.2.3