X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=guix.scm;h=81b348a8d0e3491a633c0cc297b4b2f1f6b3e5fd;hb=refs%2Fheads%2Ffibers;hp=5a450d2865aa970459f703a6eb6a9ebb377442ca;hpb=638dea67896ab4d6048e297bc20b93112f9294a7;p=8sync.git

diff --git a/guix.scm b/guix.scm
index 5a450d2..81b348a 100644
--- a/guix.scm
+++ b/guix.scm
@@ -2,10 +2,6 @@
 ;;; Copyright (C) 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright (C) 2017 Christopher Allan Webber <cwebber@dustycloud.org>
 ;;;
-;;; Also borrowing code from:
-;;; guile-sdl2 --- FFI bindings for SDL2
-;;; Copyright © 2015 David Thompson <davet@gnu.org>
-;;;
 ;;; This file is part of 8sync.
 ;;; However, unlike most of 8sync, which is under the LGPLv3+, this
 ;;; file in particular is licensed under GPLv3+.
@@ -53,39 +49,27 @@
              ((guix build utils) #:select (with-directory-excursion))
              (gnu packages)
              (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 git-file?
-  (let* ((pipe (with-directory-excursion %source-dir
-                 (open-pipe* OPEN_READ "git" "ls-files")))
-         (files (let loop ((lines '()))
-                  (match (read-line pipe)
-                    ((? eof-object?)
-                     (reverse lines))
-                    (line
-                     (loop (cons line lines))))))
-         (status (close-pipe pipe)))
-    (lambda (file stat)
-      (match (stat:type stat)
-        ('directory #t)
-        ((or 'regular 'symlink)
-         (any (cut string-suffix? <> file) files))
-        (_ #f)))))
-
 (package
   (name "guile-8sync")
   (version "git")
-  (source (local-file %source-dir #:recursive? #t #:select? git-file?))
+  (source (local-file %source-dir
+                      #:recursive? #t
+                      #:select? (git-predicate %source-dir)))
   (build-system gnu-build-system)
   (native-inputs `(("autoconf" ,autoconf)
                    ("automake" ,automake)
-                   ("guile" ,guile-next)
+                   ("guile" ,guile-3.0)
                    ("pkg-config" ,pkg-config)
                    ("texinfo" ,texinfo)))
+  (propagated-inputs `(("guile-fibers" ,guile-fibers)))
   (arguments
    `(#:phases (modify-phases %standard-phases
                 (add-before 'configure 'bootstrap