diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/misc/libbitcoin')
6 files changed, 14 insertions, 40 deletions
diff --git a/nixpkgs/pkgs/tools/misc/libbitcoin/fix-gcc11-compilation.patch b/nixpkgs/pkgs/tools/misc/libbitcoin/fix-gcc11-compilation.patch deleted file mode 100644 index fe1b9777275e..000000000000 --- a/nixpkgs/pkgs/tools/misc/libbitcoin/fix-gcc11-compilation.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/include/bitcoin/bitcoin/wallet/dictionary.hpp b/include/bitcoin/bitcoin/wallet/dictionary.hpp -index 632f1afc..63a51764 100644 ---- a/include/bitcoin/bitcoin/wallet/dictionary.hpp -+++ b/include/bitcoin/bitcoin/wallet/dictionary.hpp -@@ -19,6 +19,7 @@ - #ifndef LIBBITCOIN_WALLET_DICTIONARY_HPP - #define LIBBITCOIN_WALLET_DICTIONARY_HPP - -+#include <cstddef> - #include <array> - #include <vector> - #include <bitcoin/bitcoin/compat.hpp> diff --git a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix index a940fba29676..266ef9accca6 100644 --- a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix +++ b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix @@ -1,18 +1,15 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, libbitcoin, libbitcoin-protocol }: -let +stdenv.mkDerivation rec { pname = "libbitcoin-client"; - version = "3.5.0"; - -in stdenv.mkDerivation { - name = "${pname}-${version}"; + version = "3.8.0"; src = fetchFromGitHub { owner = "libbitcoin"; repo = pname; rev = "v${version}"; - sha256 = "0a9c00f1pfi8wczbfd1djkvr7di3iw1ynak6if910w01dkhbm6v4"; + hash = "sha256-5qbxixaozHFsOcBxnuGEfNJyGL8UaYCOPwPakfc0bAg="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix index 7d00e4c09add..48c8e9a4f721 100644 --- a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix +++ b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix @@ -1,18 +1,15 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, libbitcoin-client, libbitcoin-network }: -let +stdenv.mkDerivation rec { pname = "libbitcoin-explorer"; - version = "3.5.0"; - -in stdenv.mkDerivation { - name = "${pname}-${version}"; + version = "3.8.0"; src = fetchFromGitHub { owner = "libbitcoin"; repo = pname; rev = "v${version}"; - sha256 = "033nrdzrha4kypxk4biixjsbjd16r4m2mjvpid4gdj5hzbbj1p93"; + hash = "sha256-NUAtjrfRbZg5ewQo4PZ1HEoG8GRrsPcNb78UYMHqdyo="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix index 5d330ee3cacc..ee9cb1da687f 100644 --- a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix +++ b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix @@ -1,18 +1,15 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, libbitcoin, zeromq }: -let +stdenv.mkDerivation rec { pname = "libbitcoin-network"; - version = "3.5.0"; - -in stdenv.mkDerivation { - name = "${pname}-${version}"; + version = "3.8.0"; src = fetchFromGitHub { owner = "libbitcoin"; repo = pname; rev = "v${version}"; - sha256 = "0vqg3i40kwmbys4lyp82xvg2nx3ik4qhc66gcm8k66a86wpj9ji6"; + hash = "sha256-zDT92bvA779mzTodpKugCoxapB6vY2jCMSGZEkJLTXQ="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix index 06f6546e964d..57e55400aa27 100644 --- a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix +++ b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix @@ -1,18 +1,15 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, libbitcoin, secp256k1, zeromq }: -let +stdenv.mkDerivation rec { pname = "libbitcoin-protocol"; - version = "3.5.0"; - -in stdenv.mkDerivation { - name = "${pname}-${version}"; + version = "3.8.0"; src = fetchFromGitHub { owner = "libbitcoin"; repo = pname; rev = "v${version}"; - sha256 = "1ln9r04hlnc7qmv17rakyhrnzw1a541pg5jc1sw3ccn90a5x6cfv"; + hash = "sha256-xf0qQQnZ8h6ent1sgkVTo55+9drZM8Zbx0deYZnLBho="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin.nix index 347d6eae7ce4..70a0f9bff6ef 100644 --- a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libbitcoin"; - version = "3.6.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1rppyp3zpb6ymwangjpblwf6qh4y3d1hczrjx8aavmrq7hznnrhq"; + hash = "sha256-7fxj2hnuGRUS4QSQ1w0s3looe9pMvE2U50/yhNyBMf0="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ ./fix-gcc11-compilation.patch ]; - configureFlags = [ "--with-tests=no" "--with-boost=${boost.dev}" |