diff options
Diffstat (limited to 'pkgs/servers/nosql')
-rw-r--r-- | pkgs/servers/nosql/arangodb/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/nosql/mongodb/default.nix | 11 | ||||
-rw-r--r-- | pkgs/servers/nosql/riak/1.3.1.nix | 67 |
3 files changed, 11 insertions, 69 deletions
diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 4ff12f630c9b..7ccd29bc783a 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { openssl zlib python gyp go readline ]; + NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; + configureFlagsArray = [ "--with-openssl-lib=${openssl}/lib" ]; patchPhase = '' diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 913b312a54a3..1ef79f2ebcdc 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 }: @@ -54,7 +54,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 565ed226ab4f..000000000000 --- a/pkgs/servers/nosql/riak/1.3.1.nix +++ /dev/null @@ -1,67 +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 ]; - - hardeningDisable = [ "format" ]; - - 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; - }; -} |