Merge pull request #101559 from basvandijk/rocksdb-6.12.7

rocksdb: 6.10.2 -> 6.12.7
This commit is contained in:
Bas van Dijk 2020-10-25 14:46:39 +01:00 committed by GitHub
commit 67f5d7f7cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -15,28 +15,20 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rocksdb"; pname = "rocksdb";
version = "6.10.2"; version = "6.12.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1f2wqb6px812ijcivq3rsknqgkv01wblc6sd8wavhrw8qljgr3s1"; sha256 = "0cpi0v691xsh20hj5x2y2z7dmjvhd3brr0swszv0xqjg2q0f7zdb";
}; };
nativeBuildInputs = [ cmake ninja ]; nativeBuildInputs = [ cmake ninja ];
buildInputs = [ bzip2 lz4 snappy zlib zstd ] ++ stdenv.lib.optional enableJemalloc jemalloc; propagatedBuildInputs = [ bzip2 lz4 snappy zlib zstd ];
patches = [ buildInputs = stdenv.lib.optional enableJemalloc jemalloc;
# 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"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move";