public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #56568 from volth/arangodb 

arangodb: 3.3.19 -> 3.2.18, 3.3.23.1, 3.4.7, 3.5.0-rc.7
This commit is contained in:
Aaron Andersen 2019-08-06 20:54:24 -04:00 committed by GitHub
parent a4c6a7b336 bbb6014052
commit 79c9533e39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 57 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
pkgs/servers/nosql/arangodb/default.nix
View File

@ -1,39 +1,60 @@
{ stdenv, fetchFromGitHub { stdenv, lib, fetchFromGitHub, openssl, zlib, cmake, python2, perl, snappy, lzo, which }:
, openssl, zlib, readline, cmake, python }:
let let
in stdenv.mkDerivation rec { common = { version, sha256 }: stdenv.mkDerivation {
version = "3.3.19"; pname = "arangodb";
name = "arangodb-${version}"; inherit version;
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "arangodb"; repo = "arangodb";
owner = "arangodb"; owner = "arangodb";
rev = "v${version}"; rev = "v${version}";
sha256 = "1qg4lqnn5x0xsmkq41mjj301mfh76r8ys1rkzhinxlq30jld3155"; inherit sha256;
}; };
buildInputs = [ nativeBuildInputs = [ cmake python2 perl which ];
openssl zlib readline python buildInputs = [ openssl zlib snappy lzo ];
];
# prevent failing with "cmake-3.13.4/nix-support/setup-hook: line 10: ./3rdParty/rocksdb/RocksDBConfig.cmake.in: No such file or directory"
nativeBuildInputs = [ cmake ]; dontFixCmake = lib.versionAtLeast version "3.5";
NIX_CFLAGS_COMPILE = lib.optionals (lib.versionAtLeast version "3.5") [ "-Wno-error" ];
postPatch = '' preConfigure = lib.optionalString (lib.versionAtLeast version "3.5") "patchShebangs utils";
sed -ie 's!/bin/echo!echo!' 3rdParty/V8/v*/gypfiles/*.gypi
''; postPatch = ''
sed -ie 's!/bin/echo!echo!' 3rdParty/V8/v*/gypfiles/*.gypi
configureFlagsArray = [ "--with-openssl-lib=${openssl.out}/lib" ];
# with nixpkgs, it has no sense to check for a version update
NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; substituteInPlace js/client/client.js --replace "require('@arangodb').checkAvailableVersions();" ""
substituteInPlace js/server/server.js --replace "require('@arangodb').checkAvailableVersions();" ""
enableParallelBuilding = true; '';
meta = with stdenv.lib; { cmakeFlags = [
homepage = https://github.com/arangodb/arangodb; # do not set GCC's -march=xxx based on builder's /proc/cpuinfo
description = "A native multi-model database with flexible data models for documents, graphs, and key-values"; "-DUSE_OPTIMIZE_FOR_ARCHITECTURE=OFF"
license = licenses.asl20; # also avoid using builder's /proc/cpuinfo
platforms = platforms.linux; ] ++
maintainers = [ maintainers.flosse ]; { "westmere" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
"sandybridge" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
"ivybridge" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
"haswell" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
"broadwell" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
"skylake" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
"skylake-avx512" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ];
}.${stdenv.hostPlatform.platform.gcc.arch or ""} or [ "-DHAVE_SSE42=OFF" "-DASM_OPTIMIZATIONS=OFF" ];
enableParallelBuilding = true;
meta = with lib; {
homepage = https://www.arangodb.com;
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 ];
};
}; };
in {
arangodb_3_2 = common { version = "3.2.18"; sha256 = "05mfrx1g6dh1bzzqs23nvk0rg3v8y2dhdam4lym55pzlhqa7lf0x"; };
arangodb_3_3 = common { version = "3.3.23.1"; sha256 = "0bnbiispids7jcgrgcmanf9jqgvk0vaflrvgalz587jwr2zf21k8"; };
arangodb_3_4 = common { version = "3.4.7"; sha256 = "1wr2xvi5lnl6f2ryyxdwn4wnfiaz0rrf58ja1k19m7b6w3264iim"; };
arangodb_3_5 = common { version = "3.5.0-rc.7"; sha256 = "1sdmbmyml9d3ia3706bv5901qqmh4sxk7js5b9hyfjqpcib10d1k"; };
} }

3
pkgs/top-level/all-packages.nix
View File

@ -573,7 +573,8 @@ in
arandr = callPackage ../tools/X11/arandr { }; arandr = callPackage ../tools/X11/arandr { };
arangodb = callPackage ../servers/nosql/arangodb { }; inherit (callPackages ../servers/nosql/arangodb { }) arangodb_3_2 arangodb_3_3 arangodb_3_4 arangodb_3_5;
arangodb = arangodb_3_4;
arcanist = callPackage ../development/tools/misc/arcanist {}; arcanist = callPackage ../development/tools/misc/arcanist {};