diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix index 57a969825bac..388676198044 100644 --- a/pkgs/applications/altcoins/bitcoin-xt.nix +++ b/pkgs/applications/altcoins/bitcoin-xt.nix @@ -1,22 +1,22 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost -, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, curl +, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, curl, libevent , withGui }: with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-xt-" + version; - version = "0.11F"; + version = "0.11G2"; src = fetchFromGitHub { owner = "bitcoinxt"; repo = "bitcoinxt"; rev = "v${version}"; - sha256 = "13s5k9mxmlbf49p5hc546x20y5dslfp6g9hi6nw5yja5bngbwr24"; + sha256 = "071rljvsabyc9j64v248qfb7zfqpfl84hpsnvlavin235zljq8qs"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ openssl db48 boost zlib + buildInputs = [ openssl db48 boost zlib libevent miniupnpc utillinux protobuf curl ] ++ optionals withGui [ qt4 qrencode ]; diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 0fbc8cd3d171..31dcc78d3d7f 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -8,8 +8,8 @@ rec { bitcoin-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = true; }; bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; }; - bitcoin-classic = callPackage ./bitcoin-classic.nix { withGui = true; boost = boost162; }; - bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; boost = boost162; }; + bitcoin-classic = callPackage ./bitcoin-classic.nix { withGui = true; }; + bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; }; bitcoin-xt = callPackage ./bitcoin-xt.nix { withGui = true; }; bitcoind-xt = callPackage ./bitcoin-xt.nix { withGui = false; }; @@ -26,8 +26,8 @@ rec { go-ethereum = callPackage ./go-ethereum.nix { }; go-ethereum-classic = callPackage ./go-ethereum-classic { }; - hivemind = callPackage ./hivemind.nix { withGui = true; boost = boost162; }; - hivemindd = callPackage ./hivemind.nix { withGui = false; boost = boost162; }; + hivemind = callPackage ./hivemind.nix { withGui = true; }; + hivemindd = callPackage ./hivemind.nix { withGui = false; }; litecoin = callPackage ./litecoin.nix { withGui = true; }; litecoind = callPackage ./litecoin.nix { withGui = false; }; @@ -35,8 +35,8 @@ rec { memorycoin = callPackage ./memorycoin.nix { withGui = true; }; memorycoind = callPackage ./memorycoin.nix { withGui = false; }; - namecoin = callPackage ./namecoin.nix { inherit namecoind; }; - namecoind = callPackage ./namecoind.nix { }; + namecoin = callPackage ./namecoin.nix { withGui = true; }; + namecoind = callPackage ./namecoin.nix { withGui = false; }; ethabi = callPackage ./ethabi.nix { }; ethrun = callPackage ./ethrun.nix { }; diff --git a/pkgs/applications/altcoins/namecoin.nix b/pkgs/applications/altcoins/namecoin.nix index 563363b8baf4..83bead0adac5 100644 --- a/pkgs/applications/altcoins/namecoin.nix +++ b/pkgs/applications/altcoins/namecoin.nix @@ -1,20 +1,45 @@ -{ stdenv, db4, boost, openssl, qt4, qmake4Hook, miniupnpc, unzip, namecoind }: +{ stdenv, lib, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, libqrencode +, withGui }: with stdenv.lib; stdenv.mkDerivation rec { + version = "nc0.13.0rc1"; + name = "namecoin" + toString (optional (!withGui) "d") + "-" + version; - name = "namecoin-${version}"; - version = namecoind.version; - src = namecoind.src; + src = fetchFromGitHub { + owner = "namecoin"; + repo = "namecoin-core"; + rev = version; + sha256 = "17zz0rm3js285w2assxp8blfx830rs0ambcsaqqfli9mnaik3m39"; + }; - buildInputs = [ db4 boost openssl unzip qt4 qmake4Hook miniupnpc ]; + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; - qmakeFlags = [ "USE_UPNP=-" ]; + buildInputs = [ + openssl + boost + libevent + db4 + miniupnpc + eject + ] ++ optionals withGui [ + qt4 + protobuf + libqrencode + ]; - installPhase = '' - mkdir -p $out/bin - cp namecoin-qt $out/bin - ''; + configureFlags = [ + "--with-boost-libdir=${boost.out}/lib" + ]; - meta = namecoind.meta; + meta = { + 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 AndersonTorres infinisil ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/applications/altcoins/namecoind.nix b/pkgs/applications/altcoins/namecoind.nix deleted file mode 100644 index 5b3933301478..000000000000 --- a/pkgs/applications/altcoins/namecoind.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchzip, db4, boost, openssl, miniupnpc, unzip }: - -with stdenv.lib; -stdenv.mkDerivation rec { - version = "0.3.80"; - name = "namecoind-${version}"; - - src = fetchzip { - url = "https://github.com/namecoin/namecoin/archive/nc${version}.tar.gz"; - sha256 = "0mbkhj7y3f4vbqp5q3zk27bzqlk2kq71rcgivvj06w29fzd64mw6"; - }; - - buildInputs = [ db4 boost openssl unzip miniupnpc ]; - - patchPhase = '' - sed -e 's/-Wl,-Bstatic//g' -e 's/-l gthread-2.0//g' -e 's/-l z//g' -i src/Makefile - ''; - - buildPhase = '' - make -C src INCLUDEPATHS= LIBPATHS= - ''; - - installPhase = '' - mkdir -p $out/bin - cp src/namecoind $out/bin - ''; - - meta = { - description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency"; - homepage = http://namecoin.info; - license = licenses.mit; - maintainers = with maintainers; [ doublec AndersonTorres ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86c436225e09..3c920a475033 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13513,9 +13513,7 @@ with pkgs; schismtracker = callPackage ../applications/audio/schismtracker { }; - altcoins = recurseIntoAttrs ( callPackage ../applications/altcoins { - callPackage = newScope { boost = boost155; }; - } ); + altcoins = recurseIntoAttrs ( callPackage ../applications/altcoins { } ); bitcoin = altcoins.bitcoin; bitcoin-xt = altcoins.bitcoin-xt;