diff options
Diffstat (limited to 'pkgs/applications/blockchains')
-rw-r--r-- | pkgs/applications/blockchains/bitcoin-unlimited.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/blockchains/btc1.nix | 41 | ||||
-rw-r--r-- | pkgs/applications/blockchains/ergo/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/blockchains/exodus/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/blockchains/freicoin.nix | 41 | ||||
-rw-r--r-- | pkgs/applications/blockchains/go-ethereum.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/blockchains/ledger-live-desktop/default.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/blockchains/monero-gui/default.nix | 85 | ||||
-rw-r--r-- | pkgs/applications/blockchains/monero/default.nix | 36 | ||||
-rw-r--r-- | pkgs/applications/blockchains/monero/use-system-libraries.patch | 69 | ||||
-rw-r--r-- | pkgs/applications/blockchains/namecoin.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/blockchains/openethereum/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/blockchains/openethereum/lock.patch | 20 | ||||
-rw-r--r-- | pkgs/applications/blockchains/pivx.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/blockchains/polkadot/default.nix | 42 | ||||
-rw-r--r-- | pkgs/applications/blockchains/sumokoin.nix | 2 |
16 files changed, 194 insertions, 183 deletions
diff --git a/pkgs/applications/blockchains/bitcoin-unlimited.nix b/pkgs/applications/blockchains/bitcoin-unlimited.nix index fe39b955a281..f8988af683d1 100644 --- a/pkgs/applications/blockchains/bitcoin-unlimited.nix +++ b/pkgs/applications/blockchains/bitcoin-unlimited.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version; - version = "1.8.0.0"; + version = "1.9.0.1"; src = fetchFromGitHub { owner = "bitcoinunlimited"; repo = "bitcoinunlimited"; rev = "BCHunlimited${version}"; - sha256 = "01qi15li5x9fvhsmvx7ai5fz6yzqqd3r9yv7081h75jn0nxai49q"; + sha256 = "018a22zbvjqky0whizmgxzscmna0sh2xqgyw02yjk8qj4yi0zp8c"; }; nativeBuildInputs = [ pkgconfig autoreconfHook python3 ] diff --git a/pkgs/applications/blockchains/btc1.nix b/pkgs/applications/blockchains/btc1.nix deleted file mode 100644 index 3442c9ba807f..000000000000 --- a/pkgs/applications/blockchains/btc1.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, hexdump, openssl, db48 -, boost, zlib, miniupnpc, qt4, protobuf, qrencode, libevent -, AppKit -, withGui ? !stdenv.isDarwin -}: - -with stdenv.lib; -stdenv.mkDerivation rec { - name = "bit1" + (toString (optional (!withGui) "d")) + "-" + version; - version = "1.15.1"; - - src = fetchurl { - url = "https://github.com/btc1/bitcoin/archive/v${version}.tar.gz"; - sha256 = "0v0g2wb4nsnhddxzb63vj2bc1mgyj05vqm5imicjfz8prvgc0si8"; - }; - - nativeBuildInputs = [ pkgconfig autoreconfHook hexdump ]; - buildInputs = [ openssl db48 boost zlib miniupnpc protobuf libevent ] - ++ optionals withGui [ qt4 qrencode ] - ++ optional stdenv.isDarwin AppKit; - - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ "--with-gui=qt4" ]; - - meta = { - description = "Peer-to-peer electronic cash system (btc1 client)"; - longDescription= '' - Bitcoin is a free open source peer-to-peer electronic cash system that is - completely decentralized, without the need for a central server or trusted - parties. Users hold the crypto keys to their own money and transact directly - with each other, with the help of a P2P network to check for double-spending. - - btc1 is an implementation of a Bitcoin full node with segwit2x hard fork - support. - ''; - homepage = "https://github.com/btc1/bitcoin"; - license = licenses.mit; - maintainers = with maintainers; [ sorpaas ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index a61df3e91bd1..6b686d0b2d6c 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "3.3.3"; + version = "3.3.6"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "1lsqshpbc5p5qm8kic8a90xmvd2zx2s7jf613j9ng4h3hh75wbff"; + sha256 = "1zi559ixjxxsrpvvjbxa1d0g96px3h9amjvy149sfhp7b8w5hhk3"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index af49bb9121f6..c48cd7bb49c7 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, gnome2, +{ stdenv, lib, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, pango, atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, utillinux, alsaLib, dbus, at-spi2-atk, cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }: stdenv.mkDerivation rec { pname = "exodus"; - version = "20.8.28"; + version = "20.10.23"; src = fetchurl { url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "fde9165f71f0d641f6892ddce3ec26d200e8095a383f2b4c8f924de4041d65ef"; + sha256 = "083hcxljqg36ilpy6xa4j455ngpc775qgam0dbj26kg7sh33dz2c"; }; sourceRoot = "."; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { nss nspr gtk3-x11 - gnome2.pango + pango atk cairo gdk-pixbuf diff --git a/pkgs/applications/blockchains/freicoin.nix b/pkgs/applications/blockchains/freicoin.nix deleted file mode 100644 index cc28fff96c47..000000000000 --- a/pkgs/applications/blockchains/freicoin.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ fetchFromGitHub, stdenv, db, boost, gmp, mpfr, qt4, qmake4Hook }: - -stdenv.mkDerivation rec { - version = "0.8.6-2"; - pname = "freicoin"; - - src = fetchFromGitHub { - owner = "freicoin"; - repo = "freicoin"; - rev = "v${version}"; - sha256 = "1v1qwv4x5agjba82s1vknmdgq67y26wzdwbmwwqavv7f7y3y860h"; - }; - - enableParallelBuilding = false; - - qmakeFlags = ["USE_UPNP=-"]; - - # I think that openssl and zlib are required, but come through other - # packages - - preBuild = "unset AR"; - - installPhase = '' - mkdir -p $out/bin - cp freicoin-qt $out/bin - ''; - - nativeBuildInputs = [ qmake4Hook ]; - buildInputs = [ db boost gmp mpfr qt4 ]; - - meta = with stdenv.lib; { - description = "Peer-to-peer currency with demurrage fee"; - homepage = "http://freicoi.in/"; - license = licenses.mit; - maintainers = [ maintainers.viric ]; - platforms = platforms.linux; - - # upstream doesn't support newer openssl versions, use 1.0.1 for testing - broken = true; - }; -} diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index 6952d469adbd..8e9321950676 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "go-ethereum"; - version = "1.9.21"; + version = "1.9.23"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0mr5pw08jka11lzgl28555nb90cqxx9vlqd1plfmyic6rb5z11df"; + sha256 = "0w65sln5l3sxwzxwjvyaial0m1kxhivhw8xwl5faxxxlk50rs4wm"; }; runVend = true; - vendorSha256 = "155hmny3543h02ryn1nnlpmvs0qvhd0lb66vmkhw5351m6gkbx7x"; + vendorSha256 = "1qbg44cryiv9kvcak6qjrbmkc9bxyk5fybj62vdkskqfjvv86068"; doCheck = false; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 323b9936af56..da0449f41d1f 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.9.0"; + version = "2.15.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "1ajpmsq4h37w3jzcxijg3myp3mvgbrjis6jrz1cl79m78ripb6cy"; + sha256 = "06sm4ah05j0f3bxb1sbdi8mazmxk166y2gaycll6p2xhd105ins3"; }; appimageContents = appimageTools.extractType2 { @@ -30,7 +30,8 @@ in appimageTools.wrapType2 rec { description = "Wallet app for Ledger Nano S and Ledger Blue"; homepage = "https://www.ledger.com/live"; license = licenses.mit; - maintainers = with maintainers; [ thedavidmeister nyanloutre ]; + maintainers = with maintainers; [ thedavidmeister nyanloutre RaghavSood ]; platforms = [ "x86_64-linux" ]; }; } + diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 6ea075e2a369..8cd03f34286f 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -1,63 +1,82 @@ { stdenv, wrapQtAppsHook, makeDesktopItem -, fetchFromGitHub, qmake, qttools, pkgconfig +, fetchFromGitHub +, cmake, qttools, pkgconfig , qtbase, qtdeclarative, qtgraphicaleffects , qtmultimedia, qtxmlpatterns , qtquickcontrols, qtquickcontrols2 -, monero, unbound, readline, boost, libunwind -, libsodium, pcsclite, zeromq, libgcrypt, libgpgerror -, hidapi, libusb-compat-0_1, protobuf, randomx +, monero, miniupnpc, unbound, readline +, boost, libunwind, libsodium, pcsclite +, randomx, zeromq, libgcrypt, libgpgerror +, hidapi, rapidjson +, trezorSupport ? true +, libusb1 ? null +, protobuf ? null +, python3 ? null }: with stdenv.lib; +assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; + +let + arch = if stdenv.isx86_64 then "x86-64" + else if stdenv.isi686 then "i686" + else if stdenv.isAarch64 then "armv8-a" + else throw "unsupported architecture"; +in + stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.16.0.3"; + version = "0.17.1.1"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "0iwjp8x5swy8i8pzrlm5v55awhm54cf48pm1vz98lcq361lhfzk6"; + sha256 = "0aqhp4rmqsgwjb875kgh6qwz0wyyiag1fksyic9cnhgg5j5y95nx"; }; - nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ + cmake pkgconfig wrapQtAppsHook + (getDev qttools) + ]; buildInputs = [ qtbase qtdeclarative qtgraphicaleffects qtmultimedia qtquickcontrols qtquickcontrols2 qtxmlpatterns - monero unbound readline libgcrypt libgpgerror - boost libunwind libsodium pcsclite zeromq - hidapi libusb-compat-0_1 protobuf randomx - ]; + monero miniupnpc unbound readline + randomx libgcrypt libgpgerror + boost libunwind libsodium pcsclite + zeromq hidapi rapidjson + ] ++ optionals trezorSupport [ libusb1 protobuf python3 ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=format-security" ]; + postUnpack = '' + # copy monero sources here + # (needs to be writable) + cp -r ${monero.source}/* source/monero + chmod -R +w source/monero + ''; patches = [ ./move-log-file.patch ]; postPatch = '' - echo ' - var GUI_VERSION = "${version}"; - var GUI_MONERO_VERSION = "${getVersion monero}"; - ' > version.js - substituteInPlace monero-wallet-gui.pro \ - --replace '$$[QT_INSTALL_BINS]/lrelease' '${getDev qttools}/bin/lrelease' + # set monero-gui version + substituteInPlace src/version.js.in \ + --replace '@VERSION_TAG_GUI@' '${version}' + + # use monerod from the monero package substituteInPlace src/daemon/DaemonManager.cpp \ --replace 'QApplication::applicationDirPath() + "' '"${monero}/bin' - ''; - - makeFlags = [ "INSTALL_ROOT=$(out)" ]; - preBuild = '' - sed -i s#/opt/monero-wallet-gui##g Makefile - make -C src/zxcvbn-c - - # use nixpkgs monero sources - rmdir monero - ln -s "${monero.src}" monero + # only build external deps, *not* the full monero + substituteInPlace CMakeLists.txt \ + --replace 'add_subdirectory(monero)' \ + 'add_subdirectory(monero EXCLUDE_FROM_ALL)' ''; + cmakeFlags = [ "-DARCH=${arch}" ]; + desktopItem = makeDesktopItem { name = "monero-wallet-gui"; exec = "monero-wallet-gui"; @@ -69,15 +88,15 @@ stdenv.mkDerivation rec { postInstall = '' # install desktop entry - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications + install -Dm644 -t $out/share/applications \ + ${desktopItem}/share/applications/* # install icons for n in 16 24 32 48 64 96 128 256; do size=$n"x"$n - mkdir -p $out/share/icons/hicolor/$size/apps - cp $src/images/appicons/$size.png \ - $out/share/icons/hicolor/$size/apps/monero.png + install -Dm644 \ + -t $out/share/icons/hicolor/$size/apps/monero.png \ + $src/images/appicons/$size.png done; ''; diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index f1186564119f..29acbd0f37b3 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -1,40 +1,62 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch , cmake, pkgconfig , boost, miniupnpc, openssl, unbound , zeromq, pcsclite, readline, libsodium, hidapi -, protobuf, randomx, rapidjson, libusb-compat-0_1 +, randomx, rapidjson , CoreData, IOKit, PCSC +, trezorSupport ? true +, libusb1 ? null +, protobuf ? null +, python3 ? null }: +with stdenv.lib; + assert stdenv.isDarwin -> IOKit != null; +assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; stdenv.mkDerivation rec { pname = "monero"; - version = "0.16.0.3"; + version = "0.17.1.1"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "1r9x3712vhb24dxxirfiwj5f9x0h4m7x0ngiiavf5983dfdlgz33"; + sha256 = "18x27dm24k04vx0yz57zi02rk0wrmbn4wr8alqf48dq6z9wr0fhp"; fetchSubmodules = true; }; + patches = [ + ./use-system-libraries.patch + ]; + + postPatch = '' + # remove vendored libraries + rm -r external/{miniupnp,randomx,rapidjson,unbound} + # export patched source for monero-gui + cp -r . $source + ''; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ boost miniupnpc openssl unbound zeromq pcsclite readline libsodium hidapi randomx rapidjson - protobuf libusb-compat-0_1 - ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ]; + protobuf + ] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ] + ++ optionals trezorSupport [ libusb1 protobuf python3 ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DUSE_DEVICE_TREZOR=ON" "-DBUILD_GUI_DEPS=ON" "-DReadline_ROOT_DIR=${readline.dev}" - ] ++ stdenv.lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF"; + "-DRandomX_ROOT_DIR=${randomx}" + ] ++ optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF"; + + outputs = [ "out" "source" ]; meta = with stdenv.lib; { description = "Private, secure, untraceable currency"; diff --git a/pkgs/applications/blockchains/monero/use-system-libraries.patch b/pkgs/applications/blockchains/monero/use-system-libraries.patch new file mode 100644 index 000000000000..57e2a2e9a696 --- /dev/null +++ b/pkgs/applications/blockchains/monero/use-system-libraries.patch @@ -0,0 +1,69 @@ +diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt +index a8916a7d0..39ec7747b 100644 +--- a/external/CMakeLists.txt ++++ b/external/CMakeLists.txt +@@ -37,34 +37,16 @@ + + find_package(Miniupnpc REQUIRED) + +-message(STATUS "Using in-tree miniupnpc") +-add_subdirectory(miniupnp/miniupnpc) +-set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") +-if(MSVC) +- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") +-elseif(NOT MSVC) +- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value") +-endif() +-if(CMAKE_SYSTEM_NAME MATCHES "NetBSD") +- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE") +-endif() +- +-set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE) ++set(UPNP_STATIC false PARENT_SCOPE) ++set(UPNP_INCLUDE ${MINIUPNP_INCLUDE_DIR} PARENT_SCOPE) ++set(UPNP_LIBRARIES ${MINIUPNP_LIBRARY} PARENT_SCOPE) + + find_package(Unbound) + + if(NOT UNBOUND_INCLUDE_DIR OR STATIC) +- # NOTE: If STATIC is true, CMAKE_FIND_LIBRARY_SUFFIXES has been reordered. +- # unbound has config tests which used OpenSSL libraries, so -ldl may need to +- # be set in this case. +- # The unbound CMakeLists.txt can set it, since it's also needed for the +- # static OpenSSL libraries set up there after with target_link_libraries. +- add_subdirectory(unbound) +- +- set(UNBOUND_STATIC true PARENT_SCOPE) +- set(UNBOUND_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/unbound/libunbound" PARENT_SCOPE) +- set(UNBOUND_LIBRARY "unbound" PARENT_SCOPE) +- set(UNBOUND_LIBRARY_DIRS "${LIBEVENT2_LIBDIR}" PARENT_SCOPE) ++ set(UNBOUND_STATIC false PARENT_SCOPE) ++ set(UPNP_INCLUDE ${MINIUPNP_INCLUDE_DIR} PARENT_SCOPE) ++ set(UPNP_LIBRARIES ${MINIUPNP_LIBRARY} PARENT_SCOPE) + else() + message(STATUS "Found libunbound include (unbound.h) in ${UNBOUND_INCLUDE_DIR}") + if(UNBOUND_LIBRARIES) +@@ -81,4 +63,5 @@ endif() + add_subdirectory(db_drivers) + add_subdirectory(easylogging++) + add_subdirectory(qrcodegen) +-add_subdirectory(randomx EXCLUDE_FROM_ALL) ++ ++find_library(RANDOMX_LIBRARIES NAMES RandomX) +diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl +index 175741146..088b582f7 100644 +--- a/src/p2p/net_node.inl ++++ b/src/p2p/net_node.inl +@@ -60,9 +60,9 @@ + #include "cryptonote_core/cryptonote_core.h" + #include "net/parse.h" + +-#include <miniupnp/miniupnpc/miniupnpc.h> +-#include <miniupnp/miniupnpc/upnpcommands.h> +-#include <miniupnp/miniupnpc/upnperrors.h> ++#include <miniupnpc/miniupnpc.h> ++#include <miniupnpc/upnpcommands.h> ++#include <miniupnpc/upnperrors.h> + + #undef MONERO_DEFAULT_LOG_CATEGORY + #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p" diff --git a/pkgs/applications/blockchains/namecoin.nix b/pkgs/applications/blockchains/namecoin.nix index 936eaa2505e1..cbce17731043 100644 --- a/pkgs/applications/blockchains/namecoin.nix +++ b/pkgs/applications/blockchains/namecoin.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency"; homepage = "https://namecoin.org"; license = licenses.mit; - maintainers = with maintainers; [ doublec infinisil ]; + maintainers = with maintainers; [ infinisil ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix index 8ff65ec92a9d..563b2378f845 100644 --- a/pkgs/applications/blockchains/openethereum/default.nix +++ b/pkgs/applications/blockchains/openethereum/default.nix @@ -12,18 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "openethereum"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "openethereum"; repo = "openethereum"; rev = "v${version}"; - sha256 = "08dkcrga1x18csh6pw6f54x5xwijppyjhg46cf4p452xc1l3a6ir"; + sha256 = "cs84Zz0nhagGDu5sDFTaFZF3SPEgJU8F4vGX7KLihOM="; }; - cargoSha256 = "1xliragihwjfc5qmfm0ng519bw8a28m1w1yqcl9mpk8zywiybaah"; - - cargoPatches = [ ./lock.patch ]; + cargoSha256 = "6suNkHw1BbISb0MkYkUaD+mpUal+kn3y1SFVqzJFqJc="; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; nativeBuildInputs = [ diff --git a/pkgs/applications/blockchains/openethereum/lock.patch b/pkgs/applications/blockchains/openethereum/lock.patch deleted file mode 100644 index 66709480bb72..000000000000 --- a/pkgs/applications/blockchains/openethereum/lock.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- /nix/store/hv764a65zmfzw5scjhz5839agv10da6x-source/Cargo.lock 1969-12-31 16:00:01.000000000 -0800 -+++ ./Cargo.lock 2020-07-31 21:30:31.146750066 -0700 -@@ -3113,7 +3113,7 @@ - - [[package]] - name = "openethereum" --version = "3.0.0" -+version = "3.0.1" - dependencies = [ - "ansi_term", - "atty", -@@ -3562,7 +3562,7 @@ - - [[package]] - name = "parity-version" --version = "3.0.0" -+version = "3.0.1" - dependencies = [ - "parity-bytes", - "rlp", diff --git a/pkgs/applications/blockchains/pivx.nix b/pkgs/applications/blockchains/pivx.nix index 16ea2dc43e74..5a59bb4b7de2 100644 --- a/pkgs/applications/blockchains/pivx.nix +++ b/pkgs/applications/blockchains/pivx.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { Zero Knowledge cryptography proofs for industry-leading transaction anonymity. ''; license = licenses.mit; - homepage = "https://www.dash.org"; + homepage = "https://pivx.org"; maintainers = with maintainers; [ wucke13 ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index a919a3054196..193825445512 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -1,37 +1,41 @@ -{ stdenv +{ clang , fetchFromGitHub +, lib +, llvmPackages +, protobuf , rustPlatform -, pkgconfig -, openssl }: - rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.2.17"; + version = "0.8.26"; src = fetchFromGitHub { owner = "paritytech"; - # N.B. In 2018, the thing that was "polkadot" was split off into its own - # repo, so if this package is ever updated it should be changed to - # paritytech/polkadot, as per comment here: - # https://github.com/paritytech/polkadot#note - repo = "substrate"; - rev = "19f4f4d4df3bb266086b4e488739f73d3d5e588c"; - sha256 = "0v7g03rbml2afw0splmyjh9nqpjg0ldjw09hyc0jqd3qlhgxiiyj"; + repo = "polkadot"; + rev = "v${version}"; + sha256 = "1bvma6k3gsjqh8w76k4kf52sjg8wxn1b7a409kmnmmvmd9j6z5ia"; }; - cargoSha256 = "1h5v7c7xi2r2wzh1pj6xidrg7dx23w3rjm88mggpq7574arijk4i"; + cargoSha256 = "0pacmmvvjgzmaxgg47qbfhqwl02jxj3i6vnmkjbj9npzqfmqf72d"; + + nativeBuildInputs = [ clang ]; + + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; + PROTOC = "${protobuf}/bin/protoc"; + + # NOTE: We don't build the WASM runtimes since this would require a more + # complicated rust environment setup. The resulting binary is still useful for + # live networks since those just use the WASM blob from the network chainspec. + BUILD_DUMMY_WASM_BINARY = 1; - buildInputs = [ pkgconfig openssl openssl.dev ]; + # We can't run the test suite since we didn't compile the WASM runtimes. + doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Polkadot Node Implementation"; homepage = "https://polkadot.network"; license = licenses.gpl3; - maintainers = [ maintainers.akru ]; + maintainers = with maintainers; [ akru andresilva RaghavSood ]; platforms = platforms.linux; - # Last attempt at building this was on v0.7.22 - # https://github.com/paritytech/polkadot/releases - broken = true; }; } diff --git a/pkgs/applications/blockchains/sumokoin.nix b/pkgs/applications/blockchains/sumokoin.nix index ad65da057aec..beb294d2dfe0 100644 --- a/pkgs/applications/blockchains/sumokoin.nix +++ b/pkgs/applications/blockchains/sumokoin.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - description = "Sumokoin is a fork of Monero and a truely fungible cryptocurrency"; + description = "A fork of Monero and a truely fungible cryptocurrency"; homepage = "https://www.sumokoin.org/"; license = licenses.bsd3; maintainers = with maintainers; [ fpletz ]; |