diff options
author | Robin Gloster <mail@glob.in> | 2019-08-25 18:55:46 +0200 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2019-08-25 18:55:46 +0200 |
commit | 616b8343c4c384f651f51d8c9b8e96239e1113d0 (patch) | |
tree | c6894ea5e950e373bcf8c8e8948fb2a7d4716565 /pkgs/servers/nosql | |
parent | 45d6ccea3357c65135b985f2eebf88020ca6461e (diff) | |
parent | 48191315aa2e34643203dbfc5ae8bd84c1cafe54 (diff) | |
download | nixpkgs-616b8343c4c384f651f51d8c9b8e96239e1113d0.tar nixpkgs-616b8343c4c384f651f51d8c9b8e96239e1113d0.tar.gz nixpkgs-616b8343c4c384f651f51d8c9b8e96239e1113d0.tar.bz2 nixpkgs-616b8343c4c384f651f51d8c9b8e96239e1113d0.tar.lz nixpkgs-616b8343c4c384f651f51d8c9b8e96239e1113d0.tar.xz nixpkgs-616b8343c4c384f651f51d8c9b8e96239e1113d0.tar.zst nixpkgs-616b8343c4c384f651f51d8c9b8e96239e1113d0.zip |
Merge remote-tracking branch 'upstream/master' into gcc-8
Diffstat (limited to 'pkgs/servers/nosql')
-rw-r--r-- | pkgs/servers/nosql/arangodb/default.nix | 91 | ||||
-rw-r--r-- | pkgs/servers/nosql/cassandra/2.2.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/nosql/cassandra/3.11.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/nosql/eventstore/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/nosql/mongodb/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/nosql/neo4j/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/nosql/redis/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/nosql/rethinkdb/default.nix | 1 |
8 files changed, 68 insertions, 44 deletions
diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 12684eab551..11695d753e2 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -1,39 +1,60 @@ -{ stdenv, fetchFromGitHub -, openssl, zlib, readline, cmake, python }: +{ stdenv, lib, fetchFromGitHub, openssl, zlib, cmake, python2, perl, snappy, lzo, which }: let -in stdenv.mkDerivation rec { - version = "3.3.19"; - name = "arangodb-${version}"; - - src = fetchFromGitHub { - repo = "arangodb"; - owner = "arangodb"; - rev = "v${version}"; - sha256 = "1qg4lqnn5x0xsmkq41mjj301mfh76r8ys1rkzhinxlq30jld3155"; - }; - - buildInputs = [ - openssl zlib 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"; - - 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 ]; + common = { version, sha256 }: stdenv.mkDerivation { + pname = "arangodb"; + inherit version; + + src = fetchFromGitHub { + repo = "arangodb"; + owner = "arangodb"; + rev = "v${version}"; + inherit sha256; + }; + + nativeBuildInputs = [ cmake python2 perl which ]; + 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" + dontFixCmake = lib.versionAtLeast version "3.5"; + NIX_CFLAGS_COMPILE = lib.optionals (lib.versionAtLeast version "3.5") [ "-Wno-error" ]; + preConfigure = lib.optionalString (lib.versionAtLeast version "3.5") "patchShebangs utils"; + + postPatch = '' + sed -ie 's!/bin/echo!echo!' 3rdParty/V8/v*/gypfiles/*.gypi + + # with nixpkgs, it has no sense to check for a version update + substituteInPlace js/client/client.js --replace "require('@arangodb').checkAvailableVersions();" "" + substituteInPlace js/server/server.js --replace "require('@arangodb').checkAvailableVersions();" "" + ''; + + cmakeFlags = [ + # do not set GCC's -march=xxx based on builder's /proc/cpuinfo + "-DUSE_OPTIMIZE_FOR_ARCHITECTURE=OFF" + # also avoid using builder's /proc/cpuinfo + ] ++ + { "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"; }; } diff --git a/pkgs/servers/nosql/cassandra/2.2.nix b/pkgs/servers/nosql/cassandra/2.2.nix index 88c361e6a91..f9966b1ccd5 100644 --- a/pkgs/servers/nosql/cassandra/2.2.nix +++ b/pkgs/servers/nosql/cassandra/2.2.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "2.2.13"; - sha256 = "19jryhjkh5jsgp6jlz2v28vwm5dks8i7mshsv3s2fpnl6147paaq"; + version = "2.2.14"; + sha256 = "1b2x3q1ach44qg07sh8wr7d8a10n36w5522drd3p35djbiwa3d9q"; }) diff --git a/pkgs/servers/nosql/cassandra/3.11.nix b/pkgs/servers/nosql/cassandra/3.11.nix index 5ca268166e0..56a3c5705b5 100644 --- a/pkgs/servers/nosql/cassandra/3.11.nix +++ b/pkgs/servers/nosql/cassandra/3.11.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "3.11.3"; - sha256 = "1fp2sm8v7dpp7iym39c7dh1fmi25x462amgzizl93c21rdq0cbnq"; + version = "3.11.4"; + sha256 = "11wr0vcps8w8g2sd8qwp1yp8y873c4q32azc041xpi7zqciqwnax"; }) diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index f3035e13140..c06b8432419 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { name = "EventStore-${version}"; - version = "5.0.0"; + version = "5.0.2"; src = fetchFromGitHub { owner = "EventStore"; repo = "EventStore"; rev = "oss-v${version}"; - sha256 = "1qdnkaxiryyz8yhwqncmshsg8wi4v69dcxnvgvl4hn81zsj6fasw"; + sha256 = "0hjc64lmi9x1sq8zk24iag14k424l72g1n4z7wf7gaygd07kx9k8"; }; buildInputs = [ diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index b1d9154a747..842c988d9b3 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -81,6 +81,8 @@ in stdenv.mkDerivation rec { preBuild = '' sconsFlags+=" CC=$CC" sconsFlags+=" CXX=$CXX" + '' + optionalString stdenv.isAarch64 '' + sconsFlags+=" CCFLAGS='-march=armv8-a+crc'" ''; preInstall = '' diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index c3f19a1cbe5..9b173e538d3 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "neo4j-${version}"; - version = "3.5.5"; + version = "3.5.8"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - sha256 = "1dphg1xyh8h7dx74nrcc9aspiylnskqnmysim9k39v8myf7a77mq"; + sha256 = "0kj92vljxdhk9pf6gr9cvd2a2ilc4myp5djjkrj3gm37f074swgg"; }; buildInputs = [ makeWrapper jre8 which gawk ]; diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 0ce948c715e..20a6321e0a8 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "An open source, advanced key-value store"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = [ maintainers.berdario ]; + maintainers = with maintainers; [ berdario globin ]; }; } diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index d6ee407e341..a1a9072f5ca 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -61,5 +61,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.agpl3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ thoughtpolice bluescreen303 ]; + broken = true; # broken with openssl 1.1 }; } |