From b8fc36223957e42a0d4f16d0ba8f88bf7c8836e4 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Thu, 12 May 2016 01:58:59 +0300
Subject: gnu: Use 'emacs-minimal' instead of 'emacs-no-x'.

* gnu/packages/code.scm (cflow)[native-inputs]: Use 'emacs-minimal'
  instead of 'emacs-no-x'.
* gnu/packages/databases.scm (recutils): Likewise.
* gnu/packages/finance.scm (ledger): Likewise
* gnu/packages/idutils.scm (idutils): Likewise.
* gnu/packages/mail.scm (mu): Likewise.
* gnu/packages/ocaml.scm (proof-general): Likewise.
* gnu/packages/package-management.scm (guix-0.10.0): Likewise.
* gnu/packages/plotutils.scm (asymptote): Likewise.
* gnu/packages/scheme.scm (scmutils): Likewise.
* gnu/packages/version-control.scm (vc-dwim): Likewise.
* gnu/packages/emacs.scm (geiser): Likewise.
(paredit): Likewise.
(git-modes): Likewise.
(magit): Likewise.
(magit-svn): Likewise.
(haskell-mode): Likewise.
(let-alist): Likewise.
(emacs-w3m): Likewise.
(emacs-wget): Likewise.
(emms): Likewise.
(bbdb): Likewise.
(emacs-mmm-mode): Likewise.
(emacs-pdf-tools): Likewise.
(emacs-popup)[native-inputs]: Remove as it is not needed for
emacs-build-system.
(emacs-rfcview): Likewise.
(emacs-ffap-rfc-space): Likewise.
---
 gnu/packages/databases.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gnu/packages/databases.scm')

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 57181f6e5f..bd535a3156 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -381,7 +381,7 @@ pictures, sounds, or video.")
                                       (assoc-ref %build-inputs "bash:include")
                                       "/include/bash"))))
 
-    (native-inputs `(("emacs" ,emacs-no-x)
+    (native-inputs `(("emacs" ,emacs-minimal)
                      ("bc" ,bc)
                      ("bash:include" ,bash "include")
                      ("libuuid" ,util-linux)))
-- 
cgit 1.4.1


From 6242b314c24caa38f8e402b0cd9f969481fe63a5 Mon Sep 17 00:00:00 2001
From: 宋文武 <iyzsong@gmail.com>
Date: Sun, 15 May 2016 10:20:05 +0800
Subject: gnu: Add wiredtiger.

* gnu/packages/database.scm (wiredtiger): New variable.
---
 gnu/packages/databases.scm | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/databases.scm')

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index bd535a3156..7e0188b2a0 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -55,7 +55,7 @@
   #:use-module (gnu packages bison)
   #:use-module (gnu packages jemalloc)
   #:use-module ((guix licenses)
-                #:select (gpl2 gpl3+ lgpl2.1+ lgpl3+ x11-style non-copyleft
+                #:select (gpl2 gpl3 gpl3+ lgpl2.1+ lgpl3+ x11-style non-copyleft
                           bsd-2 bsd-3 public-domain))
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -914,3 +914,41 @@ sets, bitmaps and hyperloglogs.")
 and B+ Tree data storage models.  It is a fast key-value lightweight
 database and supports many programming languages.  It is a NoSQL database.")
     (license gpl3+)))
+
+(define-public wiredtiger
+  (package
+    (name "wiredtiger")
+    (version "2.8.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://source.wiredtiger.com/releases/wiredtiger-"
+                    version ".tar.bz2"))
+              (sha256
+               (base32
+                "1qh7y5paisdxq19jgg81ld7i32lz920n5k30hdpxnr8ll9c4hgjr"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:configure-flags '("--enable-lz4" "--enable-zlib")
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'disable-test/fops
+           (lambda _
+             ;; XXX: timed out after 3600 seconds of silence
+             (substitute* "Makefile"
+               (("test/fops") ""))
+             #t)))))
+    (inputs
+     `(("lz4" ,lz4)
+       ("zlib" ,zlib)))
+    (home-page "http://source.wiredtiger.com/")
+    (synopsis "NoSQL data engine")
+    (description
+     "WiredTiger is an extensible platform for data management.  It supports
+row-oriented storage (where all columns of a row are stored together),
+column-oriented storage (where columns are stored in groups, allowing for
+more efficient access and storage of column subsets) and log-structured merge
+trees (LSM), for sustained throughput under random insert workloads.")
+    (license gpl3) ; or GPL-2
+    ;; configure.ac: WiredTiger requires a 64-bit build.
+    (supported-systems '("x86_64-linux" "mips64el-linux"))))
-- 
cgit 1.4.1