guix: Use guile-3.0.

* guix.scm (name)[native-inputs]: Remove guile.
[inputs]: New field, add guile-3.0.

diff --git a/8sync/systems/websocket/server.scm b/8sync/systems/websocket/server.scm
index af0fe1fb5b88af205c7c53d825f6e65e91e42679..11704d477e61a5051afdb2c24c103d360a4c4086 100644 (file)
--- a/8sync/systems/websocket/server.scm
+++ b/8sync/systems/websocket/server.scm
@@ -1,7 +1,7 @@
 ;;; guile-websocket --- WebSocket client/server
 ;;; Copyright © 2015 David Thompson <davet@gnu.org>
 ;;; Copyright © 2017 Christopher Allan Webber <cwebber@dustycloud.org>
-;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of guile-websocket.
 ;;;
@@ -71,8 +71,7 @@ string."
   ((ws-send websocket-server-send))
   (upgrade-paths #:init-value `(("websocket" .
                                  ,(wrap-apply websocket-client-loop)))
-                 #:allocation #:each-subclass
-                 #:accessor .upgrade-paths)
+                 #:allocation #:each-subclass)
 
   (gen-client-id #:init-thunk make-simple-counter)
 
@@ -157,11 +156,12 @@ called for each complete message that is received."
           (loop fragments type))
          ((first-fragment-frame? frame) ; begin accumulating fragments
           (loop (list frame) (frame-type frame)))
-         ((fragment-frame? frame) ; add a fragment
-          (loop (cons frame fragments) type))
          ((final-fragment-frame? frame) ; concatenate all fragments
-          (handle-data-frame type (frame-concatenate (reverse fragments)))
+          (handle-data-frame type (frame-concatenate
+                                   (reverse (cons frame fragments))))
           (loop '() #f))
+         ((fragment-frame? frame) ; add a fragment
+          (loop (cons frame fragments) type))
          ((data-frame? frame) ; unfragmented data frame
           (handle-data-frame (frame-type frame) (frame-data frame))
           (loop '() #f)))))))

diff --git a/guix.scm b/guix.scm
index ac790debe8c37b2b64c7061056fd2dda501edf99..d139e648b429ba50a49150464ff79fad3e63415c 100644 (file)
--- a/guix.scm
+++ b/guix.scm
@@ -64,9 +64,9 @@
   (build-system gnu-build-system)
   (native-inputs `(("autoconf" ,autoconf)
                    ("automake" ,automake)
-                   ("guile" ,guile-2.2)
                    ("pkg-config" ,pkg-config)
                    ("texinfo" ,texinfo)))
+  (inputs `(("guile" ,guile-3.0)))
   (arguments
    `(#:phases (modify-phases %standard-phases
                 (add-before 'configure 'bootstrap

diff --git a/tests/test-actors.scm b/tests/test-actors.scm
index 30f13d053f847d18de56abfa00ad2eb92cf2c8d4..eb3a2de5d20835971af81b840c4786cbfaea387f 100644 (file)
--- a/tests/test-actors.scm
+++ b/tests/test-actors.scm
@@ -1,5 +1,6 @@
 ;;; 8sync --- Asynchronous programming for Guile
 ;;; Copyright (C) 2016 Christopher Allan Webber <cwebber@dustycloud.org>
+;;; Copyright (C) 2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of 8sync.
 ;;;
@@ -203,5 +204,5 @@ customer> Whaaaaat?  I can't believe I got voice mail!\n"
  (test-equal (get-spoken)
    '("Hi! jack inits now.\n" "Hi! jill inits now.\n")))
 
-(test-end "test-actors")
 (test-exit)
+(test-end "test-actors")

diff --git a/tests/test-agenda.scm b/tests/test-agenda.scm
index a26c6b7eaed051260154babcf797030e0def1728..d96b601c4d359dfe40746c221df3132c8ce2d979 100644 (file)
--- a/tests/test-agenda.scm
+++ b/tests/test-agenda.scm
@@ -1,5 +1,6 @@
 ;;; 8sync --- Asynchronous programming for Guile
 ;;; Copyright (C) 2015 Christopher Allan Webber <cwebber@dustycloud.org>
+;;; Copyright (C) 2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This library is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU Lesser General Public
@@ -283,8 +284,6 @@
 
 ;; End tests
 
-(test-end "test-agenda")
-
 ;; @@: A better way to handle this at the repl?
 (test-exit)
-
+(test-end "test-agenda")

diff --git a/tests/test-rmeta-slot.scm b/tests/test-rmeta-slot.scm
index 37dac50ec3dfacd2cad3f12fb8bb8dec1576e47e..7aaa248e84646810c572b77555fb106634403992 100644 (file)
--- a/tests/test-rmeta-slot.scm
+++ b/tests/test-rmeta-slot.scm
@@ -1,5 +1,6 @@
 ;;; 8sync --- Asynchronous programming for Guile
 ;;; Copyright (C) 2017 Christopher Allan Webber <cwebber@dustycloud.org>
+;;; Copyright (C) 2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of 8sync.
 ;;;
@@ -62,5 +63,5 @@
   (class-rmeta-ref <sub-lassy> 'entries 'not-defined
                    #:dflt "no-way"))
 
-(test-end "test-rmeta-slot")
 (test-exit)
+(test-end "test-rmeta-slot")