Fix super-bloom.

1 files changed, 33 insertions, 22 deletions

diff --git a/dthompson/packages/games.scm b/dthompson/packages/games.scm
index d8377f6..de7ab0f 100644
--- a/dthompson/packages/games.scm
+++ b/dthompson/packages/games.scm
@@ -15,10 +15,11 @@
   #:use-module (gnu packages texinfo))
 
 (define chickadee-for-super-bloom
-  (let ((commit "ca8b2bd07a07e727b17ebbdf8012c7d9cd135689"))
+  (let ((commit "ca8b2bd07a07e727b17ebbdf8012c7d9cd135689")
+        (revision "1"))
     (package
       (inherit guile-chickadee)
-      (version (string-append "0.9.0-1." (string-take commit 7)))
+      (version (git-version "0.9.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -30,10 +31,11 @@
       (native-inputs (list autoconf automake pkg-config texinfo)))))
 
 (define catbird-for-super-bloom
-  (let ((commit "fa6a85b92f818f1e0139a33ca4110acc97f8d4f2"))
+  (let ((commit "fa6a85b92f818f1e0139a33ca4110acc97f8d4f2")
+        (revision "1"))
     (package
       (name "catbird")
-      (version (string-append "0.1.0-1." (string-take commit 7)))
+      (version (git-version "0.1.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -53,21 +55,30 @@
       (home-page "https://dthompson.us/projects/chickadee.html")
       (license license:gpl3+))))
 
-(define super-bloom
-  (package
-   (name "super-bloom")
-   (version "0.1.0-git")
-   (source (git-checkout (url (dirname (current-filename)))))
-   (build-system gnu-build-system)
-   (arguments
-    '(#:make-flags '("GUILE_AUTO_COMPILE=0")))
-   (native-inputs
-    (list autoconf automake pkg-config))
-   (inputs
-    (list guile-3.0))
-   (propagated-inputs
-    (list catbird-for-super-bloom))
-   (synopsis "Spring Lisp Game Jam 2023 entry")
-   (description "Dave's entry to the Spring Lisp Game Jam 2023.")
-   (home-page "https://dthompson.us")
-   (license license:asl2.0)))
+(define-public super-bloom
+  (let ((commit "a86f4f6d53d05d6e1027619d00882feff1b857a8")
+        (revision "1"))
+    (package
+      (name "super-bloom")
+      (version (git-version "0.1.0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://git.dthompson.us/spring-lisp-game-jam-2023.git")
+                      (commit commit)))
+                (sha256
+                 (base32
+                  "1lcy5r83hwy6qwz7vxkfwflrmhaikcf6f2zskar2j3a9li740gic"))))
+      (build-system gnu-build-system)
+      (arguments
+       '(#:make-flags '("GUILE_AUTO_COMPILE=0")))
+      (native-inputs
+       (list autoconf automake pkg-config))
+      (inputs
+       (list guile-3.0))
+      (propagated-inputs
+       (list catbird-for-super-bloom))
+      (synopsis "Spring Lisp Game Jam 2023 entry")
+      (description "Dave's entry to the Spring Lisp Game Jam 2023.")
+      (home-page "https://dthompson.us")
+      (license license:asl2.0))))