diff options
| author | Samuel Leathers <disasm@gmail.com> | 2019-08-30 23:04:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-30 23:04:43 -0400 |
| commit | 41a3746a90de9aafacc0f2eda48efd6f9c754728 (patch) | |
| tree | 86eaa546a173a058bab584b24ae8207304f34947 /pkgs | |
| parent | 6baeab2042e3562b05e2493ba7ef48b976b465e5 (diff) | |
| parent | 7ea1d15fc029cd1f65e93d9d6d1d1cf72876bdc0 (diff) | |
| download | nixlib-41a3746a90de9aafacc0f2eda48efd6f9c754728.tar nixlib-41a3746a90de9aafacc0f2eda48efd6f9c754728.tar.gz nixlib-41a3746a90de9aafacc0f2eda48efd6f9c754728.tar.bz2 nixlib-41a3746a90de9aafacc0f2eda48efd6f9c754728.tar.lz nixlib-41a3746a90de9aafacc0f2eda48efd6f9c754728.tar.xz nixlib-41a3746a90de9aafacc0f2eda48efd6f9c754728.tar.zst nixlib-41a3746a90de9aafacc0f2eda48efd6f9c754728.zip | |
Merge pull request #66253 from magenbluten/rocksdb
rocksdb: 6.1.2 -> 6.2.2
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/rocksdb/0001-findzlib.patch | 13 | ||||
| -rw-r--r-- | pkgs/development/libraries/rocksdb/default.nix | 8 |
2 files changed, 5 insertions, 16 deletions
diff --git a/pkgs/development/libraries/rocksdb/0001-findzlib.patch b/pkgs/development/libraries/rocksdb/0001-findzlib.patch deleted file mode 100644 index eb532620773e..000000000000 --- a/pkgs/development/libraries/rocksdb/0001-findzlib.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 132d3b0..37fec63 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -92,7 +92,7 @@ else() - endif() - - if(WITH_ZLIB) -- find_package(zlib REQUIRED) -+ find_package(ZLIB REQUIRED) - add_definitions(-DZLIB) - if(ZLIB_INCLUDE_DIRS) - # CMake 3 diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 05ecf0f8f257..1b6b5b1b57bf 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -2,19 +2,21 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.1.2"; + version = "6.2.2"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "0gy2zjga3r8k9pbn2b0b5fzv4m0h2ip3zmyja1i7fli9n56civ3y"; + sha256 = "0wz9rfj8gk6gyabh9anl67fqm5dw2z866y1a0k0j2lmcaag537r2"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ bzip2 lz4 snappy zlib zstd ]; - patches = [ ./0001-findzlib.patch ]; + postPatch = '' + substituteInPlace CMakeLists.txt --replace "find_package(zlib " "find_package(ZLIB " + ''; cmakeFlags = [ "-DPORTABLE=1" |