[bug#61468] [PATCH] gnu: cat-avatar-generator: Update to 2.

[bug#61468] [PATCH] gnu: cat-avatar-generator: Update to 2.

[Evgeny Pisemsky]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-gnu-cat-avatar-generator-Update-to-2.patch --]
[-- Type: text/x-patch, Size: 1509 bytes --]

From 7b45846379b9ef03ae578d2588a8113923a47c7b Mon Sep 17 00:00:00 2001
From: Evgeny Pisemsky <evgeny@pisemsky.com>
Date: Mon, 13 Feb 2023 06:30:15 +0300
Subject: [PATCH] gnu: cat-avatar-generator: Update to 2.

* gnu/packages/web.scm (cat-avatar-generator): Update to 2.
---
 gnu/packages/web.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index a2c4709855..0bf4e6c423 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -7681,16 +7681,16 @@ (define-public geomyidae
 (define-public cat-avatar-generator
   (package
     (name "cat-avatar-generator")
-    (version "1")
+    (version "2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://framagit.org/Deevad/cat-avatar-generator.git")
-                     (commit "71c0c662742cafe8afd2d2d50ec84243113e35ad")))
+                    (url "https://framagit.org/Deevad/cat-avatar-generator.git")
+                    (commit "9360ea33f79d1dad3e43494b09878b5e3f6b41fa")))
               (file-name (string-append name "-" version))
               (sha256
                (base32
-                "0s7b5whqsmfa57prbgl66ym551kg6ly0z14h5dgrlx4lqm70y2yw"))))
+                "0js4grqzsm4gvmcbmxv7zw4samfzi6nk4mn977ddcvla9g222rkm"))))
     (build-system trivial-build-system)
     (arguments
      `(#:modules ((guix build utils))

base-commit: 3ab8559436356ef89aa60135d3558681d64443ae
-- 
2.39.1

[bug#61468] [PATCH] gnu: cat-avatar-generator: Update to 2.

[zimoun]

Hi,

On Mon, 13 Feb 2023 at 06:40, Evgeny Pisemsky <evgeny@pisemsky.com> wrote:

>  (define-public cat-avatar-generator
>    (package
>      (name "cat-avatar-generator")
> -    (version "1")
> +    (version "2")
>      (source (origin
>                (method git-fetch)
>                (uri (git-reference
> -                     (url "https://framagit.org/Deevad/cat-avatar-generator.git")
> -                     (commit "71c0c662742cafe8afd2d2d50ec84243113e35ad")))
> +                    (url "https://framagit.org/Deevad/cat-avatar-generator.git")
> +                    (commit "9360ea33f79d1dad3e43494b09878b5e3f6b41fa")))

The common practise when it is not yet released is to use this pattern:

--8<---------------cut here---------------start------------->8---
(let ((commit "9360ea33f79d1dad3e43494b09878b5e3f6b41fa")
        (revision "2"))
    (package
      (name "cat-avatar-generator")
      (version (git-version "1" revision commit))
[...]
                    (commit commit)
--8<---------------cut here---------------end--------------->8---

Although it was not used by the initial addition
3bedac50571204643d5e3b204dc720ae7d571a1f. :-)

Even, maybe version should 0 and not 1; I do not know.

Cheers,
simon

[bug#61468] [PATCH] gnu: cat-avatar-generator: Update to 2.

[Julien Lepiller]

Hehe version "1" got through review ;) I agree it would be nice to use git-version instead, but I wouldn't go back to version "0" since guix would detect a package downgrade.

Evgeny, I can take care of that don't worry.

Le 13 février 2023 12:47:05 GMT+01:00, zimoun <zimon.toutoune@gmail.com> a écrit :
>Hi,
>
>On Mon, 13 Feb 2023 at 06:40, Evgeny Pisemsky <evgeny@pisemsky.com> wrote:
>
>>  (define-public cat-avatar-generator
>>    (package
>>      (name "cat-avatar-generator")
>> -    (version "1")
>> +    (version "2")
>>      (source (origin
>>                (method git-fetch)
>>                (uri (git-reference
>> -                     (url "https://framagit.org/Deevad/cat-avatar-generator.git")
>> -                     (commit "71c0c662742cafe8afd2d2d50ec84243113e35ad")))
>> +                    (url "https://framagit.org/Deevad/cat-avatar-generator.git")
>> +                    (commit "9360ea33f79d1dad3e43494b09878b5e3f6b41fa")))
>
>The common practise when it is not yet released is to use this pattern:
>
>--8<---------------cut here---------------start------------->8---
>(let ((commit "9360ea33f79d1dad3e43494b09878b5e3f6b41fa")
>        (revision "2"))
>    (package
>      (name "cat-avatar-generator")
>      (version (git-version "1" revision commit))
>[...]
>                    (commit commit)
>--8<---------------cut here---------------end--------------->8---
>
>Although it was not used by the initial addition
>3bedac50571204643d5e3b204dc720ae7d571a1f. :-)
>
>Even, maybe version should 0 and not 1; I do not know.
>
>Cheers,
>simon
>
>
>

[bug#61468] Updated patch

[Evgeny Pisemsky]

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

Hello.

Here is the updated patch.

I have also changed the builder to copy only necessary files.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-cat-avatar-generator-Update-to-1-1.9360ea3.patch --]
[-- Type: text/x-patch, Size: 4475 bytes --]

From 67527806b69ad391209b9e149cd4975e582e1366 Mon Sep 17 00:00:00 2001
From: Evgeny Pisemsky <evgeny@pisemsky.com>
Date: Sat, 25 Feb 2023 17:55:10 +0300
Subject: [PATCH] gnu: cat-avatar-generator: Update to 1-1.9360ea3.

* gnu/packages/web.scm (cat-avatar-generator): Update to 1-1.9360ea3.
---
 gnu/packages/web.scm | 74 +++++++++++++++++++++++---------------------
 1 file changed, 38 insertions(+), 36 deletions(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index fd0e68c591..66be07a383 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -7679,47 +7679,49 @@ (define-public geomyidae
     (license license:expat)))
 
 (define-public cat-avatar-generator
-  (package
-    (name "cat-avatar-generator")
-    (version "1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://framagit.org/Deevad/cat-avatar-generator.git")
-                     (commit "71c0c662742cafe8afd2d2d50ec84243113e35ad")))
-              (file-name (string-append name "-" version))
-              (sha256
-               (base32
-                "0s7b5whqsmfa57prbgl66ym551kg6ly0z14h5dgrlx4lqm70y2yw"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils)
-                      (srfi srfi-1)
-                      (srfi srfi-26))
-
-         (let ((source (assoc-ref %build-inputs "source"))
-               (php-dir (string-append %output "/share/web/" ,name "/")))
-           ;; The cache directory must not be in the store, but in a writable
-           ;; location.  The webserver will give us this location.
-           (copy-recursively source php-dir)
-           (substitute* (string-append php-dir "/cat-avatar-generator.php")
-             (("\\$cachepath = .*")
-              "if(isset($_SERVER['CACHE_DIR']))
+  (let ((commit "9360ea33f79d1dad3e43494b09878b5e3f6b41fa")
+        (revision "1"))
+    (package
+      (name "cat-avatar-generator")
+      (version (git-version "1" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://framagit.org/Deevad/cat-avatar-generator.git")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0js4grqzsm4gvmcbmxv7zw4samfzi6nk4mn977ddcvla9g222rkm"))))
+      (build-system trivial-build-system)
+      (arguments
+       `(#:modules ((guix build utils))
+         #:builder
+         (begin
+           (use-modules (guix build utils)
+                        (srfi srfi-1)
+                        (srfi srfi-26))
+           (let ((source (assoc-ref %build-inputs "source"))
+                 (php-dir (string-append %output "/share/web/" ,name)))
+             (install-file (string-append source "/cat-avatar-generator.php") php-dir)
+             (copy-recursively (string-append source "/avatars") (string-append php-dir "/avatars"))
+             ;; The cache directory must not be in the store, but in a writable
+             ;; location.  The webserver will give us this location.
+             (substitute* (string-append php-dir "/cat-avatar-generator.php")
+               (("\\$cachepath = .*")
+                "if(isset($_SERVER['CACHE_DIR']))
 $cachepath = $_SERVER['CACHE_DIR'];
 else
 die('You need to set the CACHE_DIR variable first.');"))
-           #t))))
-    (home-page "https://framagit.org/Deevad/cat-avatar-generator")
-    (synopsis "Random avatar generator")
-    (description "Cat avatar generator is a generator of cat pictures optimised
+             #t))))
+      (home-page "https://framagit.org/Deevad/cat-avatar-generator")
+      (synopsis "Random avatar generator")
+      (description "Cat avatar generator is a generator of cat pictures optimised
 to generate random avatars, or defined avatar from a \"seed\".  This is a
 derivation by David Revoy from the original MonsterID by Andreas Gohr.")
-    ;; expat for the code, CC-BY 4.0 for the artwork
-    (license (list license:expat
-                   license:cc-by4.0))))
+      ;; expat for the code, CC-BY 4.0 for the artwork
+      (license (list license:expat
+                     license:cc-by4.0)))))
 
 (define-public nghttp2
   (package

base-commit: 82fc07363b1600b0bfbf4a3327ea516a7b480f6b
-- 
2.39.1

[bug#61468] Updated patch

[Evgeny Pisemsky]

Any objections?

bug#61468: [PATCH] gnu: cat-avatar-generator: Update to 2.

[Ludovic Courtès]

Hi Evgeny,

Evgeny Pisemsky <evgeny@pisemsky.com> skribis:

>>From 67527806b69ad391209b9e149cd4975e582e1366 Mon Sep 17 00:00:00 2001
> From: Evgeny Pisemsky <evgeny@pisemsky.com>
> Date: Sat, 25 Feb 2023 17:55:10 +0300
> Subject: [PATCH] gnu: cat-avatar-generator: Update to 1-1.9360ea3.
>
> * gnu/packages/web.scm (cat-avatar-generator): Update to 1-1.9360ea3.

Applied, sorry for the delay!

Ludo’.