1 files changed, 17 insertions, 35 deletions

diff --git a/guix.scm b/guix.scm
index b543a8e..4b6968b 100644
--- a/guix.scm
+++ b/guix.scm
@@ -1,7 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
-;;; Copyright © 2021 Timothy Sample <samplet@ngyro.com>
-;;;   ^ definition of guile-quickcheck
+;;; Copyright © 2021 GNUnet e.V.
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -29,38 +27,12 @@
              (gnu packages text-editors)
              (guix packages)
              (guix gexp)
+             (guix git)
              (guix git-download)
              (guix download)
              (guix build-system gnu)
              ((guix licenses) #:prefix license:))
 
-(define-public guile-quickcheck
-  (package
-    (name "guile-quickcheck")
-    (version "0.1.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://files.ngyro.com/"
-                                  "guile-quickcheck/guile-quickcheck-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "03mwi1l3354x52nar0zwhcm0x29yai9xjln4p4gbchwvx5dsr6fb"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("guile" ,guile-3.0)))
-    (inputs
-     `(("guile" ,guile-3.0)))
-    (home-page "https://ngyro.com/software/guile-quickcheck.html")
-    (synopsis "Randomized property-based testing for Guile")
-    (description "This Guile library provides tools for randomized,
-property-based testing.  It follows closely the QuickCheck library
-written in Haskell.  You can use it to define a property (a predicate
-with specifications for its inputs) and test it by generating many
-random inputs and seeing if it holds.")
-    (license license:gpl3+)))
-
 (define guile-3.0/fixed
   (package
     (inherit guile-3.0-latest)
@@ -70,7 +42,8 @@ random inputs and seeing if it holds.")
        (patches (list (local-file "0001-Fix-non-revealed-port-is-closed-ports.test.patch")
                       (local-file "0001-ice-9-read-Parse-properly.patch")))))))
 
-;; This has some I/O patches (wait-for-port-readable-operation).
+;; This has some I/O patches (wait-until-port-readable-operation),
+;; see <https://github.com/wingo/fibers/pull/50>.
 (define-public guile-fibers/patched
   (package
    (inherit guile-fibers)
@@ -78,9 +51,9 @@ random inputs and seeing if it holds.")
             (method git-fetch)
             (uri (git-reference
                   (url "https://notabug.org/maximed/fibers")
-                  (commit "3836b288eedfdb5064fdc84643f1e15a00071dbe")))
+                  (commit "4658b62b402e7d4920ab528da1b42835cea03429")))
             (sha256
-             (base32 "08rkmz1nkjk1l0bydic4vj5h7vd43l2sqskm14lcfz8pfkks7sx8"))))
+             (base32 "1956rz411p3yf7a75z2k1hii88kmn25y2p32bw6w45yy8pynm1rg"))))
    (native-inputs
     `(("autoconf" ,autoconf)
       ("gettext" ,gettext-minimal)
@@ -88,12 +61,21 @@ random inputs and seeing if it holds.")
       ("automake" ,automake)
       ,@(package-native-inputs guile-fibers)))))
 
+(define %source-dir (dirname (current-filename)))
+
 (define-public scheme-gnunet
   (package
    (name "scheme-gnunet")
-   (version "0.0")
-   (source #f)
+   (version "0.1")
+   (source (local-file %source-dir
+                       #:recursive? #t
+                       #:select? (git-predicate %source-dir)))
    (build-system gnu-build-system)
+   (arguments
+    '(#:configure-flags
+      (list
+       "--with-guile-site-dir=$(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)"
+       "--with-guile-site-ccache-dir=$(libdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)/site-ccache")))
    (propagated-inputs `(("guile-zlib" ,guile-zlib)
                         ("guile-bytestructures" ,guile-bytestructures)
                         ("guile-fibers" ,guile-fibers/patched)