summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--guix.scm30
-rw-r--r--starling/repl.scm2
2 files changed, 11 insertions, 21 deletions
diff --git a/guix.scm b/guix.scm
index 7df938b..619e81f 100644
--- a/guix.scm
+++ b/guix.scm
@@ -52,23 +52,12 @@
(gnu packages maths)
(gnu packages mp3)
(gnu packages pkg-config)
+ (gnu packages readline)
(gnu packages sdl)
(gnu packages texinfo)
(gnu packages xiph))
-(define target-guile
- (package
- (inherit guile-3.0-latest)
- (version "3.0.6")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/guile/guile-"
- version ".tar.xz"))
- (sha256
- (base32
- "0a2xhjy6y5p15qvc59pdnzi20fm1jwqa772pwxb16wkx0z187gg2"))))
- (arguments
- `(#:tests? #f ,@(package-arguments guile-3.0-latest)))))
+(define target-guile guile-3.0-latest)
(define guile3.0-opengl
(package
@@ -103,10 +92,10 @@
(invoke "autoreconf" "-vfi")))))))))
(define guile-sdl2
- (let ((commit "2ecdf1e97f415a5818c4dcd7a2ddff6dc7ecdd0f"))
+ (let ((commit "d31c27ac48f81a534b28531e3d5fa626890be59f"))
(package
(name "guile-sdl2")
- (version (string-append "0.5.0-1." (string-take commit 7)))
+ (version (string-append "0.7.0-1." (string-take commit 7)))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -114,7 +103,7 @@
(commit commit)))
(sha256
(base32
- "0dzg321xr72x2xx49p93bdb44g6bx1hq8y39aqfzzh3qmdhyvhw5"))))
+ "16cgmsd9q6mr99s2bngcylcqbpq1gq5fp79m85r7ywny3cv0ivj1"))))
(build-system gnu-build-system)
(arguments
'(#:make-flags '("GUILE_AUTO_COMPILE=0")
@@ -139,10 +128,10 @@ SDL2 C shared library via the foreign function interface.")
(license license:lgpl3+))))
(define chickadee
- (let ((commit "3b4787975ec6684878db2b21dc33dcfdc748d51e"))
+ (let ((commit "c22eda980c51db210bbe73f500e9f3fc3052a5f3"))
(package
(name "chickadee")
- (version (string-append "0.5.0-1." (string-take commit 7)))
+ (version (string-append "0.8.0-1." (string-take commit 7)))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -150,7 +139,7 @@ SDL2 C shared library via the foreign function interface.")
(commit commit)))
(sha256
(base32
- "1hlkmk903n3wg7ca9rf6fpdf4qj7gdvxdvj1vhczv4yqg6b6bjq6"))))
+ "0prqg0rs6d7cbb3hrwfdgcqwvmxpgl7026bxabssy6y95q83621l"))))
(build-system gnu-build-system)
(arguments
'(#:make-flags '("GUILE_AUTO_COMPILE=0")
@@ -169,7 +158,8 @@ SDL2 C shared library via the foreign function interface.")
("guile" ,target-guile)
("libvorbis" ,libvorbis)
("mpg123" ,mpg123)
- ("openal" ,openal)))
+ ("openal" ,openal)
+ ("readline" ,readline)))
(propagated-inputs
`(("guile-opengl" ,guile3.0-opengl)
("guile-sdl2" ,guile-sdl2)))
diff --git a/starling/repl.scm b/starling/repl.scm
index 66139ed..5e80854 100644
--- a/starling/repl.scm
+++ b/starling/repl.scm
@@ -21,7 +21,7 @@
;;; Code:
(define-module (starling repl)
- #:use-module (chickadee array-list)
+ #:use-module (chickadee data array-list)
#:use-module (chickadee graphics color)
#:use-module (chickadee graphics font)
#:use-module (chickadee graphics path)