greg/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #119: Update elementsd to 0.18.1.1

Browse Source 
8e69e42c12 Update elementsd to 0.18.1.1 (Jonas Nick)

Pull request description:

  Because `LC_ALL` must be set to make the tests work (https://github.com/bitcoin/bitcoin/issues/14948#issuecomment-447049325) I also copied the rest from the current nixpkgs bitcoind package.

Top commit has no ACKs.

Tree-SHA512: 6380c0bbb5b35cf49e7553d561d46546701c260c25771b35e3d4ce5c5c5078eed2062f85fa505ae99daa9975beff8ec5d1f33483c0d335a11d275679a968f799
This commit is contained in:
Jonas Nick 2019-10-05 15:40:09 +00:00
commit 4784264bb2
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
default.nix
View File

@ -10,7 +10,7 @@
nanopos = pkgs.callPackage ./pkgs/nanopos { }; nanopos = pkgs.callPackage ./pkgs/nanopos { };
spark-wallet = pkgs.callPackage ./pkgs/spark-wallet { }; spark-wallet = pkgs.callPackage ./pkgs/spark-wallet { };
electrs = (pkgs.callPackage ./pkgs/electrs { }).rootCrate.build; electrs = (pkgs.callPackage ./pkgs/electrs { }).rootCrate.build;
elementsd = pkgs.callPackage ./pkgs/elementsd { }; elementsd = pkgs.callPackage ./pkgs/elementsd { withGui = false; };
hwi = pkgs.callPackage ./pkgs/hwi { }; hwi = pkgs.callPackage ./pkgs/hwi { };
pylightning = pkgs.python3Packages.callPackage ./pkgs/pylightning { }; pylightning = pkgs.python3Packages.callPackage ./pkgs/pylightning { };
liquid-swap = pkgs.python3Packages.callPackage ./pkgs/liquid-swap { }; liquid-swap = pkgs.python3Packages.callPackage ./pkgs/liquid-swap { };

34
pkgs/elementsd/default.nix
View File

@ -1,33 +1,47 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost, zeromq { stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost, zeromq, rapidcheck
, zlib, qtbase ? null, qttools ? null, utillinux, protobuf, python3, qrencode, libevent , zlib, miniupnpc, qtbase ? null, qttools ? null, wrapQtAppsHook ? null, utillinux, protobuf, python3, qrencode, libevent
}: , withGui }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec{ stdenv.mkDerivation rec{
name = "elements-" + version; name = "elements" + (toString (optional (!withGui) "d")) + "-" + version;
version = "0.17.0.1"; version = "0.18.1.1";
src = fetchurl { src = fetchurl {
urls = [ urls = [
"https://github.com/ElementsProject/elements/archive/elements-${version}.tar.gz" "https://github.com/ElementsProject/elements/archive/elements-${version}.tar.gz"
]; ];
sha256 = "e106c26e7aaff043d389d70f0c5e246f556bce77c885dbfedddc67fcb45aeca0"; sha256 = "1a2eef6a5ba4bd844047175e0ebf965b46b6f3a9e44b56017962c42d56a33a87";
}; };
nativeBuildInputs = [ pkgconfig autoreconfHook ] nativeBuildInputs =
++ optionals doCheck [ python3 ]; [ pkgconfig autoreconfHook ]
++ optional withGui wrapQtAppsHook;
buildInputs = [ openssl db48 boost zlib zeromq buildInputs = [ openssl db48 boost zlib zeromq
protobuf libevent] miniupnpc protobuf libevent]
++ optionals stdenv.isLinux [ utillinux ]; ++ optionals stdenv.isLinux [ utillinux ]
++ optionals withGui [ qtbase qttools qrencode ];
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" configureFlags = [ "--with-boost-libdir=${boost.out}/lib"
"--disable-bench" "--disable-bench"
] ++ optionals (!doCheck) [ ] ++ optionals (!doCheck) [
"--disable-tests" "--disable-tests"
"--disable-gui-tests" "--disable-gui-tests"
]
++ optionals withGui [ "--with-gui=qt5"
"--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
]; ];
checkInputs = [ rapidcheck python3 ];
doCheck = true; doCheck = true;
checkFlags =
[ "LC_ALL=C.UTF-8" ]
# QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI.
# See also https://github.com/NixOS/nixpkgs/issues/24256
++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}";
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = {