diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-02-20 12:16:56 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-02-20 12:16:56 +0100 |
commit | b24d64b3b1ef897f07cd072a88a9881cb330aa7f (patch) | |
tree | a87bb2eed9af3ef1efd51dd65221d91f0c949041 /nixpkgs/pkgs/applications/blockchains | |
parent | 73338df7473bb3810e70a16b8b0cba4f0f606f2b (diff) | |
parent | fa15b53dbea5028db38d6e09b4cef6eba42aeebb (diff) | |
download | nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.gz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.bz2 nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.lz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.xz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.zst nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/applications/blockchains')
6 files changed, 42 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/applications/blockchains/aeon/default.nix b/nixpkgs/pkgs/applications/blockchains/aeon/default.nix index 7928a63b8264..3939dbce3157 100644 --- a/nixpkgs/pkgs/applications/blockchains/aeon/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/aeon/default.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation { hardeningDisable = [ "fortify" ]; meta = with lib; { + # Does not build against gcc-13. No development activity upstream + # for past few years. + broken = true; description = "Private, secure, untraceable currency"; homepage = "http://www.aeon.cash/"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/applications/blockchains/bitcoin-abc/default.nix b/nixpkgs/pkgs/applications/blockchains/bitcoin-abc/default.nix index 310c67d41530..d25a582f6554 100644 --- a/nixpkgs/pkgs/applications/blockchains/bitcoin-abc/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/bitcoin-abc/default.nix @@ -15,6 +15,7 @@ , protobuf , qrencode , libevent +, libnatpmp , sqlite , withGui , python3 @@ -24,13 +25,13 @@ mkDerivation rec { pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc"; - version = "0.26.2"; + version = "0.28.9"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "0gz4713lk3alk3ykwq1bdqjywadrfrnb7n2878136g01n87j00az"; + hash = "sha256-VK9/qL3rFdU7O62FwEdr3WD4VWli8KGZH9hcbTaVHGQ="; }; nativeBuildInputs = [ pkg-config cmake ]; @@ -41,6 +42,7 @@ mkDerivation rec { zlib python3 jemalloc + libnatpmp zeromq4 miniupnpc util-linux diff --git a/nixpkgs/pkgs/applications/blockchains/clboss/default.nix b/nixpkgs/pkgs/applications/blockchains/clboss/default.nix index c016e0f37e38..0cad0ed2ae54 100644 --- a/nixpkgs/pkgs/applications/blockchains/clboss/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/clboss/default.nix @@ -1,6 +1,8 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub +, autoconf-archive +, autoreconfHook , pkg-config , curlWithGnuTls , libev @@ -9,14 +11,16 @@ stdenv.mkDerivation rec { pname = "clboss"; - version = "0.12"; + version = "0.13"; - src = fetchurl { - url = "https://github.com/ZmnSCPxj/clboss/releases/download/${version}/clboss-${version}.tar.gz"; - hash = "sha256-UZcSfbpp3vPsD3CDukp+r5Z60h0UEWTduqF4DhJ+H2U="; + src = fetchFromGitHub { + owner = "ZmnSCPxj"; + repo = "clboss"; + rev = "v${version}"; + hash = "sha256-NP9blymdqDXo/OtGLQg/MXK24PpPvCrzqXRdtfCvpfI="; }; - nativeBuildInputs = [ pkg-config libev curlWithGnuTls sqlite ]; + nativeBuildInputs = [ autoconf-archive autoreconfHook pkg-config libev curlWithGnuTls sqlite ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/blockchains/litecoin/default.nix b/nixpkgs/pkgs/applications/blockchains/litecoin/default.nix index 85436f6023a6..c8e3140eb5de 100644 --- a/nixpkgs/pkgs/applications/blockchains/litecoin/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/litecoin/default.nix @@ -26,6 +26,14 @@ mkDerivation rec { url = "https://aur.archlinux.org/cgit/aur.git/plain/boost1770.patch?h=litecoin-qt&id=dc75ad854af123f375b5b683be64aa14573170d7"; hash = "sha256-PTkYQRA8n5a9yR2AvpzH5natsXT2W6Xjo0ONCPJx78k="; }) + + # Fix gcc-13 build by adding missing headers: + # https://github.com/litecoin-project/litecoin/pull/929 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/litecoin-project/litecoin/commit/6d1adb19aa79a8e8e140582759515bbd76816aa0.patch"; + hash = "sha256-1y4Iz2plMw5HMAjl9x50QQpYrYaUd2WKrrAcUnQmlBY="; + }) ]; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix b/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix index aa5222a50e7e..0dc6db9e5d7f 100644 --- a/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, boost, libGL +{ lib, stdenv, fetchFromGitHub +, fetchpatch +, cmake, pkg-config, wrapQtAppsHook, boost, libGL , qtbase, python3 }: stdenv.mkDerivation rec { @@ -14,6 +16,17 @@ stdenv.mkDerivation rec { hash = "sha256-YvYEXHC8kxviZLQwINs+pS61wITSfqfrrPmlR+zNRoE="; }; + patches = [ + # Fix gcc-13 build failure due to missing <cstdint> includes. + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/facebook/rocksdb/commit/88edfbfb5e1cac228f7cc31fbec24bb637fe54b1.patch"; + stripLen = 1; + extraPrefix = "submodules/rocksdb/"; + hash = "sha256-HhlIYyPzIZFuyzHTUPz3bXgXiaFSQ8pVrLLMzegjTgE="; + }) + ]; + cmakeFlags = let options = { PYTHON_EXECUTABLE = "${python3.interpreter}"; diff --git a/nixpkgs/pkgs/applications/blockchains/optimism/default.nix b/nixpkgs/pkgs/applications/blockchains/optimism/default.nix index 40f5c0ceb2e7..d95565d919de 100644 --- a/nixpkgs/pkgs/applications/blockchains/optimism/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/optimism/default.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "optimism"; - version = "1.5.1"; + version = "1.6.1"; src = fetchFromGitHub { owner = "ethereum-optimism"; repo = "optimism"; rev = "op-node/v${version}"; - hash = "sha256-oVrm1mK2yw5IF7WZCwDQ1U/JdYvUPKJY/kzRSp6Pzwo="; + hash = "sha256-ic5OHGxU/crq6IqqUnzAC+99KpCXUKFagnAKD4FtYBI="; fetchSubmodules = true; }; subPackages = [ "op-node/cmd" "op-proposer/cmd" "op-batcher/cmd" ]; - vendorHash = "sha256-QDpCGfykTUIgPQxHH8qIfmOsQrcQfZ3/vwjsuvUo1Fo="; + vendorHash = "sha256-zuATJ5FBdil9bHgkMf32WuTW6/99GIsGCzI5srP21m8="; buildInputs = [ libpcap |