Subject: Re: [bug#29300] [PATCH] guile-wiredtiger

From: [email-masked] (Ludovic Courtès)
Date: Tue, 14 Nov 2017 23:38:47 +0100

Hi Kristofer,

Thanks for this first patch!  I’ve squashed the two patches, applied
the small changes below, and added a commit log that followed our
conventions.

Welcome!  :-)

Ludo’.

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index ca35bcd2a..6bc468679 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -22,6 +22,7 @@
 ;;; Copyright © 2017 Rutger Helling <[email-masked]>
 ;;; Copyright © 2017 Pierre Langlois <[email-masked]>
 ;;; Copyright © 2017 Ricardo Wurmus <[email-masked]>
+;;; Copyright © 2017 Kristofer Buffington <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1520,17 +1521,29 @@ trees (LSM), for sustained throughput under random insert workloads.")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'bootstrap
-           (lambda _ (zero? (system* "sh" "bootstrap")))))))
+           (lambda _
+             (zero? (system* "sh" "bootstrap"))))
+         (add-before 'bootstrap 'remove-bundled-dependencies
+           (lambda _
+             ;; TODO: Remove microkanren.scm when we have a separate package
+             ;; for it.
+             (delete-file "htmlprag.scm")
+             (substitute* "Makefile.am"
+               (("htmlprag\\.scm") ""))
+             #t)))))
     (native-inputs
      `(("autoconf" ,autoconf)
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("wiredtiger" ,wiredtiger)
-       ("guile-lib" ,guile-lib)
        ("guile" ,guile-2.2)))
+    (propagated-inputs
+     `(("guile-lib" ,guile-lib)))                 ;for (htmlprag)
     (synopsis "Wired Tiger bindings for GNU Guile")
-    (description "Wired Tiger bindings for GNU Guile.  Build your own database!")
+    (description
+     "This package provides Guile bindings to the WiredTiger ``NoSQL''
+database.")
     (home-page "https://framagit.org/a-guile-mind/guile-wiredtiger")
     (license license:gpl3+)))