cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use Guile 3 for development

Browse source
This commit is contained in:
Christopher Baines 2020-02-27 22:17:16 +00:00
parent cd4dda6e22
commit 9a29845f89
2 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.envrc
View file

@ -1,6 +1,10 @@
# Unset the Guile paths to avoid mixing Guile major versions
export GUILE_LOAD_PATH=""
export GUILE_LOAD_COMPILED_PATH=""
use guix -l guix-dev.scm --ad-hoc postgresql use guix -l guix-dev.scm --ad-hoc postgresql
export GUILE_LOAD_COMPILED_PATH="$PWD:$GUILE_LOAD_COMPILED_PATH" export GUILE_LOAD_COMPILED_PATH="$PWD:$PWD/tests:$GUILE_LOAD_COMPILED_PATH"
export GUILE_LOAD_PATH="$PWD:$GUILE_LOAD_PATH" export GUILE_LOAD_PATH="$PWD:$GUILE_LOAD_PATH"
export PATH="$PWD/scripts:$PATH" export PATH="$PWD/scripts:$PATH"

30
guix-dev.scm
View file

@ -41,20 +41,34 @@
(gnu packages ruby) (gnu packages ruby)
(srfi srfi-1)) (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))))))
(package (package
(name "guix-data-service") (name "guix-data-service")
(version "0.0.0") (version "0.0.0")
(source #f) (source #f)
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("guix" ,guix) `(("guix" ,guile3.0-guix)
("guile-email" ,guile-email) ("guile-email" ,guile3.0-email)
("guile-json" ,guile-json-3) ("guile-json" ,guile3.0-json)
("guile-squee" ,guile-squee) ("guile-squee" ,guile3.0-squee)
("guile-fibers" ,guile-fibers) ("guile-fibers" ,guile3.0-fibers)
("guile-gcrypt" ,guile-gcrypt) ("guile-gcrypt" ,guile3.0-gcrypt)
("guile-syntax-highlight" ,guile-syntax-highlight) ("guile-readline" ,guile3.0-readline)
("guile" ,guile-2.2) ("guile" ,guile-next)
("sqitch" ,sqitch))) ("sqitch" ,sqitch)))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)