arangodb: 2.5.3 -> 3.2.2

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";