From 214b39133eef93734c984ea3a06caa4affcfb9cb Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 13 Nov 2021 18:21:51 +0100 Subject: [PATCH 1/5] rocksdb: reintroduce rocksdb 6.23.3 as rocksdb_6_23 --- pkgs/top-level/all-packages.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 717e2c5d05e5..1c13cf958007 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19300,6 +19300,17 @@ with pkgs; rocksdb_lite = rocksdb.override { enableLite = true; }; + rocksdb_6_23 = rocksdb.overrideAttrs (old: rec { + pname = "rocksdb"; + version = "6.23.3"; + src = fetchFromGitHub { + owner = "facebook"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-SsDqhjdCdtIGNlsMj5kfiuS3zSGwcxi4KV71d95h7yk="; + }; + }); + rotate-backups = callPackage ../tools/backup/rotate-backups { }; rote = callPackage ../development/libraries/rote { }; From 434676aa05044fc157156f1e503d5ef1b1316068 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 16 Jun 2021 16:50:41 +0200 Subject: [PATCH 2/5] blockbook: 0.3.4 -> 0.3.6 --- pkgs/servers/blockbook/default.nix | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index b10f8919af7a..f628c2f1f368 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , buildGoModule , fetchFromGitHub -, packr , pkg-config , bzip2 , lz4 @@ -14,22 +14,19 @@ buildGoModule rec { pname = "blockbook"; - version = "0.3.4"; - commit = "eb4e10a"; + version = "0.3.6"; + commit = "5f8cf45"; src = fetchFromGitHub { owner = "trezor"; repo = "blockbook"; rev = "v${version}"; - sha256 = "0da1kav5x2xcmwvdgfk1q70l1k0sqqj3njgx2xx885d40m6qbnrs"; + sha256 = "1jb195chy3kbspmv9vyg7llw6kgykkmvz3znd97mxf24f4q622jv"; }; - runVend = true; - vendorSha256 = "0p7vyw61nwvmaz7gz2bdh9fi6wp62i2vnzw6iz2r8cims4sbz53b"; + vendorSha256 = "0d17qaqn33wi7lzw4hlym56d9v4qnmvs6plpm5jiby2g5yckq0mz"; - doCheck = false; - - nativeBuildInputs = [ packr pkg-config ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ bzip2 lz4 rocksdb snappy zeromq zlib ]; @@ -39,11 +36,14 @@ buildGoModule rec { "-X github.com/trezor/blockbook/common.buildDate=unknown" ]; + tags = [ "rocksdb_6_16" ]; + preBuild = lib.optionalString stdenv.isDarwin '' ulimit -n 8192 '' + '' export CGO_LDFLAGS="-L${stdenv.cc.cc.lib}/lib -lrocksdb -lz -lbz2 -lsnappy -llz4 -lm -lstdc++" - packr clean && packr + buildFlagsArray+=("-tags=${lib.concatStringsSep " " tags}") + buildFlagsArray+=("-ldflags=${lib.concatStringsSep " " ldflags}") ''; subPackages = [ "." ]; @@ -64,8 +64,5 @@ buildGoModule rec { license = licenses.agpl3; maintainers = with maintainers; [ mmahut _1000101 ]; platforms = platforms.unix; - # go dependency tecbot/gorocksdb requires rocksdb 5.x but nixpkgs has only rocksdb 6.x - # issue in upstream can be tracked here: https://github.com/trezor/blockbook/issues/617 - broken = true; }; } From 31cf0a39137fdb06c19bdb0102cbe0239d730948 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 14 Nov 2021 00:22:26 +0100 Subject: [PATCH 3/5] blockbook: use rocksdb_6_23 --- pkgs/servers/blockbook/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index f628c2f1f368..475541231b16 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -5,13 +5,16 @@ , pkg-config , bzip2 , lz4 -, rocksdb +, rocksdb_6_23 , snappy , zeromq , zlib , nixosTests }: +let + rocksdb = rocksdb_6_23; +in buildGoModule rec { pname = "blockbook"; version = "0.3.6"; From 06651404a6cce0227f2d7a0489ceadc64781fdaf Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 14 Nov 2021 00:36:05 +0100 Subject: [PATCH 4/5] electrs: bring back rocksdb dynamic linking --- pkgs/applications/blockchains/electrs/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index 84b2a2f736a1..4981b28fc149 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -24,12 +24,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ llvmPackages.clang ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - # temporarily disable dynamic linking, which broke with rocksdb update 6.23.3 -> 6.25.3 - # https://github.com/NixOS/nixpkgs/pull/143524#issuecomment-955053331 - # # link rocksdb dynamically - # ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; - # ROCKSDB_LIB_DIR = "${rocksdb}/lib"; + ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; + ROCKSDB_LIB_DIR = "${rocksdb}/lib"; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From af9b2fc0ae447acc539fa6d9261023384c327bfc Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 14 Nov 2021 00:36:30 +0100 Subject: [PATCH 5/5] electrs: use rocksdb_6_23 --- pkgs/applications/blockchains/electrs/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index 4981b28fc149..13d0994799ab 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -3,10 +3,13 @@ , rustPlatform , fetchFromGitHub , llvmPackages -, rocksdb +, rocksdb_6_23 , Security }: +let + rocksdb = rocksdb_6_23; +in rustPlatform.buildRustPackage rec { pname = "electrs"; version = "0.9.2";