diff options
author | Pavol Rusnak <pavol@rusnak.io> | 2020-07-17 20:10:46 +0200 |
---|---|---|
committer | Pavol Rusnak <pavol@rusnak.io> | 2020-07-18 16:57:38 +0200 |
commit | 49581587c20e5caa40328bf97cf22c8dbe89b2b4 (patch) | |
tree | 7190efb5d11a3860e4a2b1b8dfae1f9c28e3bb42 /pkgs/development | |
parent | 3829979d8d29c9f24d52768a0fe485cfb3257a2b (diff) |
rocksdb: 6.4.6 -> 6.10.2
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/rocksdb/default.nix | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 6606f57bc4b1f..9bc3770f21e08 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -1,42 +1,49 @@ -{ stdenv, fetchFromGitHub, fetchpatch -, cmake, ninja -, bzip2, lz4, snappy, zlib, zstd +{ stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, ninja +, bzip2 +, lz4 +, snappy +, zlib +, zstd , enableLite ? false }: stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.4.6"; + version = "6.10.2"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "0s0n4p1b4jzmslz9d2xd4ajra0m6l9x26mjwlbgw0klxjggmy8qn"; + sha256 = "1f2wqb6px812ijcivq3rsknqgkv01wblc6sd8wavhrw8qljgr3s1"; }; nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ bzip2 lz4 snappy zlib zstd ]; patches = [ - # https://github.com/facebook/rocksdb/pull/6076 + # Without this change private dependencies are exported. + # Can be removed after the next release. + # https://github.com/facebook/rocksdb/pull/6790 (fetchpatch { - url = "https://github.com/facebook/rocksdb/commit/c0be4b2ff1a5393419673fab961cb9b09ba38752.diff"; - sha256 = "1f2wg9kqlmf2hiiihmbp8m5fr2wnn7896g6i9yg9hdgi40pw30w6"; + url = "https://github.com/facebook/rocksdb/commit/07204837ce8d66e1e6e4893178f3fd040f9c1044.patch"; + sha256 = "17097ybkhy0i089zzkpvcj65c7g5skvjvdzi1k09x4i1d719wm39"; }) ]; - postPatch = '' - substituteInPlace CMakeLists.txt --replace "find_package(zlib " "find_package(ZLIB " - ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move"; cmakeFlags = [ "-DPORTABLE=1" "-DWITH_JEMALLOC=0" "-DWITH_JNI=0" - "-DWITH_TESTS=0" + "-DWITH_BENCHMARK_TOOLS=0" + "-DWITH_TESTS=1" "-DWITH_TOOLS=0" "-DWITH_BZ2=1" "-DWITH_LZ4=1" |