unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#38480] [PATCH] gnu: Add lolcat
@ 2019-12-04  1:46 Leo Prikler
  2019-12-04  3:00 ` Brett Gilio
  0 siblings, 1 reply; 6+ messages in thread
From: Leo Prikler @ 2019-12-04  1:46 UTC (permalink / raw)
  To: 38480

* gnu/packages/games.scm (lolcat): New package.
---
 gnu/packages/games.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 8dd08844ee..b15016e4bb 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -498,6 +498,47 @@ cows can think too: all you have to do is run @command{cowthink}.  If you're
 tired of cows, a variety of other ASCII-art messengers are available.")
     (license license:gpl3+)))
 
+(define-public lolcat
+  (let ((commit "35dca3d0a381496d7195cd78f5b24aa7b62f2154")
+        (revision "0"))
+    (package
+      (name "lolcat")
+      (version (git-version "1.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/jaseg/lolcat.git")
+               (commit commit)))
+         (sha256
+          (base32
+           "0jjbkqcc2ikjxd1xgdyv4rb0vsw218181h89f2ywg29ffs3ypd8g"))
+         (file-name (git-file-name name version))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:tests? #f ;; tests don't exist
+         #:make-flags (list "CC=gcc")
+         #:phases
+         (modify-phases %standard-phases
+           (delete 'bootstrap)
+           (delete 'configure)
+           (replace 'install
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let ((dest (map (lambda (path) (string-append path "/bin"))
+                                (list (assoc-ref outputs "out")
+                                      (assoc-ref outputs "censor")))))
+                 (for-each mkdir-p dest)
+                 (install-file "lolcat" (car dest))
+                 (install-file "censor" (cadr dest))
+                 #t))))))
+      (outputs (list "out" "censor"))
+      (home-page "https://github.com/jaseg/lolcat")
+      (synopsis "Rainbow coloring effect for text console display")
+      (description "Lolcat concatenates files and streams like regular cat,
+but it also adds terminal escape codes between characters and lines resulting
+in a rainbow effect.")
+      (license license:wtfpl2))))
+
 (define-public freedoom
   (package
     (name "freedoom")
-- 
2.24.0

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [bug#38480] [PATCH] gnu: Add lolcat
  2019-12-04  1:46 [bug#38480] [PATCH] gnu: Add lolcat Leo Prikler
@ 2019-12-04  3:00 ` Brett Gilio
  2019-12-05 17:41   ` Leo Prikler
  0 siblings, 1 reply; 6+ messages in thread
From: Brett Gilio @ 2019-12-04  3:00 UTC (permalink / raw)
  To: Leo Prikler; +Cc: 38480

Leo Prikler <leo.prikler@student.tugraz.at> writes:

> +       `(#:tests? #f ;; tests don't exist

LGTM! Though, perhaps an aesthetic issue. I usually prefer (and see)
"no check target". Carry on!

-- 
Brett M. Gilio
https://git.sr.ht/~brettgilio/

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [bug#38480] [PATCH] gnu: Add lolcat
  2019-12-04  3:00 ` Brett Gilio
@ 2019-12-05 17:41   ` Leo Prikler
  2019-12-14 23:28     ` Ludovic Courtès
  0 siblings, 1 reply; 6+ messages in thread
From: Leo Prikler @ 2019-12-05 17:41 UTC (permalink / raw)
  To: Brett Gilio; +Cc: 38480

[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

Hi Brett,

Am Dienstag, den 03.12.2019, 21:00 -0600 schrieb Brett Gilio:
> Leo Prikler <leo.prikler@student.tugraz.at> writes:
> 
> > +       `(#:tests? #f ;; tests don't exist
> 
> LGTM! Though, perhaps an aesthetic issue. I usually prefer (and see)
> "no check target". Carry on!
Fair enough, I've adapted the patch.

Regards,
Leo

[-- Attachment #2: 0001-gnu-Add-lolcat.patch --]
[-- Type: text/x-patch, Size: 2370 bytes --]

From: Leo Prikler <leo.prikler@student.tugraz.at>
Date: Wed,  4 Dec 2019 02:46:44 +0100
Subject: [PATCH] gnu: Add lolcat

* gnu/packages/games.scm (lolcat): New package.
---
 gnu/packages/games.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 8dd08844ee..b15016e4bb 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -498,6 +498,47 @@ cows can think too: all you have to do is run @comma=
nd{cowthink}.  If you're
 tired of cows, a variety of other ASCII-art messengers are available.")
     (license license:gpl3+)))

+(define-public lolcat
+  (let ((commit "35dca3d0a381496d7195cd78f5b24aa7b62f2154")
+        (revision "0"))
+    (package
+      (name "lolcat")
+      (version (git-version "1.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/jaseg/lolcat.git")
+               (commit commit)))
+         (sha256
+          (base32
+           "0jjbkqcc2ikjxd1xgdyv4rb0vsw218181h89f2ywg29ffs3ypd8g"))
+         (file-name (git-file-name name version))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:tests? #f ;; no check target
+         #:make-flags (list "CC=gcc")
+         #:phases
+         (modify-phases %standard-phases
+           (delete 'bootstrap)
+           (delete 'configure)
+           (replace 'install
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let ((dest (map (lambda (path) (string-append path "/bin"))
+                                (list (assoc-ref outputs "out")
+                                      (assoc-ref outputs "censor")))))
+                 (for-each mkdir-p dest)
+                 (install-file "lolcat" (car dest))
+                 (install-file "censor" (cadr dest))
+                 #t))))))
+      (outputs (list "out" "censor"))
+      (home-page "https://github.com/jaseg/lolcat")
+      (synopsis "Rainbow coloring effect for text console display")
+      (description "Lolcat concatenates files and streams like regular cat,
+but it also adds terminal escape codes between characters and lines resulting
+in a rainbow effect.")
+      (license license:wtfpl2))))
+
 (define-public freedoom
   (package
     (name "freedoom")
--
2.24.0

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [bug#38480] [PATCH] gnu: Add lolcat
  2019-12-05 17:41   ` Leo Prikler
@ 2019-12-14 23:28     ` Ludovic Courtès
  2019-12-15  0:10       ` Leo Prikler
  0 siblings, 1 reply; 6+ messages in thread
From: Ludovic Courtès @ 2019-12-14 23:28 UTC (permalink / raw)
  To: Leo Prikler; +Cc: 38480, Brett Gilio

Hello!

Leo Prikler <leo.prikler@student.tugraz.at> skribis:

> From: Leo Prikler <leo.prikler@student.tugraz.at>
> Date: Wed,  4 Dec 2019 02:46:44 +0100
> Subject: [PATCH] gnu: Add lolcat
>
> * gnu/packages/games.scm (lolcat): New package.

[...]

> +           (replace 'install
> +             (lambda* (#:key outputs #:allow-other-keys)
> +               (let ((dest (map (lambda (path) (string-append path "/bin"))
> +                                (list (assoc-ref outputs "out")
> +                                      (assoc-ref outputs "censor")))))
> +                 (for-each mkdir-p dest)
> +                 (install-file "lolcat" (car dest))
> +                 (install-file "censor" (cadr dest))
> +                 #t))))))
> +      (outputs (list "out" "censor"))

Can’t we keep them both in the same output?  Separate outputs are
normally only used when it helps save space, but I don’t think that’s a
concern here.  :-)

> +      (home-page "https://github.com/jaseg/lolcat")
> +      (synopsis "Rainbow coloring effect for text console display")
> +      (description "Lolcat concatenates files and streams like regular cat,
                       ^                                                  ^
Maybe @command{cat} and @command{lolcat}.

Could you send an updated patch?

Thanks,
Ludo’.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [bug#38480] [PATCH] gnu: Add lolcat
  2019-12-14 23:28     ` Ludovic Courtès
@ 2019-12-15  0:10       ` Leo Prikler
  2019-12-15 20:59         ` bug#38480: " Ludovic Courtès
  0 siblings, 1 reply; 6+ messages in thread
From: Leo Prikler @ 2019-12-15  0:10 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: 38480, Brett Gilio

[-- Attachment #1: Type: text/plain, Size: 1780 bytes --]

Hello!

Am Sonntag, den 15.12.2019, 00:28 +0100 schrieb Ludovic Courtès:
> Hello!
> 
> Leo Prikler <leo.prikler@student.tugraz.at> skribis:
> 
> > From: Leo Prikler <leo.prikler@student.tugraz.at>
> > Date: Wed,  4 Dec 2019 02:46:44 +0100
> > Subject: [PATCH] gnu: Add lolcat
> > 
> > * gnu/packages/games.scm (lolcat): New package.
> 
> [...]
> 
> > +           (replace 'install
> > +             (lambda* (#:key outputs #:allow-other-keys)
> > +               (let ((dest (map (lambda (path) (string-append path
> > "/bin"))
> > +                                (list (assoc-ref outputs "out")
> > +                                      (assoc-ref outputs
> > "censor")))))
> > +                 (for-each mkdir-p dest)
> > +                 (install-file "lolcat" (car dest))
> > +                 (install-file "censor" (cadr dest))
> > +                 #t))))))
> > +      (outputs (list "out" "censor"))
> 
> Can’t we keep them both in the same output?  Separate outputs are
> normally only used when it helps save space, but I don’t think that’s
> a
> concern here.  :-)
Of course we can.  I initially separated them, because it's really two
very different programs put into one git repo, but of course the
separation serves no real purpose.

> > +      (home-page "https://github.com/jaseg/lolcat")
> > +      (synopsis "Rainbow coloring effect for text console
> > display")
> > +      (description "Lolcat concatenates files and streams like
> > regular cat,
>                        ^                                             
>      ^
> Maybe @command{cat} and @command{lolcat}.
Not sure about @command{lolcat}, since it's at the start of the
sentence, but okay.

> Could you send an updated patch?
> 
> Thanks,
> Ludo’.
Patch is attached.

Regards,
Leo

[-- Attachment #2: 0001-gnu-Add-lolcat.patch --]
[-- Type: text/x-patch, Size: 2233 bytes --]

From 42827748e50fe20fdf23ff1137067a7d6c80c87e Mon Sep 17 00:00:00 2001
From: Leo Prikler <leo.prikler@student.tugraz.at>
Date: Wed, 4 Dec 2019 02:46:44 +0100
Subject: [PATCH] gnu: Add lolcat

* gnu/packages/games.scm (lolcat): New package.
---
 gnu/packages/games.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index ded27c1f63..1f08dd240a 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -502,6 +502,44 @@ cows can think too: all you have to do is run @command{cowthink}.  If you're
 tired of cows, a variety of other ASCII-art messengers are available.")
     (license license:gpl3+)))
 
+(define-public lolcat
+  (let ((commit "35dca3d0a381496d7195cd78f5b24aa7b62f2154")
+        (revision "0"))
+    (package
+      (name "lolcat")
+      (version (git-version "1.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/jaseg/lolcat.git")
+               (commit commit)))
+         (sha256
+          (base32
+           "0jjbkqcc2ikjxd1xgdyv4rb0vsw218181h89f2ywg29ffs3ypd8g"))
+         (file-name (git-file-name name version))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:tests? #f ;; no check target
+         #:make-flags (list "CC=gcc")
+         #:phases
+         (modify-phases %standard-phases
+           (delete 'bootstrap)
+           (delete 'configure)
+           (replace 'install
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let ((dest (string-append path "/bin")))
+                 (mkdir-p dest)
+                 (install-file "lolcat" dest)
+                 #t))))))
+      (outputs (list "out" "censor"))
+      (home-page "https://github.com/jaseg/lolcat")
+      (synopsis "Rainbow coloring effect for text console display")
+      (description "@command{lolcat} concatenates files and streams like
+regular @command{cat}, but it also adds terminal escape codes between
+characters and lines resulting in a rainbow effect.")
+      (license license:wtfpl2))))
+
 (define-public freedoom
   (package
     (name "freedoom")
-- 
2.24.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* bug#38480: [PATCH] gnu: Add lolcat
  2019-12-15  0:10       ` Leo Prikler
@ 2019-12-15 20:59         ` Ludovic Courtès
  0 siblings, 0 replies; 6+ messages in thread
From: Ludovic Courtès @ 2019-12-15 20:59 UTC (permalink / raw)
  To: Leo Prikler; +Cc: 38480-done, Brett Gilio

[-- Attachment #1: Type: text/plain, Size: 422 bytes --]

Hi!

Leo Prikler <leo.prikler@student.tugraz.at> skribis:

> From 42827748e50fe20fdf23ff1137067a7d6c80c87e Mon Sep 17 00:00:00 2001
> From: Leo Prikler <leo.prikler@student.tugraz.at>
> Date: Wed, 4 Dec 2019 02:46:44 +0100
> Subject: [PATCH] gnu: Add lolcat
>
> * gnu/packages/games.scm (lolcat): New package.

I made the changes below to make it work with a single output.

Committed, thanks!

Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 930 bytes --]

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 1f08dd240a..c8d671bbdc 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -528,11 +528,12 @@ tired of cows, a variety of other ASCII-art messengers are available.")
            (delete 'configure)
            (replace 'install
              (lambda* (#:key outputs #:allow-other-keys)
-               (let ((dest (string-append path "/bin")))
+               (let* ((out  (assoc-ref outputs "out"))
+                      (dest (string-append out "/bin")))
                  (mkdir-p dest)
                  (install-file "lolcat" dest)
+                 (install-file "censor" dest)
                  #t))))))
-      (outputs (list "out" "censor"))
       (home-page "https://github.com/jaseg/lolcat")
       (synopsis "Rainbow coloring effect for text console display")
       (description "@command{lolcat} concatenates files and streams like

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2019-12-15 21:00 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-04  1:46 [bug#38480] [PATCH] gnu: Add lolcat Leo Prikler
2019-12-04  3:00 ` Brett Gilio
2019-12-05 17:41   ` Leo Prikler
2019-12-14 23:28     ` Ludovic Courtès
2019-12-15  0:10       ` Leo Prikler
2019-12-15 20:59         ` bug#38480: " Ludovic Courtès

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).