Update for guile-3.0

* configure.ac: Update for guile-3.0.
* guix.scm: Likewise.

diff --git a/configure.ac b/configure.ac
index 004fec1707fda3025ed61a80509bb19435bf7453..4d21e0053036a6d1e93773dd7d34438dd46a926b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_INIT([8sync], [0.4.2], [cwebber@dustycloud.org])
 
-PKG_CHECK_MODULES([GUILE], [guile-2.2])
+PKG_CHECK_MODULES([GUILE], [guile-3.0])
 
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 

diff --git a/guix.scm b/guix.scm
index 49f91c13e6fdf26bde136b2e004bd504daf9a105..81b348a8d0e3491a633c0cc297b4b2f1f6b3e5fd 100644 (file)
--- a/guix.scm
+++ b/guix.scm
@@ -51,43 +51,12 @@
              (gnu packages autotools)
              (gnu packages gettext)
              (gnu packages guile)
+             (gnu packages guile-xyz)
              (gnu packages pkg-config)
              (gnu packages texinfo))
 
 (define %source-dir (dirname (current-filename)))
 
-(define guile-fibers-git
-  (package
-    (inherit guile-fibers)
-    (name "guile-fibers")
-    (version "git")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/wingo/fibers.git")
-                    (commit "0fa1fd6adf9980229a46956503a6bf36e8154a78")))
-              (sha256
-               (base32
-                "0a782aa0v2d115427h1h57jkxy04axklan60dzgnsry4axw9iq8r"))))
-    (arguments
-     `(#:phases (modify-phases %standard-phases
-                  (add-before 'configure 'bootstrap
-                    (lambda _
-                      (zero? (system* "./autogen.sh"))))
-                  (add-before 'configure 'setenv
-                    (lambda _
-                      (setenv "GUILE_AUTO_COMPILE" "0"))))
-       ;; We wouldn't want this in the upstream fibers package, but gosh
-       ;; running tests takes forever and is painful
-       #:tests? #f))
-    (native-inputs
-     `(("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("libtool" ,libtool)
-       ("texinfo" ,texinfo)
-       ("gettext" ,gettext-minimal)
-       ,@(package-native-inputs guile-2.2)))))
-
 (package
   (name "guile-8sync")
   (version "git")
@@ -97,10 +66,10 @@
   (build-system gnu-build-system)
   (native-inputs `(("autoconf" ,autoconf)
                    ("automake" ,automake)
-                   ("guile" ,guile-2.2)
+                   ("guile" ,guile-3.0)
                    ("pkg-config" ,pkg-config)
                    ("texinfo" ,texinfo)))
-  (propagated-inputs `(("guile-fibers" ,guile-fibers-git)))
+  (propagated-inputs `(("guile-fibers" ,guile-fibers)))
   (arguments
    `(#:phases (modify-phases %standard-phases
                 (add-before 'configure 'bootstrap