unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#29966] [PATCH] Update guile-wiredtiger to 0.6.3
@ 2018-01-03 19:52 Amirouche
  2018-01-08 17:47 ` Kei Kebreau
  2018-01-08 22:55 ` bug#29966: close 29966 Amirouche Boubekki
  0 siblings, 2 replies; 3+ messages in thread
From: Amirouche @ 2018-01-03 19:52 UTC (permalink / raw)
  To: 29966

[-- Attachment #1: Type: text/plain, Size: 114 bytes --]

The latest release was meant to make it possible to run the tests in 
guix. So I also changed a bit the package.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-packages-guile-wiredtiger-Update-to-latest-relea.patch --]
[-- Type: text/x-patch; name="0001-gnu-packages-guile-wiredtiger-Update-to-latest-relea.patch", Size: 3612 bytes --]

From 68a3d58775a40956a17880a7e2eafad08b352d42 Mon Sep 17 00:00:00 2001
From: amirouche <amirouche+dev@hypermove.net>
Date: Wed, 3 Jan 2018 20:43:52 +0100
Subject: [PATCH] gnu: packages: guile-wiredtiger: Update to latest release

* gnu/package/databases.scm (guile-wiredtiger): bump to new release,
  enable tests, disable parallel tests and htmlprag was removed from
  upstream release so there not need to delete it anymore. Improve
  the synopsis and description.
---
 gnu/packages/databases.scm | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 6306846a8..ef9c1b4ce 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -30,6 +30,7 @@
 ;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2017 Kristofer Buffington <kristoferbuffington@gmail.com>
+;;; Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1549,19 +1550,19 @@ trees (LSM), for sustained throughput under random insert workloads.")
 (define-public guile-wiredtiger
   (package
     (name "guile-wiredtiger")
-    (version "20171113.6cbc51da")
+    (version "0.6.3")
     (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url "https://framagit.org/a-guile-mind/guile-wiredtiger.git")
-                    (commit "6cbc51dab95d28fe31ae025fbdd88f3ecbf2111b")))
+                    (commit "070ed68139d99c279f058a6c293f00292d35dbd7")))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "0x3qwpgch5pg0k21kc792h4y6b36a8xd1zkfq8ar2l2mqmpzkzyd"))))
+                "14rna97wsylajzxfif95wnblq85csgcfc666gh5dl0ssgd7x8llh"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:tests? #f
+     '(#:parallel-tests? #f  ;; tests can't be run in parallel, yet.
        #:configure-flags
        (list (string-append "--with-libwiredtiger-prefix="
                             (assoc-ref %build-inputs "wiredtiger")))
@@ -1570,15 +1571,9 @@ trees (LSM), for sustained throughput under random insert workloads.")
        (modify-phases %standard-phases
          (add-after 'unpack '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)))))
+             (zero? (system* "sh" "bootstrap")))))))
+    ;; TODO: Remove microkanren.scm when we have a separate package
+    ;; for it.
     (native-inputs
      `(("autoconf" ,autoconf)
        ("automake" ,automake)
@@ -1588,10 +1583,10 @@ trees (LSM), for sustained throughput under random insert workloads.")
        ("guile" ,guile-2.2)))
     (propagated-inputs
      `(("guile-lib" ,guile-lib)))                 ;for (htmlprag)
-    (synopsis "Wired Tiger bindings for GNU Guile")
+    (synopsis "WiredTiger bindings for GNU Guile")
     (description
      "This package provides Guile bindings to the WiredTiger ``NoSQL''
-database.")
+database.  Various higher level database abstractions.")
     (home-page "https://framagit.org/a-guile-mind/guile-wiredtiger")
     (license license:gpl3+)))
 
-- 
2.14.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [bug#29966] [PATCH] Update guile-wiredtiger to 0.6.3
  2018-01-03 19:52 [bug#29966] [PATCH] Update guile-wiredtiger to 0.6.3 Amirouche
@ 2018-01-08 17:47 ` Kei Kebreau
  2018-01-08 22:55 ` bug#29966: close 29966 Amirouche Boubekki
  1 sibling, 0 replies; 3+ messages in thread
From: Kei Kebreau @ 2018-01-08 17:47 UTC (permalink / raw)
  To: Amirouche; +Cc: 29966

[-- Attachment #1: Type: text/plain, Size: 4623 bytes --]

Amirouche <amirouche@hypermove.net> writes:

> The latest release was meant to make it possible to run the tests in
> guix. So I also changed a bit the package.
>
>>From 68a3d58775a40956a17880a7e2eafad08b352d42 Mon Sep 17 00:00:00 2001
> From: amirouche <amirouche+dev@hypermove.net>
> Date: Wed, 3 Jan 2018 20:43:52 +0100
> Subject: [PATCH] gnu: packages: guile-wiredtiger: Update to latest release
>
> * gnu/package/databases.scm (guile-wiredtiger): bump to new release,
>   enable tests, disable parallel tests and htmlprag was removed from
>   upstream release so there not need to delete it anymore. Improve
>   the synopsis and description.

I've cleaned this commit message up a bit, like so:

gnu: guile-wiredtiger: Update to 0.6.3.

* gnu/package/databases.scm (guile-wiredtiger): Update to 0.6.3.
[arguments]: Enable tests; disable parallel tests; remove
'remove-bundled-dependencies' phase.
[synopsis, description]: Improve them.

> ---
>  gnu/packages/databases.scm | 25 ++++++++++---------------
>  1 file changed, 10 insertions(+), 15 deletions(-)
>
> diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
> index 6306846a8..ef9c1b4ce 100644
> --- a/gnu/packages/databases.scm
> +++ b/gnu/packages/databases.scm
> @@ -30,6 +30,7 @@
>  ;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com>
>  ;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
>  ;;; Copyright © 2017 Kristofer Buffington <kristoferbuffington@gmail.com>
> +;;; Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -1549,19 +1550,19 @@ trees (LSM), for sustained throughput under random insert workloads.")
>  (define-public guile-wiredtiger
>    (package
>      (name "guile-wiredtiger")
> -    (version "20171113.6cbc51da")
> +    (version "0.6.3")
>      (source (origin
>                (method git-fetch)
>                (uri (git-reference
>                      (url "https://framagit.org/a-guile-mind/guile-wiredtiger.git")
> -                    (commit "6cbc51dab95d28fe31ae025fbdd88f3ecbf2111b")))
> +                    (commit "070ed68139d99c279f058a6c293f00292d35dbd7")))
>                (file-name (string-append name "-" version "-checkout"))
>                (sha256
>                 (base32
> -                "0x3qwpgch5pg0k21kc792h4y6b36a8xd1zkfq8ar2l2mqmpzkzyd"))))
> +                "14rna97wsylajzxfif95wnblq85csgcfc666gh5dl0ssgd7x8llh"))))
>      (build-system gnu-build-system)
>      (arguments
> -     '(#:tests? #f
> +     '(#:parallel-tests? #f  ;; tests can't be run in parallel, yet.
>         #:configure-flags
>         (list (string-append "--with-libwiredtiger-prefix="
>                              (assoc-ref %build-inputs "wiredtiger")))
> @@ -1570,15 +1571,9 @@ trees (LSM), for sustained throughput under random insert workloads.")
>         (modify-phases %standard-phases
>           (add-after 'unpack '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)))))
> +             (zero? (system* "sh" "bootstrap")))))))

I've changed the (zero? (system* ...)) call to (invoke ...), a macro
available in (guix build utils) that does the same thing. AFAIK, our
codebase will be moving towards using 'invoke' for this purpose in the
future.

> +    ;; TODO: Remove microkanren.scm when we have a separate package
> +    ;; for it.
>      (native-inputs
>       `(("autoconf" ,autoconf)
>         ("automake" ,automake)
> @@ -1588,10 +1583,10 @@ trees (LSM), for sustained throughput under random insert workloads.")
>         ("guile" ,guile-2.2)))
>      (propagated-inputs
>       `(("guile-lib" ,guile-lib)))                 ;for (htmlprag)
> -    (synopsis "Wired Tiger bindings for GNU Guile")
> +    (synopsis "WiredTiger bindings for GNU Guile")
>      (description
>       "This package provides Guile bindings to the WiredTiger ``NoSQL''
> -database.")
> +database.  Various higher level database abstractions.")
>      (home-page "https://framagit.org/a-guile-mind/guile-wiredtiger")
>      (license license:gpl3+)))

Otherwise, this LGTM! Pushed to master with the above changes. Thanks
for updating this!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* bug#29966: close 29966
  2018-01-03 19:52 [bug#29966] [PATCH] Update guile-wiredtiger to 0.6.3 Amirouche
  2018-01-08 17:47 ` Kei Kebreau
@ 2018-01-08 22:55 ` Amirouche Boubekki
  1 sibling, 0 replies; 3+ messages in thread
From: Amirouche Boubekki @ 2018-01-08 22:55 UTC (permalink / raw)
  To: 29966-done



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-01-08 22:56 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-03 19:52 [bug#29966] [PATCH] Update guile-wiredtiger to 0.6.3 Amirouche
2018-01-08 17:47 ` Kei Kebreau
2018-01-08 22:55 ` bug#29966: close 29966 Amirouche Boubekki

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).