From bb55ace298e03400b34b3af07db40054ba38eb48 Mon Sep 17 00:00:00 2001 From: Lena Fuhrimann <6780471+cloudlena@users.noreply.github.com> Date: Sat, 24 May 2025 12:07:41 +0200 Subject: [PATCH 1/2] blockbook: 0.4.0 -> 0.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In collaboration with @stapelberg @LorenzBischof ♥️ We also added `rocksdb_9_10` because it wouldn't build without it. --- pkgs/by-name/bl/blockbook/package.nix | 14 ++++++-------- pkgs/top-level/all-packages.nix | 11 +++++++++++ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/bl/blockbook/package.nix b/pkgs/by-name/bl/blockbook/package.nix index b246fc368970..a2d908df991e 100644 --- a/pkgs/by-name/bl/blockbook/package.nix +++ b/pkgs/by-name/bl/blockbook/package.nix @@ -6,7 +6,7 @@ lz4, nixosTests, pkg-config, - rocksdb_7_10, + rocksdb_9_10, snappy, stdenv, zeromq, @@ -14,23 +14,23 @@ }: let - rocksdb = rocksdb_7_10; + rocksdb = rocksdb_9_10; in buildGoModule rec { pname = "blockbook"; - version = "0.4.0"; - commit = "b227dfe"; + version = "0.5.0"; + commit = "657cbcf"; src = fetchFromGitHub { owner = "trezor"; repo = "blockbook"; rev = "v${version}"; - hash = "sha256-98tp3QYaHfhVIiJ4xkA3bUanXwK1q05t+YNroFtBUxE="; + hash = "sha256-8/tyqmZE9NJWGg7zYcdei0f1lpXfehy6LM6k5VHW33g="; }; proxyVendor = true; - vendorHash = "sha256-n03eWWy+58KAbYnKxI3/ulWIpmR+ivtImQSqbe2kpYU="; + vendorHash = "sha256-W29AvzfleCYC2pgHj2OB00PWBTcD2UUDbDH/z5A3bQ4="; nativeBuildInputs = [ pkg-config ]; @@ -49,8 +49,6 @@ buildGoModule rec { "-X github.com/trezor/blockbook/common.buildDate=unknown" ]; - tags = [ "rocksdb_7_10" ]; - CGO_LDFLAGS = [ "-L${lib.getLib stdenv.cc.cc}/lib" "-lrocksdb" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 330e39efac2c..0699ae38d3c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9505,6 +9505,17 @@ with pkgs; jvm = jre8; }; + rocksdb_9_10 = rocksdb.overrideAttrs rec { + pname = "rocksdb"; + version = "9.10.0"; + src = fetchFromGitHub { + owner = "facebook"; + repo = pname; + rev = "v${version}"; + hash = "sha256-G+DlQwEUyd7JOCjS1Hg1cKWmA/qAiK8UpUIKcP+riGQ="; + }; + }; + rocksdb_8_11 = rocksdb.overrideAttrs rec { pname = "rocksdb"; version = "8.11.4"; From 6a07e51fe19c8927e91e701b2f146ffa32ccf3d7 Mon Sep 17 00:00:00 2001 From: Lena Fuhrimann <6780471+cloudlena@users.noreply.github.com> Date: Mon, 26 May 2025 09:45:04 +0200 Subject: [PATCH 2/2] Remove 1000101 from blockbook maintainers As per their wish in https://github.com/NixOS/nixpkgs/pull/410469#issuecomment-2908132051 --- pkgs/by-name/bl/blockbook/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/bl/blockbook/package.nix b/pkgs/by-name/bl/blockbook/package.nix index a2d908df991e..43f5bacc0f42 100644 --- a/pkgs/by-name/bl/blockbook/package.nix +++ b/pkgs/by-name/bl/blockbook/package.nix @@ -82,7 +82,6 @@ buildGoModule rec { license = licenses.agpl3Only; maintainers = with maintainers; [ mmahut - _1000101 ]; platforms = platforms.unix; mainProgram = "blockbook";