From 4b0a59b3fe08c884109b8b2d390fd3ff9b2684cf Mon Sep 17 00:00:00 2001
From: Markus Kohlhase <mail@markus-kohlhase.de>
Date: Thu, 30 Apr 2015 16:48:57 +0200
Subject: [PATCH 1/2] pkgs: added ArangoDB 2.5.2

---
 pkgs/servers/nosql/arangodb/default.nix | 33 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  4 +++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/servers/nosql/arangodb/default.nix

diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
new file mode 100644
index 00000000000..847d56b1f0a
--- /dev/null
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchgit, openssl, zlib, python, gyp, bash, go, readline }:
+
+stdenv.mkDerivation rec {
+  version = "2.5.2";
+  name    = "arangodb-${version}";
+
+  src = fetchgit {
+    url = https://github.com/arangodb/arangodb.git;
+    rev = "refs/tags/v${version}";
+    sha256 = "04l9palmh0jwbylapsss7d1s0h54wb6kng30zqsl3dq9l91ii6s0";
+  };
+
+  buildInputs = [
+    openssl zlib python gyp go readline
+  ];
+
+  configureFlagsArray = [ "--with-openssl-lib=${openssl}/lib" ];
+
+  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
+    '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/arangodb/arangodb";
+    description = "A native multi-model database with flexible data models for documents, graphs, and key-values";
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.flosse ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab48e4e367a..889e5a7ff8b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -544,6 +544,10 @@ let
 
   arandr = callPackage ../tools/X11/arandr { };
 
+  arangodb = callPackage ../servers/nosql/arangodb {
+    inherit (pythonPackages) gyp;
+  };
+
   arcanist = callPackage ../development/tools/misc/arcanist {};
 
   arduino = arduino-core.override { withGui = true; };

From 5f9ee33df53d1c24a7c37a92f5c0b4cfe2dbc0ee Mon Sep 17 00:00:00 2001
From: Markus Kohlhase <mail@markus-kohlhase.de>
Date: Sat, 2 May 2015 14:37:31 +0200
Subject: [PATCH 2/2] pkgs: arangodb 2.5.2 -> 2.5.3

---
 pkgs/servers/nosql/arangodb/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index 847d56b1f0a..4ff12f630c9 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchgit, openssl, zlib, python, gyp, bash, go, readline }:
+{ stdenv, fetchFromGitHub, openssl, zlib, python, gyp, bash, go, readline }:
 
 stdenv.mkDerivation rec {
-  version = "2.5.2";
+  version = "2.5.3";
   name    = "arangodb-${version}";
 
-  src = fetchgit {
-    url = https://github.com/arangodb/arangodb.git;
-    rev = "refs/tags/v${version}";
-    sha256 = "04l9palmh0jwbylapsss7d1s0h54wb6kng30zqsl3dq9l91ii6s0";
+  src = fetchFromGitHub {
+    repo = "arangodb";
+    owner = "arangodb";
+    rev = "67d995aa22ea341129398326fa10c5f6c14e94e9";
+    sha256 = "1v07fghf2jd2mvkfqhag0xblf6sxw7kx9kmhs2xpyrpns58lirvc";
   };
 
   buildInputs = [