From 7ba04443c5a81c60b5df10be9e69607c5308db82 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 19 Jun 2022 22:04:30 +0300 Subject: gnu: sfeed: Update to 1.5. * gnu/packages/suckless.scm (sfeed): Update to 1.5. Signed-off-by: Christopher Baines --- gnu/packages/suckless.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/suckless.scm') diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 5aa37657b9..372eac6ce3 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -1049,7 +1049,7 @@ (define-public sfm (define-public sfeed (package (name "sfeed") - (version "1.1") + (version "1.5") (source (origin (method git-fetch) @@ -1059,7 +1059,7 @@ (define-public sfeed (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1b0l6f9aymk54ncc2kxavhg4flcqv7d4mpkpw8ljx7mzg0g4ygyk")))) + (base32 "1w3xk00nv502q2nr23y1sig7bkqa7f431f4fcaybfcfk7dbv2piq")))) (build-system gnu-build-system) (arguments (list -- cgit v1.2.3 From 1635d39c3c7ea7ee26c6f98d662fb90e8e7fca35 Mon Sep 17 00:00:00 2001 From: Gabriel Wicki Date: Sat, 18 Jun 2022 17:00:16 +0200 Subject: gnu: Add farbfeld. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/suckless.scm (farbfeld): New variable. [use-modules]: Add (gnu packages imagemagick) Signed-off-by: Ludovic Courtès --- gnu/packages/suckless.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu/packages/suckless.scm') diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 372eac6ce3..0607e8f84e 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -39,6 +39,7 @@ (define-module (gnu packages suckless) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages imagemagick) #:use-module (gnu packages libbsd) #:use-module (gnu packages linux) #:use-module (gnu packages mpd) @@ -1084,3 +1085,43 @@ (define-public sfeed various other formats. There are also some programs and scripts included to import and export OPML and to fetch, filter, merge and order feed items.") (license license:isc))) + +(define-public farbfeld + (let ((commit "ab5e3dfc9cdb476218538c6687df9f44826d8f11") (revision "0")) + (package + (name "farbfeld") + (version (git-version "4" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "git://git.suckless.org/farbfeld") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0pkmkvv5ggpzqwqdchd19442x8gh152xy5z1z13ipfznhspsf870")))) + (build-system gnu-build-system) + (inputs (list libpng libjpeg-turbo imagemagick)) + (arguments + (list #:tests? + #f ;no check target + #:make-flags + #~(list (string-append "PREFIX=" + #$output) + (string-append "CC=" + #$(cc-for-target))) + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'patch-2ff + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "2ff" + (("png2ff") (string-append #$output "/bin/png2ff")) + (("jpg2ff") (string-append #$output "/bin/jpg2ff")) + (("convert") (search-input-file inputs "/bin/convert"))))) + (delete 'configure)))) + (synopsis "Image format and conversion tools") + (description + "farbfeld is a lossless image format which is easy to parse, +pipe and compress.") + (home-page "https://git.suckless.org/farbfeld/") + (license license:isc)))) -- cgit v1.2.3 From 344ac798739a8a608ad55a62d344092c3b5e46ca Mon Sep 17 00:00:00 2001 From: Gabriel Wicki Date: Sat, 18 Jun 2022 17:04:12 +0200 Subject: gnu: sent: Add farbfeld to propagated-inputs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/suckless.scm (sent)[propagated-inputs]: Add it. [phases]{patch-farbfeld}: New phase. [inputs]: Add farbfeld. [home-page]: Add trailing slash to fix linter warning. Signed-off-by: Ludovic Courtès --- gnu/packages/suckless.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gnu/packages/suckless.scm') diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 0607e8f84e..f5eb8b43f5 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -520,7 +520,11 @@ (define-public sent (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases - (delete 'configure)) ; no configuration + (delete 'configure) ; no configuration + (add-before 'build 'patch-farbfeld + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "config.def.h" + (("2ff") (search-input-file inputs "/bin/2ff")))))) #:tests? #f ; no test suite #:make-flags (let ((pkg-config (lambda (flag) @@ -534,7 +538,8 @@ (define-public sent (native-inputs (list pkg-config)) (inputs - `(("libpng" ,libpng) + `(("farbfeld" ,farbfeld) + ("libpng" ,libpng) ("libx11" ,libx11) ("libxft" ,libxft) ("fontconfig" ,fontconfig))) @@ -544,7 +549,7 @@ (define-public sent Especially for presentations using the Takahashi method this is very nice and allows you to write down the presentation for a quick lightning talk within a few minutes.") - (home-page "https://tools.suckless.org/sent") + (home-page "https://tools.suckless.org/sent/") (license license:x11))) (define-public wmname -- cgit v1.2.3 From aa2fd99fb1d5fd44811d0dd4e176feaf7a945528 Mon Sep 17 00:00:00 2001 From: Gabriel Wicki Date: Tue, 21 Jun 2022 02:38:40 +0200 Subject: gnu: sent: Apply guix style MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/suckless.scm (sent): Apply `guix style`. Signed-off-by: Ludovic Courtès --- gnu/packages/suckless.scm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'gnu/packages/suckless.scm') diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index f5eb8b43f5..d8c764e901 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -520,31 +520,31 @@ (define-public sent (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases - (delete 'configure) ; no configuration + (delete 'configure) ;no configuration (add-before 'build 'patch-farbfeld (lambda* (#:key inputs #:allow-other-keys) (substitute* "config.def.h" (("2ff") (search-input-file inputs "/bin/2ff")))))) - #:tests? #f ; no test suite + #:tests? #f ;no test suite #:make-flags (let ((pkg-config (lambda (flag) - (string-append - "$(shell pkg-config " flag " " - "xft fontconfig x11 libpng)")))) - (list (string-append "CC=" ,(cc-for-target)) + (string-append "$(shell pkg-config " flag " " + "xft fontconfig x11 libpng)")))) + (list (string-append "CC=" + ,(cc-for-target)) (string-append "PREFIX=" %output) - (string-append "INCS=-I. " (pkg-config "--cflags")) - (string-append "LIBS=" (pkg-config "--libs") " -lm"))))) - (native-inputs - (list pkg-config)) - (inputs - `(("farbfeld" ,farbfeld) - ("libpng" ,libpng) - ("libx11" ,libx11) - ("libxft" ,libxft) - ("fontconfig" ,fontconfig))) + (string-append "INCS=-I. " + (pkg-config "--cflags")) + (string-append "LIBS=" + (pkg-config "--libs") " -lm"))))) + (native-inputs (list pkg-config)) + (inputs `(("farbfeld" ,farbfeld) ("libpng" ,libpng) + ("libx11" ,libx11) + ("libxft" ,libxft) + ("fontconfig" ,fontconfig))) (synopsis "Plain-text presentation tool") - (description "Sent uses plain-text files and PNG images to create slideshow + (description + "Sent uses plain-text files and PNG images to create slideshow presentations. Each paragraph represents a slide in the presentation. Especially for presentations using the Takahashi method this is very nice and allows you to write down the presentation for a quick lightning talk within a -- cgit v1.2.3 From 0f517f16bb8dae70cd1007dc44663617c0ef3689 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 22 Jun 2022 23:15:42 +0200 Subject: gnu: sent: Remove input labels. * gnu/packages/suckless.scm (sent)[inputs]: Remove labels. --- gnu/packages/suckless.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gnu/packages/suckless.scm') diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index d8c764e901..a560f8bc62 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -538,10 +538,7 @@ (define-public sent (string-append "LIBS=" (pkg-config "--libs") " -lm"))))) (native-inputs (list pkg-config)) - (inputs `(("farbfeld" ,farbfeld) ("libpng" ,libpng) - ("libx11" ,libx11) - ("libxft" ,libxft) - ("fontconfig" ,fontconfig))) + (inputs (list farbfeld libpng libx11 libxft fontconfig)) (synopsis "Plain-text presentation tool") (description "Sent uses plain-text files and PNG images to create slideshow -- cgit v1.2.3