* [PATCH 0/2] Add newsbeuter @ 2016-11-10 8:27 Efraim Flashner 2016-11-10 8:27 ` [PATCH 1/2] gnu: Add stfl Efraim Flashner 2016-11-10 8:27 ` [PATCH 2/2] gnu: Add newsbeuter Efraim Flashner 0 siblings, 2 replies; 8+ messages in thread From: Efraim Flashner @ 2016-11-10 8:27 UTC (permalink / raw) To: guix-devel I've been using newsbeuter for a couple of years now. Initially packaged this months ago and finally cleaned it up for submission. Efraim Flashner (2): gnu: Add stfl. gnu: Add newsbeuter. gnu/local.mk | 1 + gnu/packages/ncurses.scm | 50 +++++++++++++++++++++++++++++++- gnu/packages/rss.scm | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/rss.scm -- 2.10.2 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] gnu: Add stfl. 2016-11-10 8:27 [PATCH 0/2] Add newsbeuter Efraim Flashner @ 2016-11-10 8:27 ` Efraim Flashner 2016-11-10 15:22 ` Marius Bakke 2016-11-10 8:27 ` [PATCH 2/2] gnu: Add newsbeuter Efraim Flashner 1 sibling, 1 reply; 8+ messages in thread From: Efraim Flashner @ 2016-11-10 8:27 UTC (permalink / raw) To: guix-devel * gnu/packages/ncurses.scm (stfl): New variable. --- gnu/packages/ncurses.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm index 9799167..468cd99 100644 --- a/gnu/packages/ncurses.scm +++ b/gnu/packages/ncurses.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is> +;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,7 +27,8 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system perl) #:use-module (gnu packages) - #:use-module (gnu packages perl)) + #:use-module (gnu packages perl) + #:use-module (gnu packages swig)) (define-public ncurses (let ((patch-makefile-phase @@ -207,3 +209,49 @@ curses widgets, such as dialog boxes.") "@code{Curses} is the interface between Perl and the curses library of your system.") (license (package-license perl)))) + +(define-public stfl + (package + (name "stfl") + (version "0.24") + (source + (origin + (method url-fetch) + (uri (string-append "http://www.clifford.at/stfl/stfl-" + version ".tar.gz")) + (sha256 + (base32 + "1460d5lc780p3q38l3wc9jfr2a7zlyrcra0li65aynj738cam9yl")))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ; no test target + #:phases + (modify-phases %standard-phases + ;; there is no configure script so we get to do it manually + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile" + (("\\$\\(prefix\\)") (assoc-ref outputs "out"))) + (setenv "DESTDIR" "") + #t)) + ;; in our ncurses, the headers are in /include + (add-before 'build 'patch-ncursesw + (lambda _ + (substitute* '("stfl_internals.h") + (("ncursesw/") "")) + #t)) + (add-after 'install 'install-missing-symlink + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib"))) + ;; newsbeuter looks for libstfl.so.0 + (symlink "libstfl.so" + (string-append lib "/libstfl.so.0")))))))) + (inputs + `(("ncurses" ,ncurses) + ("swig" ,swig))) + (home-page "http://www.clifford.at/stfl/") + (synopsis "Structured terminal forms library") + (description "Stfl is a library which implements a curses-based widget +set for text terminals.") + (license lgpl3+))) -- 2.10.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] gnu: Add stfl. 2016-11-10 8:27 ` [PATCH 1/2] gnu: Add stfl Efraim Flashner @ 2016-11-10 15:22 ` Marius Bakke 2016-11-10 17:22 ` Efraim Flashner 0 siblings, 1 reply; 8+ messages in thread From: Marius Bakke @ 2016-11-10 15:22 UTC (permalink / raw) To: Efraim Flashner, guix-devel [-- Attachment #1: Type: text/plain, Size: 3444 bytes --] Efraim Flashner <efraim@flashner.co.il> writes: > * gnu/packages/ncurses.scm (stfl): New variable. > --- > gnu/packages/ncurses.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 49 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm > index 9799167..468cd99 100644 > --- a/gnu/packages/ncurses.scm > +++ b/gnu/packages/ncurses.scm > @@ -3,6 +3,7 @@ > ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> > ;;; Copyright © 2015 Leo Famulari <leo@famulari.name> > ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is> > +;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -26,7 +27,8 @@ > #:use-module (guix build-system gnu) > #:use-module (guix build-system perl) > #:use-module (gnu packages) > - #:use-module (gnu packages perl)) > + #:use-module (gnu packages perl) > + #:use-module (gnu packages swig)) > > (define-public ncurses > (let ((patch-makefile-phase > @@ -207,3 +209,49 @@ curses widgets, such as dialog boxes.") > "@code{Curses} is the interface between Perl and the curses library > of your system.") > (license (package-license perl)))) > + > +(define-public stfl > + (package > + (name "stfl") > + (version "0.24") > + (source > + (origin > + (method url-fetch) > + (uri (string-append "http://www.clifford.at/stfl/stfl-" > + version ".tar.gz")) > + (sha256 > + (base32 > + "1460d5lc780p3q38l3wc9jfr2a7zlyrcra0li65aynj738cam9yl")))) > + (build-system gnu-build-system) > + (arguments > + '(#:tests? #f ; no test target > + #:phases > + (modify-phases %standard-phases > + ;; there is no configure script so we get to do it manually > + (replace 'configure > + (lambda* (#:key outputs #:allow-other-keys) > + (substitute* "Makefile" > + (("\\$\\(prefix\\)") (assoc-ref outputs "out"))) > + (setenv "DESTDIR" "") > + #t)) Would it work to simply (setenv "prefix" out), instead of substituting? Not sure which approach I prefer however, so feel free to disregard this. > + ;; in our ncurses, the headers are in /include > + (add-before 'build 'patch-ncursesw > + (lambda _ > + (substitute* '("stfl_internals.h") > + (("ncursesw/") "")) > + #t)) > + (add-after 'install 'install-missing-symlink > + (lambda* (#:key outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (lib (string-append out "/lib"))) > + ;; newsbeuter looks for libstfl.so.0 Perhaps just say "some programs" instead of newsbeuter, since they are mostly unrelated. > + (symlink "libstfl.so" > + (string-append lib "/libstfl.so.0")))))))) > + (inputs > + `(("ncurses" ,ncurses) > + ("swig" ,swig))) Swig should probably be a native-input. Other than that LGTM! > + (home-page "http://www.clifford.at/stfl/") > + (synopsis "Structured terminal forms library") > + (description "Stfl is a library which implements a curses-based widget > +set for text terminals.") > + (license lgpl3+))) > -- > 2.10.2 [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 454 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] gnu: Add stfl. 2016-11-10 15:22 ` Marius Bakke @ 2016-11-10 17:22 ` Efraim Flashner 2016-11-11 10:18 ` Tobias Geerinckx-Rice 0 siblings, 1 reply; 8+ messages in thread From: Efraim Flashner @ 2016-11-10 17:22 UTC (permalink / raw) To: Marius Bakke; +Cc: guix-devel [-- Attachment #1: Type: text/plain, Size: 2543 bytes --] On Thu, Nov 10, 2016 at 03:22:54PM +0000, Marius Bakke wrote: > Efraim Flashner <efraim@flashner.co.il> writes: > > > * gnu/packages/ncurses.scm (stfl): New variable. > > --- > > gnu/packages/ncurses.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++++- > > 1 file changed, 49 insertions(+), 1 deletion(-) > > > > + ;; there is no configure script so we get to do it manually > > + (replace 'configure > > + (lambda* (#:key outputs #:allow-other-keys) > > + (substitute* "Makefile" > > + (("\\$\\(prefix\\)") (assoc-ref outputs "out"))) > > + (setenv "DESTDIR" "") > > + #t)) > > Would it work to simply (setenv "prefix" out), instead of substituting? > Not sure which approach I prefer however, so feel free to disregard this. > It turns out it does work. Its also much shorter. Even better, I figured out how to turn them into make-flags #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out")) "DESTDIR=\"\"") > > + ;; in our ncurses, the headers are in /include > > + (add-before 'build 'patch-ncursesw > > + (lambda _ > > + (substitute* '("stfl_internals.h") > > + (("ncursesw/") "")) > > + #t)) > > + (add-after 'install 'install-missing-symlink > > + (lambda* (#:key outputs #:allow-other-keys) > > + (let* ((out (assoc-ref outputs "out")) > > + (lib (string-append out "/lib"))) > > + ;; newsbeuter looks for libstfl.so.0 > > Perhaps just say "some programs" instead of newsbeuter, since they are > mostly unrelated. > > > + (symlink "libstfl.so" > > + (string-append lib "/libstfl.so.0")))))))) > > + (inputs > > + `(("ncurses" ,ncurses) > > + ("swig" ,swig))) > > Swig should probably be a native-input. Other than that LGTM! > I thought the output referred to swig, but it seems not. > > + (home-page "http://www.clifford.at/stfl/") > > + (synopsis "Structured terminal forms library") > > + (description "Stfl is a library which implements a curses-based widget > > +set for text terminals.") > > + (license lgpl3+))) > > -- > > 2.10.2 -- Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 801 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] gnu: Add stfl. 2016-11-10 17:22 ` Efraim Flashner @ 2016-11-11 10:18 ` Tobias Geerinckx-Rice 2016-11-11 12:15 ` Efraim Flashner 0 siblings, 1 reply; 8+ messages in thread From: Tobias Geerinckx-Rice @ 2016-11-11 10:18 UTC (permalink / raw) To: Efraim Flashner; +Cc: guix-devel Efraim, (A detail:) Efraim Flashner schreef op 2016-11-10 18:22: > "DESTDIR=\"\"") Are those quotes needed to work around some silliness in the Makefile? Otherwise, "DESTDIR=" should work just as well and is easier on the eyes. Kind regards, T G-R ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] gnu: Add stfl. 2016-11-11 10:18 ` Tobias Geerinckx-Rice @ 2016-11-11 12:15 ` Efraim Flashner 0 siblings, 0 replies; 8+ messages in thread From: Efraim Flashner @ 2016-11-11 12:15 UTC (permalink / raw) To: Tobias Geerinckx-Rice; +Cc: guix-devel [-- Attachment #1: Type: text/plain, Size: 795 bytes --] On Fri, Nov 11, 2016 at 11:18:51AM +0100, Tobias Geerinckx-Rice wrote: > Efraim, > > (A detail:) > > Efraim Flashner schreef op 2016-11-10 18:22: > > "DESTDIR=\"\"") > > Are those quotes needed to work around some silliness in the Makefile? > > Otherwise, > > "DESTDIR=" > > should work just as well and is easier on the eyes. > > Kind regards, > > T G-R it tries to install to $DESTDIR${prefix} (or something strange like that), but it turns out that if DESTDIR is left alone it's already empty, so I just took that part out. -- Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 801 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/2] gnu: Add newsbeuter. 2016-11-10 8:27 [PATCH 0/2] Add newsbeuter Efraim Flashner 2016-11-10 8:27 ` [PATCH 1/2] gnu: Add stfl Efraim Flashner @ 2016-11-10 8:27 ` Efraim Flashner 2016-11-10 15:39 ` Marius Bakke 1 sibling, 1 reply; 8+ messages in thread From: Efraim Flashner @ 2016-11-10 8:27 UTC (permalink / raw) To: guix-devel * gnu/packages/rss.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/local.mk | 1 + gnu/packages/rss.scm | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 gnu/packages/rss.scm diff --git a/gnu/local.mk b/gnu/local.mk index b3a4cd5..3a2b7e1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -315,6 +315,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/readline.scm \ %D%/packages/regex.scm \ %D%/packages/rrdtool.scm \ + %D%/packages/rss.scm \ %D%/packages/rsync.scm \ %D%/packages/ruby.scm \ %D%/packages/rush.scm \ diff --git a/gnu/packages/rss.scm b/gnu/packages/rss.scm new file mode 100644 index 0000000..d55672c --- /dev/null +++ b/gnu/packages/rss.scm @@ -0,0 +1,75 @@ +;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. + +(define-module (gnu packages rss) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix download) + #:use-module (guix packages) + #:use-module (guix build-system gnu) + #:use-module (gnu packages curl) + #:use-module (gnu packages databases) + #:use-module (gnu packages gettext) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages ruby) + #:use-module (gnu packages xml) + #:use-module (gnu packages web)) + +(define-public newsbeuter + (package + (name "newsbeuter") + (version "2.9") + (source + (origin + (method url-fetch) + (uri (string-append "http://newsbeuter.org/downloads/newsbeuter-" + version ".tar.gz")) + (sha256 + (base32 + "1j1x0hgwxz11dckk81ncalgylj5y5fgw5bcmp9qb5hq9kc0vza3l")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda _ + (substitute* "config.sh" + ;; ncurses5 was sooo last year + (("ncursesw5") "ncursesw6")) + (substitute* "Makefile" + (("/usr/local") (assoc-ref %outputs "out"))) + #t))) + #:test-target "test")) + (native-inputs + `(("gettext" ,gnu-gettext) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("ruby" ,ruby))) ; for tests + (inputs + `(("curl" ,curl) + ("json-c" ,json-c) + ("ncurses" ,ncurses) + ("stfl" ,stfl) + ("sqlite" ,sqlite) + ("libxml2" ,libxml2))) + (home-page "http://newsbeuter.org/") + (synopsis "Text mode rss feed reader with podcast support") + (description "Newsbeuter is an innovative RSS feed reader for the text +console. It supports OPML import/exports, HTML rendering, podcast (podbeuter), +offline reading, searching and storing articles to your filesystem, and many +more features. Its user interface is coherent, easy to use, and might look +common to users of mutt and slrn.") + (license license:x11))) -- 2.10.2 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] gnu: Add newsbeuter. 2016-11-10 8:27 ` [PATCH 2/2] gnu: Add newsbeuter Efraim Flashner @ 2016-11-10 15:39 ` Marius Bakke 0 siblings, 0 replies; 8+ messages in thread From: Marius Bakke @ 2016-11-10 15:39 UTC (permalink / raw) To: Efraim Flashner, guix-devel [-- Attachment #1: Type: text/plain, Size: 4463 bytes --] Efraim Flashner <efraim@flashner.co.il> writes: > * gnu/packages/rss.scm: New file. > * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. > --- > gnu/local.mk | 1 + > gnu/packages/rss.scm | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 76 insertions(+) > create mode 100644 gnu/packages/rss.scm Perhaps it could be called "syndication.scm" to be slightly more generic. But no strong opinion either way. > diff --git a/gnu/local.mk b/gnu/local.mk > index b3a4cd5..3a2b7e1 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -315,6 +315,7 @@ GNU_SYSTEM_MODULES = \ > %D%/packages/readline.scm \ > %D%/packages/regex.scm \ > %D%/packages/rrdtool.scm \ > + %D%/packages/rss.scm \ > %D%/packages/rsync.scm \ > %D%/packages/ruby.scm \ > %D%/packages/rush.scm \ > diff --git a/gnu/packages/rss.scm b/gnu/packages/rss.scm > new file mode 100644 > index 0000000..d55672c > --- /dev/null > +++ b/gnu/packages/rss.scm > @@ -0,0 +1,75 @@ > +;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> > +;;; > +;;; GNU Guix is free software; you can redistribute it and/or modify it > +;;; under the terms of the GNU General Public License as published by > +;;; the Free Software Foundation; either version 3 of the License, or (at > +;;; your option) any later version. > +;;; > +;;; GNU Guix is distributed in the hope that it will be useful, but > +;;; WITHOUT ANY WARRANTY; without even the implied warranty of > +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +;;; GNU General Public License for more details. > +;;; > +;;; You should have received a copy of the GNU General Public License > +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. > + > +(define-module (gnu packages rss) > + #:use-module ((guix licenses) #:prefix license:) > + #:use-module (guix download) > + #:use-module (guix packages) > + #:use-module (guix build-system gnu) > + #:use-module (gnu packages curl) > + #:use-module (gnu packages databases) > + #:use-module (gnu packages gettext) > + #:use-module (gnu packages ncurses) > + #:use-module (gnu packages perl) > + #:use-module (gnu packages pkg-config) > + #:use-module (gnu packages ruby) > + #:use-module (gnu packages xml) > + #:use-module (gnu packages web)) > + > +(define-public newsbeuter > + (package > + (name "newsbeuter") > + (version "2.9") > + (source > + (origin > + (method url-fetch) > + (uri (string-append "http://newsbeuter.org/downloads/newsbeuter-" > + version ".tar.gz")) > + (sha256 > + (base32 > + "1j1x0hgwxz11dckk81ncalgylj5y5fgw5bcmp9qb5hq9kc0vza3l")))) > + (build-system gnu-build-system) > + (arguments > + '(#:phases > + (modify-phases %standard-phases > + (replace 'configure > + (lambda _ > + (substitute* "config.sh" > + ;; ncurses5 was sooo last year > + (("ncursesw5") "ncursesw6")) > + (substitute* "Makefile" > + (("/usr/local") (assoc-ref %outputs "out"))) Would it work to set: #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out"))) instead? That applies to the previous patch as well. > + #t))) > + #:test-target "test")) > + (native-inputs > + `(("gettext" ,gnu-gettext) > + ("perl" ,perl) > + ("pkg-config" ,pkg-config) > + ("ruby" ,ruby))) ; for tests > + (inputs > + `(("curl" ,curl) > + ("json-c" ,json-c) > + ("ncurses" ,ncurses) > + ("stfl" ,stfl) > + ("sqlite" ,sqlite) > + ("libxml2" ,libxml2))) > + (home-page "http://newsbeuter.org/") https://www.newsbeuter.org/ seems to work. > + (synopsis "Text mode rss feed reader with podcast support") > + (description "Newsbeuter is an innovative RSS feed reader for the text > +console. It supports OPML import/exports, HTML rendering, podcast (podbeuter), > +offline reading, searching and storing articles to your filesystem, and many > +more features. Its user interface is coherent, easy to use, and might look > +common to users of mutt and slrn.") *familiar to users of @command{mutt} and @command{slrn}. > + (license license:x11))) Some files in filter/ are gpl2+. Otherwise LGTM! [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 454 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-11-11 12:15 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-11-10 8:27 [PATCH 0/2] Add newsbeuter Efraim Flashner 2016-11-10 8:27 ` [PATCH 1/2] gnu: Add stfl Efraim Flashner 2016-11-10 15:22 ` Marius Bakke 2016-11-10 17:22 ` Efraim Flashner 2016-11-11 10:18 ` Tobias Geerinckx-Rice 2016-11-11 12:15 ` Efraim Flashner 2016-11-10 8:27 ` [PATCH 2/2] gnu: Add newsbeuter Efraim Flashner 2016-11-10 15:39 ` Marius Bakke
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/guix.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).