04/04: Update guix-dev.scm and .envrc

[Christopher Baines]

cbaines pushed a commit to branch master
in repository data-service.

commit 2135bc5e4952b8419b53c1bfaaad96198676a820
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Sun Nov 5 13:45:14 2023 +0000

    Update guix-dev.scm and .envrc
---
 .envrc       |  2 +-
 guix-dev.scm | 31 +++++++++++++++----------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/.envrc b/.envrc
index 7b32f77..bb6e75f 100644
--- a/.envrc
+++ b/.envrc
@@ -2,7 +2,7 @@
 export GUILE_LOAD_PATH=""
 export GUILE_LOAD_COMPILED_PATH=""
 
-use guix -l guix-dev.scm --ad-hoc postgresql
+use guix -D -f guix-dev.scm postgresql
 
 export GUILE_LOAD_COMPILED_PATH="$PWD:$PWD/tests:$GUILE_LOAD_COMPILED_PATH"
 export GUILE_LOAD_PATH="$PWD:$GUILE_LOAD_PATH"
diff --git a/guix-dev.scm b/guix-dev.scm
index 394b873..8d33657 100644
--- a/guix-dev.scm
+++ b/guix-dev.scm
@@ -47,23 +47,22 @@
   (source #f)
   (build-system gnu-build-system)
   (inputs
-   `(("guix" ,guix)
-     ("guile-email" ,guile-email)
-     ("guile-json" ,guile-json-4)
-     ("guile-squee" ,guile-squee)
-     ("guile-fibers" ,guile-fibers-1.1)
-     ("guile-gcrypt" ,guile-gcrypt)
-     ("guile-lzlib" ,guile-lzlib)
-     ("guile-readline" ,guile-readline)
-     ("guile-prometheus" ,guile-prometheus)
-     ("guile" ,guile-3.0-latest)
-     ("sqitch" ,sqitch)))
+   (list guix
+         guile-email
+         guile-json-4
+         guile-squee
+         guile-fibers
+         guile-gcrypt
+         guile-lzlib
+         guile-readline
+         guile-prometheus
+         guile-next
+         sqitch))
   (native-inputs
-   `(("autoconf" ,autoconf)
-     ("automake" ,automake)
-     ("ephemeralpg" ,ephemeralpg)
-     ("pkg-config" ,pkg-config)
-     ("ruby-rerun" ,ruby-rerun)))
+   (list autoconf
+         automake
+         ephemeralpg
+         pkg-config))
   (synopsis "TODO")
   (description "TODO")
   (home-page "TODO")