git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #145823 from prusnak/rocksdb_6_23

rocksdb: reintroduce rocksdb 6.23.3 as rocksdb_6_23

commitaa7981ebc4e409069baf5aec018419d7a6dfa0e4 authorPavol Rusnak <pavol@rusnak.io> dateMon 15 Nov 2021, 15:41 (5 years ago) parent20d6600af9b2fc
3 files changed+32−21
pkgs/applications/blockchains/electrs/default.nix+6−6 pkgs/servers/blockbook/default.nix+15−15 pkgs/top-level/all-packages.nix+11
pkgs/applications/blockchains/electrs/default.nix+6−6
@@ -3,10 +3,13 @@
33, rustPlatform
44, fetchFromGitHub
55, llvmPackages
6−, rocksdb
6+, rocksdb_6_23
77, Security
88}:
99
10+let
11+ rocksdb = rocksdb_6_23;
12+in
1013rustPlatform.buildRustPackage rec {
1114 pname = "electrs";
1215 version = "0.9.2";
@@ -24,12 +27,9 @@ rustPlatform.buildRustPackage rec {
2427 nativeBuildInputs = [ llvmPackages.clang ];
2528 LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
2629
27− # temporarily disable dynamic linking, which broke with rocksdb update 6.23.3 -> 6.25.3
28− # https://github.com/NixOS/nixpkgs/pull/143524#issuecomment-955053331
29− #
3030 # link rocksdb dynamically
31− # ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
32− # ROCKSDB_LIB_DIR = "${rocksdb}/lib";
31+ ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
32+ ROCKSDB_LIB_DIR = "${rocksdb}/lib";
3333
3434 buildInputs = lib.optionals stdenv.isDarwin [ Security ];
3535
pkgs/servers/blockbook/default.nix+15−15
@@ -1,35 +1,35 @@
1−{ lib, stdenv
1+{ lib
2+, stdenv
23, buildGoModule
34, fetchFromGitHub
4−, packr
55, pkg-config
66, bzip2
77, lz4
8−, rocksdb
8+, rocksdb_6_23
99, snappy
1010, zeromq
1111, zlib
1212, nixosTests
1313}:
1414
15+let
16+ rocksdb = rocksdb_6_23;
17+in
1518buildGoModule rec {
1619 pname = "blockbook";
17− version = "0.3.4";
18− commit = "eb4e10a";
20+ version = "0.3.6";
21+ commit = "5f8cf45";
1922
2023 src = fetchFromGitHub {
2124 owner = "trezor";
2225 repo = "blockbook";
2326 rev = "v${version}";
24− sha256 = "0da1kav5x2xcmwvdgfk1q70l1k0sqqj3njgx2xx885d40m6qbnrs";
27+ sha256 = "1jb195chy3kbspmv9vyg7llw6kgykkmvz3znd97mxf24f4q622jv";
2528 };
2629
27− runVend = true;
28− vendorSha256 = "0p7vyw61nwvmaz7gz2bdh9fi6wp62i2vnzw6iz2r8cims4sbz53b";
30+ vendorSha256 = "0d17qaqn33wi7lzw4hlym56d9v4qnmvs6plpm5jiby2g5yckq0mz";
2931
30− doCheck = false;
31−
32− nativeBuildInputs = [ packr pkg-config ];
32+ nativeBuildInputs = [ pkg-config ];
3333
3434 buildInputs = [ bzip2 lz4 rocksdb snappy zeromq zlib ];
3535
@@ -39,11 +39,14 @@ buildGoModule rec {
3939 "-X github.com/trezor/blockbook/common.buildDate=unknown"
4040 ];
4141
42+ tags = [ "rocksdb_6_16" ];
43+
4244 preBuild = lib.optionalString stdenv.isDarwin ''
4345 ulimit -n 8192
4446 '' + ''
4547 export CGO_LDFLAGS="-L${stdenv.cc.cc.lib}/lib -lrocksdb -lz -lbz2 -lsnappy -llz4 -lm -lstdc++"
46− packr clean && packr
48+ buildFlagsArray+=("-tags=${lib.concatStringsSep " " tags}")
49+ buildFlagsArray+=("-ldflags=${lib.concatStringsSep " " ldflags}")
4750 '';
4851
4952 subPackages = [ "." ];
@@ -64,8 +67,5 @@ buildGoModule rec {
6467 license = licenses.agpl3;
6568 maintainers = with maintainers; [ mmahut _1000101 ];
6669 platforms = platforms.unix;
67− # go dependency tecbot/gorocksdb requires rocksdb 5.x but nixpkgs has only rocksdb 6.x
68− # issue in upstream can be tracked here: https://github.com/trezor/blockbook/issues/617
69− broken = true;
7070 };
7171}
pkgs/top-level/all-packages.nix+11
@@ -19323,6 +19323,17 @@ with pkgs;
1932319323
1932419324 rocksdb_lite = rocksdb.override { enableLite = true; };
1932519325
19326+ rocksdb_6_23 = rocksdb.overrideAttrs (old: rec {
19327+ pname = "rocksdb";
19328+ version = "6.23.3";
19329+ src = fetchFromGitHub {
19330+ owner = "facebook";
19331+ repo = pname;
19332+ rev = "v${version}";
19333+ sha256 = "sha256-SsDqhjdCdtIGNlsMj5kfiuS3zSGwcxi4KV71d95h7yk=";
19334+ };
19335+ });
19336+
1932619337 rotate-backups = callPackage ../tools/backup/rotate-backups { };
1932719338
1932819339 rote = callPackage ../development/libraries/rote { };