* [bug#36410] [PATCH] gnu: Add screenfetch.
@ 2019-06-28 0:42 Jakob L. Kreuze
2019-06-28 5:15 ` swedebugia
2019-07-02 7:18 ` Efraim Flashner
0 siblings, 2 replies; 9+ messages in thread
From: Jakob L. Kreuze @ 2019-06-28 0:42 UTC (permalink / raw)
To: 36410
[-- Attachment #1: Type: text/plain, Size: 3274 bytes --]
* gnu/packages/admin.scm (screenfetch): New variable.
---
gnu/packages/admin.scm | 47 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 3d8c247f57..b920d564e5 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -25,6 +25,7 @@
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Brett Gilio <brettg@posteo.net>
;;; Copyright © 2019 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
+;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -55,6 +56,7 @@
#:use-module (guix build-system python)
#:use-module (guix build-system trivial)
#:use-module (gnu packages)
+ #:use-module (gnu packages algebra)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages check)
@@ -2651,6 +2653,51 @@ used in screenshots to show other users what operating system or distribution
you are running, what theme or icon set you are using, etc.")
(license license:expat)))
+(define-public screenfetch
+ ;; first commit supporting current GuixSD
+ (let ((commit "e3ec82dd464e81e4d10bef218b3016e3044c766c"))
+ (package
+ (name "screenfetch")
+ (version (string-append "3.8.0" "-" (string-take commit 7)))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/KittyKatt/screenFetch")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1lzs1l5xgj9mn4b59lhkfgqnyiivf8svd1iwjabzrax90rdmxfwj"))))
+ (build-system trivial-build-system)
+ (arguments
+ `(#:modules ((guix build utils))
+ #:builder
+ (begin
+ (use-modules (guix build utils))
+ (let ((source (assoc-ref %build-inputs "source")))
+ (mkdir-p (string-append %output "/bin/"))
+ (mkdir-p (string-append %output "/man/man1/"))
+ (copy-file (string-append source "/screenfetch-dev")
+ (string-append %output "/bin/screenfetch"))
+ (copy-file (string-append source "/screenfetch.1")
+ (string-append %output "/man/man1/screenfetch.1"))
+ (substitute* (string-append %output "/bin/screenfetch")
+ (("/usr/bin/env bash")
+ (string-append (assoc-ref %build-inputs "bash")
+ "/bin/bash")))))))
+ (propagated-inputs
+ `(("bash" ,bash)
+ ("bc" ,bc)
+ ("scrot" ,scrot)
+ ("xdpyinfo" ,xdpyinfo)
+ ("xprop" ,xprop)))
+ (home-page "https://github.com/KittyKatt/screenFetch")
+ (synopsis "System information script")
+ (description "Bash screenshot information tool which can be used to
+generate those nifty terminal theme information and ASCII distribution logos in
+everyone's screenshots nowadays.")
+ (license license:gpl3))))
+
(define-public nnn
(package
(name "nnn")
--
2.22.0
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply related [flat|nested] 9+ messages in thread* [bug#36410] [PATCH] gnu: Add screenfetch.
2019-06-28 0:42 [bug#36410] [PATCH] gnu: Add screenfetch Jakob L. Kreuze
@ 2019-06-28 5:15 ` swedebugia
2019-06-28 14:00 ` Jakob L. Kreuze
2019-07-02 7:18 ` Efraim Flashner
1 sibling, 1 reply; 9+ messages in thread
From: swedebugia @ 2019-06-28 5:15 UTC (permalink / raw)
To: 36410
On 2019-06-28 02:42, Jakob L. Kreuze wrote:
> * gnu/packages/admin.scm (screenfetch): New variable.
> ---
> gnu/packages/admin.scm | 47 ++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 47 insertions(+)
>
> diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
> index 3d8c247f57..b920d564e5 100644
> --- a/gnu/packages/admin.scm
> +++ b/gnu/packages/admin.scm
> @@ -25,6 +25,7 @@
> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
> ;;; Copyright © 2019 Brett Gilio <brettg@posteo.net>
> ;;; Copyright © 2019 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
> +;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -55,6 +56,7 @@
> #:use-module (guix build-system python)
> #:use-module (guix build-system trivial)
> #:use-module (gnu packages)
> + #:use-module (gnu packages algebra)
> #:use-module (gnu packages base)
> #:use-module (gnu packages bash)
> #:use-module (gnu packages check)
> @@ -2651,6 +2653,51 @@ used in screenshots to show other users what operating system or distribution
> you are running, what theme or icon set you are using, etc.")
> (license license:expat)))
>
> +(define-public screenfetch
> + ;; first commit supporting current GuixSD
> + (let ((commit "e3ec82dd464e81e4d10bef218b3016e3044c766c"))
> + (package
> + (name "screenfetch")
> + (version (string-append "3.8.0" "-" (string-take commit 7)))
> + (source (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/KittyKatt/screenFetch")
> + (commit commit)))
> + (file-name (git-file-name name version))
> + (sha256
> + (base32
> + "1lzs1l5xgj9mn4b59lhkfgqnyiivf8svd1iwjabzrax90rdmxfwj"))))
> + (build-system trivial-build-system)
> + (arguments
> + `(#:modules ((guix build utils))
> + #:builder
> + (begin
> + (use-modules (guix build utils))
> + (let ((source (assoc-ref %build-inputs "source")))
> + (mkdir-p (string-append %output "/bin/"))
> + (mkdir-p (string-append %output "/man/man1/"))
> + (copy-file (string-append source "/screenfetch-dev")
> + (string-append %output "/bin/screenfetch"))
> + (copy-file (string-append source "/screenfetch.1")
> + (string-append %output "/man/man1/screenfetch.1"))
> + (substitute* (string-append %output "/bin/screenfetch")
> + (("/usr/bin/env bash")
> + (string-append (assoc-ref %build-inputs "bash")
> + "/bin/bash")))))))
> + (propagated-inputs
> + `(("bash" ,bash)
> + ("bc" ,bc)
> + ("scrot" ,scrot)
> + ("xdpyinfo" ,xdpyinfo)
> + ("xprop" ,xprop)))
> + (home-page "https://github.com/KittyKatt/screenFetch")
> + (synopsis "System information script")
> + (description "Bash screenshot information tool which can be used to
> +generate those nifty terminal theme information and ASCII distribution logos in
> +everyone's screenshots nowadays.")
> + (license license:gpl3))))
gpl3+
Could you ask upstream to release a version we can track?
Otherwise LGTM.
--
Cheers Swedebugia
^ permalink raw reply [flat|nested] 9+ messages in thread* [bug#36410] [PATCH] gnu: Add screenfetch.
2019-06-28 0:42 [bug#36410] [PATCH] gnu: Add screenfetch Jakob L. Kreuze
2019-06-28 5:15 ` swedebugia
@ 2019-07-02 7:18 ` Efraim Flashner
2019-07-02 16:07 ` Jakob L. Kreuze
1 sibling, 1 reply; 9+ messages in thread
From: Efraim Flashner @ 2019-07-02 7:18 UTC (permalink / raw)
To: Jakob L. Kreuze; +Cc: 36410
[-- Attachment #1: Type: text/plain, Size: 4050 bytes --]
On Thu, Jun 27, 2019 at 08:42:14PM -0400, Jakob L. Kreuze wrote:
> * gnu/packages/admin.scm (screenfetch): New variable.
> ---
> gnu/packages/admin.scm | 47 ++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 47 insertions(+)
>
> diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
> index 3d8c247f57..b920d564e5 100644
> --- a/gnu/packages/admin.scm
> +++ b/gnu/packages/admin.scm
> @@ -25,6 +25,7 @@
> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
> ;;; Copyright © 2019 Brett Gilio <brettg@posteo.net>
> ;;; Copyright © 2019 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
> +;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -55,6 +56,7 @@
> #:use-module (guix build-system python)
> #:use-module (guix build-system trivial)
> #:use-module (gnu packages)
> + #:use-module (gnu packages algebra)
> #:use-module (gnu packages base)
> #:use-module (gnu packages bash)
> #:use-module (gnu packages check)
> @@ -2651,6 +2653,51 @@ used in screenshots to show other users what operating system or distribution
> you are running, what theme or icon set you are using, etc.")
> (license license:expat)))
>
> +(define-public screenfetch
> + ;; first commit supporting current GuixSD
> + (let ((commit "e3ec82dd464e81e4d10bef218b3016e3044c766c"))
> + (package
> + (name "screenfetch")
> + (version (string-append "3.8.0" "-" (string-take commit 7)))
> + (source (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/KittyKatt/screenFetch")
> + (commit commit)))
> + (file-name (git-file-name name version))
> + (sha256
> + (base32
> + "1lzs1l5xgj9mn4b59lhkfgqnyiivf8svd1iwjabzrax90rdmxfwj"))))
> + (build-system trivial-build-system)
> + (arguments
> + `(#:modules ((guix build utils))
> + #:builder
> + (begin
> + (use-modules (guix build utils))
> + (let ((source (assoc-ref %build-inputs "source")))
> + (mkdir-p (string-append %output "/bin/"))
> + (mkdir-p (string-append %output "/man/man1/"))
> + (copy-file (string-append source "/screenfetch-dev")
> + (string-append %output "/bin/screenfetch"))
> + (copy-file (string-append source "/screenfetch.1")
> + (string-append %output "/man/man1/screenfetch.1"))
If 'install-file' works here then the above 6 lines can be 2, something
like:
(install-file (string-append source "/screenfetch.1")
(string-append %output "/man/man1/"))
> + (substitute* (string-append %output "/bin/screenfetch")
> + (("/usr/bin/env bash")
> + (string-append (assoc-ref %build-inputs "bash")
> + "/bin/bash")))))))
you can use the patch-shebang function here, should help a bit.
> + (propagated-inputs
> + `(("bash" ,bash)
> + ("bc" ,bc)
> + ("scrot" ,scrot)
> + ("xdpyinfo" ,xdpyinfo)
> + ("xprop" ,xprop)))
Ideally these should wrap the binary rather than being propagated.
> + (home-page "https://github.com/KittyKatt/screenFetch")
> + (synopsis "System information script")
> + (description "Bash screenshot information tool which can be used to
> +generate those nifty terminal theme information and ASCII distribution logos in
> +everyone's screenshots nowadays.")
> + (license license:gpl3))))
> +
> (define-public nnn
> (package
> (name "nnn")
> --
> 2.22.0
>
--
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: 833 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread* [bug#36410] [PATCH] gnu: Add screenfetch.
2019-07-02 7:18 ` Efraim Flashner
@ 2019-07-02 16:07 ` Jakob L. Kreuze
2019-09-05 12:06 ` Efraim Flashner
0 siblings, 1 reply; 9+ messages in thread
From: Jakob L. Kreuze @ 2019-07-02 16:07 UTC (permalink / raw)
To: Efraim Flashner; +Cc: 36410
[-- Attachment #1: Type: text/plain, Size: 1158 bytes --]
Hi Efraim,
Efraim Flashner <efraim@flashner.co.il> writes:
> If 'install-file' works here then the above 6 lines can be 2, something
> like:
> (install-file (string-append source "/screenfetch.1")
> (string-append %output "/man/man1/"))
That's certainly much clearer. Would it make sense to do the same for
'screenfetch-dev', renaming the file after copying it with
'install-file'? Or, should a '#:rename' keyword be added to
'install-file', perhaps? I don't know if it would be a useful pattern or
not, but it's an easy addition and I'd be happy to submit a separate
patch if there's any interest.
> you can use the patch-shebang function here, should help a bit.
Thanks, that seems to be just one of many hidden gems in '(guix build
utils)'. I should really skim through that whole file at some point,
these procedures would definitely make packaging much easier.
> Ideally these should wrap the binary rather than being propagated.
I'm a bit unsure as to what you mean. Should I patch the screenfetch
script to use absolute paths for the binaries of these inputs? I.e.
patch 'bc' to '/gnu/store/...-bc-1.07.1/bin/bc'?
Regards,
Jakob
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#36410] [PATCH] gnu: Add screenfetch.
2019-07-02 16:07 ` Jakob L. Kreuze
@ 2019-09-05 12:06 ` Efraim Flashner
2019-09-23 16:08 ` bug#36410: " Efraim Flashner
0 siblings, 1 reply; 9+ messages in thread
From: Efraim Flashner @ 2019-09-05 12:06 UTC (permalink / raw)
To: Jakob L. Kreuze; +Cc: 36410
[-- Attachment #1: Type: text/plain, Size: 1875 bytes --]
I'm sorry, this one fell through the cracks and I forgot about it.
On Tue, Jul 02, 2019 at 12:07:31PM -0400, Jakob L. Kreuze wrote:
> Hi Efraim,
>
> Efraim Flashner <efraim@flashner.co.il> writes:
>
> > If 'install-file' works here then the above 6 lines can be 2, something
> > like:
> > (install-file (string-append source "/screenfetch.1")
> > (string-append %output "/man/man1/"))
>
> That's certainly much clearer. Would it make sense to do the same for
> 'screenfetch-dev', renaming the file after copying it with
> 'install-file'? Or, should a '#:rename' keyword be added to
> 'install-file', perhaps? I don't know if it would be a useful pattern or
> not, but it's an easy addition and I'd be happy to submit a separate
> patch if there's any interest.
>
I think since we want to rename it anyway I wouldn't bother with
'install-file' for screenfetch-dev.
> > you can use the patch-shebang function here, should help a bit.
>
> Thanks, that seems to be just one of many hidden gems in '(guix build
> utils)'. I should really skim through that whole file at some point,
> these procedures would definitely make packaging much easier.
>
> > Ideally these should wrap the binary rather than being propagated.
>
> I'm a bit unsure as to what you mean. Should I patch the screenfetch
> script to use absolute paths for the binaries of these inputs? I.e.
> patch 'bc' to '/gnu/store/...-bc-1.07.1/bin/bc'?
I found an example of what I was thinking of in (gnu packages
dictionaries), with translate-shell. The function itself is called
'wrap-program'.
Can you send an updated patch?
thanks
--
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: 833 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2019-10-05 8:21 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-28 0:42 [bug#36410] [PATCH] gnu: Add screenfetch Jakob L. Kreuze
2019-06-28 5:15 ` swedebugia
2019-06-28 14:00 ` Jakob L. Kreuze
2019-07-02 7:18 ` Efraim Flashner
2019-07-02 16:07 ` Jakob L. Kreuze
2019-09-05 12:06 ` Efraim Flashner
2019-09-23 16:08 ` bug#36410: " Efraim Flashner
2019-09-28 20:48 ` [bug#36410] " Jakob L. Kreuze
2019-10-05 8:19 ` Jakob L. Kreuze
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).