From 434676aa05044fc157156f1e503d5ef1b1316068 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 16 Jun 2021 16:50:41 +0200 Subject: [PATCH] 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; }; }