[PATCH] gnu: Add shell-color-scripts

  • Open
  • quality assurance status badge
Details
2 participants
  • Maxime Devos
  • phodina
Owner
unassigned
Submitted by
phodina
Severity
normal
P
P
phodina wrote on 8 Aug 2021 13:50
(name . guix-patches@gnu.org)(address . guix-patches@gnu.org)
j8v3TScCyT2ee_PoedHUN88Wwq32xEEoM11Asud9wWugE58sgw1tSxrWz7rtR9O-rJjZyZDk5xP7LkTJFLkwn8ZQgj9rFI75SGEsb8D3cw4=@protonmail.com
* gnu/packages/terminals.scm (shell-color-scripts): New variable.

Toggle diff (57 lines)
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 9377e5622b..c2028956fd 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -25,6 +25,7 @@
;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
;;; Copyright © 2021 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; Copyright © 2021 Raphaël Mélotte <raphael.melotte@mind.be>
+;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -45,6 +46,7 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system cargo)
#:use-module (guix build-system cmake)
+ #:use-module (guix build-system copy)
#:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system go)
@@ -766,6 +768,36 @@ It's a terminal emulator with few dependencies, so you don't need a full GNOME
desktop installed to have a decent terminal emulator.")
(license license:gpl2)))

+(define-public shell-color-scripts
+ (package
+ (name "colorscript")
+ (version "3dbdfac24bb629238fdc3e1c8909e2c8577f8735") ; no tags
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/dwt1/shell-color-scripts")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0lkiz6fkrqryr1vh0lh067q7hp8ba8887pkk8caipqphjswp2z16"))))
+ (build-system copy-build-system)
+ (arguments
+ `(#:install-plan '(("colorscript.sh" "bin/colorscript.sh")
+ ("colorscripts" "colorscripts"))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-colorscipts-location
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "colorscript.sh"
+ (("/opt/shell-color-scripts/colorscripts")
+ (string-append (assoc-ref outputs "out") "/colorscripts"))))))))
+ (inputs `(("ncurses" ,ncurses)))
+ (synopsis "Collection of terminal color scripts")
+ (description "Collection of terminal color scripts")
+ (home-page "https://gitlab.com/dwt1/shell-color-scripts")
+ (license license:expat))) ; MIT
+
(define-public go-github.com-nsf-termbox-go
(let ((commit "288510b9734e30e7966ec2f22b87c5f8e67345e3")
(revision "1"))
--
2.32.0
P
P
phodina wrote on 18 Sep 2021 10:09
Patch status
(name . 49942@debbugs.gnu.org)(address . 49942@debbugs.gnu.org)
rXN_KFHHIhVD7i1DFAqfffLYODOAmIBUBsHXi_NkjnVeDLInIhYF7esDwSeaBsxiscg3UoHuUvND4PuwIHWzr5roOglA8wApPofqE9OdLTI=@protonmail.com
Hi!
Is there anything to be improved to upstream this patch?
Attachment: file
M
M
Maxime Devos wrote on 18 Sep 2021 15:09
Re: [bug#49942] [PATCH] gnu: Add shell-color-scripts
975a441334b97bb04d18e2fc39f98d1cfffa5ccc.camel@telenet.be
Hi,

Toggle quote (26 lines)
> +(define-public shell-color-scripts
> + (package
> + (name "colorscript")
> + (version "3dbdfac24bb629238fdc3e1c8909e2c8577f8735") ; no tags
> + (source (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://gitlab.com/dwt1/shell-color-scripts")
> + (commit version)))
> + (file-name (git-file-name name version))
> + (sha256
> + (base32
> + "0lkiz6fkrqryr1vh0lh067q7hp8ba8887pkk8caipqphjswp2z16"))))
> + (build-system copy-build-system)
> + (arguments
> + `(#:install-plan '(("colorscript.sh" "bin/colorscript.sh")
> + ("colorscripts" "colorscripts"))
> + #:phases
> + (modify-phases %standard-phases
> + (add-after 'unpack 'fix-colorscipts-location
> + (lambda* (#:key outputs #:allow-other-keys)
> + (substitute* "colorscript.sh"
> + (("/opt/shell-color-scripts/colorscripts")
> + (string-append (assoc-ref outputs "out") "/colorscripts"))))))))
> + (inputs `(("ncurses" ,ncurses)))

Missing: 'awk', 'sed' and 'coreugils'.
The colorscript.sh needs some ‘absolutification’, e.g. using 'substitute*',
to refer to awk, sed, tr, wc ... by their absolute path instead of using
whatever is in the profile.

Some script in ‘colorscripts’ may need changes as well

Toggle quote (5 lines)
> + (synopsis "Collection of terminal color scripts")
> + (description "Collection of terminal color scripts")
> + (home-page "https://gitlab.com/dwt1/shell-color-scripts")
> + (license license:expat))) ; MIT

"; MIT" isn't necessary, as license:expat is unambigious,
whereas MIT is sometimes used for the X11 license and can theoretically
refer to any license ever used by MIT. (Though in practice ‘the MIT license’
either refers to the X11 or the expat license.)

Greetings,
Maxime
-----BEGIN PGP SIGNATURE-----

iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYUXk9BccbWF4aW1lZGV2
b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7nd7AP4uN4dHRnXPYsyp2Pr/3Mrfrygi
sFQc4fYpLeITbbZVVgEA323KLu18QmzeGZpo3V26rYIJYD2aR93k1Tx3RoxEYAM=
=YkUX
-----END PGP SIGNATURE-----


P
P
phodina wrote on 18 Sep 2021 16:10
[PATCH v2] gnu: Add shell-color-scripts.
(name . Maxime Devos)(address . maximedevos@telenet.be)(address . 49942@debbugs.gnu.org)
8r1GXqISfNJpN9TzGPo7yBAkgpq6gthRXhZYLjQkU-kWQkNvdsDZ-uXem9rTlugAAVzJLZ9zzmeaBioQzUdY8GSN1o3Tu3pwlofd6ccxTD4=@protonmail.com
Hi Maxime,

thanks for hints on improvements!

Toggle snippet (100 lines)
* gnu/packages/terminals.scm (shell-color-scripts): New variable.

diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index de9bec9e66..d7e3199606 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -27,6 +27,7 @@
;;; Copyright © 2021 Raphaël Mélotte <raphael.melotte@mind.be>
;;; Copyright © 2021 ikasero <ahmed@ikasero.com>
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
+;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -47,6 +48,7 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system cargo)
#:use-module (guix build-system cmake)
+ #:use-module (guix build-system copy)
#:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system go)
@@ -58,6 +60,7 @@
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
+ #:use-module (gnu packages base)
#:use-module (gnu packages build-tools) ;for meson-0.55
#:use-module (gnu packages check)
#:use-module (gnu packages cmake)
@@ -69,6 +72,7 @@
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages fribidi)
+ #:use-module (gnu packages gawk)
#:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl)
@@ -810,6 +814,57 @@ It's a terminal emulator with few dependencies, so you don't need a full GNOME
desktop installed to have a decent terminal emulator.")
(license license:gpl2)))

+(define-public shell-color-scripts
+ (let ((commit "3dbdfac24bb629238fdc3e1c8909e2c8577f8735")
+ (revision "1"))
+ (package
+ (name "colorscript")
+ (version commit)
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.com/dwt1/shell-color-scripts")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0lkiz6fkrqryr1vh0lh067q7hp8ba8887pkk8caipqphjswp2z16"))))
+ (build-system copy-build-system)
+ (arguments
+ `(#:install-plan '(("colorscript.sh" "bin/colorscript.sh")
+ ("colorscripts" "colorscripts"))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-colorscipts-location
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "colorscript.sh"
+ (("/opt/shell-color-scripts/colorscripts")
+ (string-append (assoc-ref outputs "out") "/colorscripts"))
+ (("sed") (string-append
+ (assoc-ref %build-inputs "sed") "/bin/sed"))
+ (("awk") (string-append
+ (assoc-ref %build-inputs "gawk") "/bin/awk"))
+ (("wc") (string-append
+ (assoc-ref %build-inputs "coreutils") "/bin/wc"))
+ (("nl") (string-append
+ (assoc-ref %build-inputs "coreutils") "/bin/nl"))
+ (("cut") (string-append
+ (assoc-ref %build-inputs "coreutils") "/bin/cut"))
+ (("echo") (string-append
+ (assoc-ref %build-inputs "coreutils") "/bin/echo"))
+ (("printf") (string-append
+ (assoc-ref %build-inputs "coreutils") "/bin/printf"))
+ (("tr") (string-append
+ (assoc-ref %build-inputs "coreutils") "/bin/tr"))))))))
+ (inputs `(("ncurses" ,ncurses)
+ ("gawk" ,gawk)
+ ("sed" ,sed)
+ ("coreutils" ,coreutils)))
+ (synopsis "Collection of terminal color scripts")
+ (description "Collection of terminal color scripts")
+ (home-page "https://gitlab.com/dwt1/shell-color-scripts")
+ (license license:expat))))
+
(define-public go-github.com-nsf-termbox-go
(let ((commit "288510b9734e30e7966ec2f22b87c5f8e67345e3")
(revision "1"))
--
2.32.0
?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 49942@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 49942
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch