diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2017-08-26 11:48:23 +0100 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2017-08-26 13:32:13 +0100 |
commit | fcfd477c9baa0c7189bcdd17e11650a75c11615f (patch) | |
tree | 81a53b9c121188063a69b43accb772ccf5f87b51 /pkgs/servers | |
parent | 8c3cc7c7c4fa88b4df7adf7841cb5cbf03459f8f (diff) | |
download | nixlib-fcfd477c9baa0c7189bcdd17e11650a75c11615f.tar nixlib-fcfd477c9baa0c7189bcdd17e11650a75c11615f.tar.gz nixlib-fcfd477c9baa0c7189bcdd17e11650a75c11615f.tar.bz2 nixlib-fcfd477c9baa0c7189bcdd17e11650a75c11615f.tar.lz nixlib-fcfd477c9baa0c7189bcdd17e11650a75c11615f.tar.xz nixlib-fcfd477c9baa0c7189bcdd17e11650a75c11615f.tar.zst nixlib-fcfd477c9baa0c7189bcdd17e11650a75c11615f.zip |
arangodb: 2.5.3 -> 3.2.2
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/nosql/arangodb/default.nix | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index e7dc7ae92255..0e5590a94208 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -1,29 +1,28 @@ -{ stdenv, fetchFromGitHub, openssl, zlib, python2Packages, bash, go, readline }: +{ stdenv, fetchFromGitHub +, openssl, zlib, python2Packages, readline, cmake, python }: let - inherit (python2Packages) python gyp; in stdenv.mkDerivation rec { - version = "2.5.3"; + version = "3.2.2"; name = "arangodb-${version}"; src = fetchFromGitHub { repo = "arangodb"; owner = "arangodb"; - rev = "67d995aa22ea341129398326fa10c5f6c14e94e9"; - sha256 = "1v07fghf2jd2mvkfqhag0xblf6sxw7kx9kmhs2xpyrpns58lirvc"; + rev = "v${version}"; + sha256 = "0f87r0fr3i09fnmwjqz6q1lwd5k32a2knrls0nv0zhqrma7sdy01"; }; - postPatch = '' - 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 - sed '1i#include <cmath>' -i arangod/Aql/Functions.cpp \ - -i lib/Basics/string-buffer.cpp - ''; - buildInputs = [ - openssl zlib python gyp go readline + openssl zlib go readline python ]; + nativeBuildInputs = [ cmake ]; + + postPatch = '' + sed -ie 's!/bin/echo!echo!' 3rdParty/V8/v*/gypfiles/*.gypi + ''; + configureFlagsArray = [ "--with-openssl-lib=${openssl.out}/lib" ]; NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; |