From 78b8b4b4225ea1a2bc0bc64b07fda6ce17f727f2 Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Sun, 9 Jan 2022 10:11:45 +0000
Subject: [PATCH] Update the guix-dev.scm file

---
 guix-dev.scm | 58 ++++++----------------------------------------------
 1 file changed, 6 insertions(+), 52 deletions(-)

diff --git a/guix-dev.scm b/guix-dev.scm
index 1ea1845..436140d 100644
--- a/guix-dev.scm
+++ b/guix-dev.scm
@@ -41,52 +41,6 @@
              (gnu packages ruby)
              (srfi srfi-1))
 
-(define guile3.0-email
-  (package
-    (inherit guile-email)
-    (name "guile3.0-email")
-    (inputs `(("guile" ,guile-3.0)
-              ,@(alist-delete "guile" (package-inputs guile-email))))))
-
-(define guile3.0-squee
-  (package
-   (inherit guile-squee)
-   (name "guile3.0-squee")
-   (native-inputs `(("guile" ,guile-3.0)
-                    ,@(alist-delete "guile" (package-native-inputs guile-squee))))))
-
-(define guile3.0-readline
-  (if (defined? 'guile3.0-readline
-        (resolve-interface '(gnu packages guile)))
-      guile3.0-readline
-      guile-readline))
-
-(define-public guile-prometheus
-  (package
-    (name "guile-prometheus")
-    (version "0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (commit "3df4221c477bd8e6955480a0e5fc0c37a96133c7")
-                    (url "https://git.cbaines.net/git/guile/prometheus")))
-              (sha256
-               (base32
-                "0dnv9kbrylkrv5lsmmcksq68wi7bvkfsk8cl4759qwqkbjci26hd"))
-              (file-name (string-append name "-" version "-checkout"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("autoconf" ,autoconf)
-       ("automake" ,automake)))
-    (inputs
-     `(("guile" ,guile-3.0)))
-    (home-page "https://git.cbaines.net/guile/prometheus/")
-    (synopsis "")
-    (description
-     "")
-    (license license:gpl3+)))
-
 (package
   (name "guix-data-service")
   (version "0.0.0")
@@ -94,13 +48,13 @@
   (build-system gnu-build-system)
   (inputs
    `(("guix" ,guix)
-     ("guile-email" ,guile3.0-email)
-     ("guile-json" ,guile3.0-json)
-     ("guile-squee" ,guile3.0-squee)
-     ("guile-fibers" ,guile3.0-fibers)
-     ("guile-gcrypt" ,guile3.0-gcrypt)
+     ("guile-email" ,guile-email)
+     ("guile-json" ,guile-json-4)
+     ("guile-squee" ,guile-squee)
+     ("guile-fibers" ,guile-fibers)
+     ("guile-gcrypt" ,guile-gcrypt)
      ("guile-lzlib" ,guile-lzlib)
-     ("guile-readline" ,guile3.0-readline)
+     ("guile-readline" ,guile-readline)
      ("guile-prometheus" ,guile-prometheus)
      ("guile" ,guile-3.0-latest)
      ("sqitch" ,sqitch)))