Merge branch 'master' into closure-size

Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.

4 files changed, 23 insertions, 85 deletions

diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index 473b5d717dea..ffcd507653a0 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -17,6 +17,9 @@ stdenv.mkDerivation rec {
 
   configureFlagsArray = [ "--with-openssl-lib=${openssl.out}/lib" ];
 
+  NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow";
+
+
   patchPhase = ''
     substituteInPlace 3rdParty/V8-3.31.74.1/build/gyp/gyp --replace /bin/bash ${bash}/bin/bash
     substituteInPlace 3rdParty/etcd/build --replace /bin/bash ${bash}/bin/bash
diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix
index b300ad5b806d..d58005f7be2b 100644
--- a/pkgs/servers/nosql/eventstore/default.nix
+++ b/pkgs/servers/nosql/eventstore/default.nix
@@ -1,34 +1,26 @@
-{ stdenv, fetchFromGitHub, fetchpatch, git, mono, v8, icu }:
+{ stdenv, fetchFromGitHub, fetchpatch, mono, v8 }:
 
 # There are some similarities with the pinta derivation. We should
 # have a helper to make it easy to package these Mono apps.
 
 stdenv.mkDerivation rec {
   name = "EventStore-${version}";
-  version = "3.0.3";
+  version = "3.5.0";
   src = fetchFromGitHub {
     owner  = "EventStore";
     repo   = "EventStore";
     rev    = "oss-v${version}";
-    sha256 = "1xz1dpnbkqqd3ph9g3z5cghr8zp14sr9y31lrdjrdydr3gm4sll2";
+    sha256 = "0dp5914hxwdzw62q49wavqfqkw3jy0dvml09y7gh8frnbiajcxq9";
   };
 
-  patches = [
-    # see: https://github.com/EventStore/EventStore/issues/461
-    (fetchpatch {
-      url = https://github.com/EventStore/EventStore/commit/9a0987f19935178df143a3cf876becaa1b11ffae.patch;
-      sha256 = "04qw0rb1pypa8dqvj94j2mwkc1y6b40zrpkn1d3zfci3k8cam79y";
-    })
-  ];
-
   buildPhase = ''
-    ln -s ${v8}/lib/libv8.so src/libs/libv8.so
-    ln -s ${icu.out}/lib/libicui18n.so src/libs/libicui18n.so
-    ln -s ${icu.out}/lib/libicuuc.so src/libs/libicuuc.so
+    mkdir -p src/libs/x64/nixos
+    pushd src/EventStore.Projections.v8Integration
+    cc -o ../libs/x64/nixos/libjs1.so -fPIC -lv8 -shared -std=c++0x *.cpp
+    popd
 
     patchShebangs build.sh
-    ./build.sh js1
-    ./build.sh quick ${version}
+    ./build.sh ${version} release nixos
   '';
 
   installPhase = ''
@@ -41,8 +33,9 @@ stdenv.mkDerivation rec {
     chmod +x $out/bin/clusternode
   '';
 
-  buildInputs = [ git v8 mono ];
+  buildInputs = [ v8 mono ];
 
+  phases = [ "unpackPhase" "buildPhase" "installPhase" ];
   dontStrip = true;
 
   meta = {
@@ -50,6 +43,6 @@ stdenv.mkDerivation rec {
     description = "Event sourcing database with processing logic in JavaScript";
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ puffnfresh ];
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index 2ea255e4432d..289607328d62 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, scons, boost, gperftools, pcre, snappy
+{ stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre, snappy
 , zlib, libyamlcpp, sasl, openssl, libpcap, wiredtiger
 }:
 
@@ -53,7 +53,14 @@ in stdenv.mkDerivation rec {
   # vendored header file - regardless of whether or not we're using the system
   # tcmalloc - so we need to lift the include path manipulation out of the
   # conditional.
-  patches = [ ./valgrind-include.patch ];
+  patches =
+    [ ./valgrind-include.patch
+      (fetchpatch {
+        url = https://projects.archlinux.org/svntogit/community.git/plain/trunk/boost160.patch?h=packages/mongodb;
+        name = "boost160.patch";
+        sha256 = "0bvsf3499zj55pzamwjmsssr6x63w434944w76273fr5rxwzcmh8";
+      })
+    ];
 
   postPatch = ''
     # fix environment variable reading
diff --git a/pkgs/servers/nosql/riak/1.3.1.nix b/pkgs/servers/nosql/riak/1.3.1.nix
deleted file mode 100644
index df85044b8d1a..000000000000
--- a/pkgs/servers/nosql/riak/1.3.1.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{ stdenv, fetchurl, fetchFromGitHub, unzip, erlangR15}:
-
-let
-  srcs = {
-    riak = fetchurl {
-      url = "http://s3.amazonaws.com/downloads.basho.com/riak/1.3/1.3.1/riak-1.3.1.tar.gz";
-      sha256 = "a69093fc5df1b79f58645048b9571c755e00c3ca14dfd27f9f1cae2c6e628f01";
-    };
-    leveldb = fetchFromGitHub {
-      owner  = "basho";
-      repo   = "leveldb";
-      rev    = "1.3.1";
-      sha256 = "1jvv260ic38657y4lwwcvzmhah8xai594xy19r28gkzlpra1lnbb";
-    };
-  };
-in
-stdenv.mkDerivation rec {
-  name = "riak-1.3.1";
-
-  buildInputs = [unzip erlangR15];
-
-  src = srcs.riak;
-
-  patches = [ ./riak-1.3.1.patch ./riak-admin-1.3.1.patch ];
-
-  postUnpack = ''
-    mkdir -p $sourceRoot/deps/eleveldb/c_src/leveldb
-    cp -r ${srcs.leveldb}/* $sourceRoot/deps/eleveldb/c_src/leveldb
-    chmod 755 -R $sourceRoot/deps/eleveldb/c_src/leveldb
-    pushd $sourceRoot/deps/
-    mkdir riaknostic/deps
-    cp -R lager riaknostic/deps
-    cp -R getopt riaknostic/deps
-    cp -R meck riaknostic/deps
-    popd
-    patchShebangs .
-  '';
-
-  buildPhase = ''
-    make rel
-  '';
-
-  doCheck = false;
-
-  installPhase = ''
-    mkdir $out
-    mv rel/riak/etc rel/riak/riak-etc
-    mkdir -p rel/riak/etc
-    mv rel/riak/riak-etc rel/riak/etc/riak
-    mv rel/riak/* $out
-  '';
-
-  meta = {
-    maintainers = [ stdenv.lib.maintainers.orbitz ];
-    description = "Dynamo inspired NoSQL DB by Basho";
-    longDescription = ''
-      This patches the riak and riak-admin scripts to work better in Nix.
-      Rather than the scripts using their own location to determine where
-      the data, log, and etc directories should live, the scripts expect
-      RIAK_DATA_DIR, RIAK_LOG_DIR, and RIAK_ETC_DIR to be defined
-      and use those.
-    '';
-    platforms   = stdenv.lib.platforms.all;
-  };
-}