From f1c4d5d4798eb9043e04dc0530c08cd66f5c1dc4 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 24 Oct 2020 16:36:38 +0200 Subject: [PATCH] rocksdb: 6.10.2 -> 6.12.7 https://github.com/facebook/rocksdb/blob/v6.12.7/HISTORY.md#6127-2020-10-14 --- pkgs/development/libraries/rocksdb/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 5f023da49f3..2087c9cc81c 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -15,29 +15,19 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.10.2"; + version = "6.12.7"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "1f2wqb6px812ijcivq3rsknqgkv01wblc6sd8wavhrw8qljgr3s1"; + sha256 = "0cpi0v691xsh20hj5x2y2z7dmjvhd3brr0swszv0xqjg2q0f7zdb"; }; nativeBuildInputs = [ cmake ninja ]; buildInputs = [ bzip2 lz4 snappy zlib zstd ] ++ stdenv.lib.optional enableJemalloc jemalloc; - patches = [ - # 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/07204837ce8d66e1e6e4893178f3fd040f9c1044.patch"; - sha256 = "17097ybkhy0i089zzkpvcj65c7g5skvjvdzi1k09x4i1d719wm39"; - }) - ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move"; cmakeFlags = [