zcash: 1.0.13 -> 2.1.0-1

This commit is contained in:
Thomas Kerber 2019-11-13 14:40:36 +00:00 committed by Lassulus
parent 4c99fae944
commit 4f3e74a7a2
3 changed files with 19 additions and 27 deletions

View File

@ -1,37 +1,29 @@
{ stdenv, libsodium, fetchFromGitHub, wget, pkgconfig, autoreconfHook, openssl, db62, boost { stdenv, libsodium, fetchFromGitHub, wget, pkgconfig, autoreconfHook, openssl, db62, boost17x
, zlib, gtest, gmock, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent , zlib, gtest, gmock, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent }:
, libsnark, withGui }:
let librustzcash = callPackage ./librustzcash {}; let librustzcash = callPackage ./librustzcash {};
in in
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "zcash" + (toString (optional (!withGui) "d")) + "-" + version; pname = "zcash";
version = "1.0.13"; version = "2.1.0-1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zcash"; owner = "zcash";
repo = "zcash"; repo = "zcash";
rev = "v${version}"; rev = "v${version}";
sha256 = "05y7wxs66anxr5akbf05r36mmjfzqpwawn6vyh3jhpva51hzzzyz"; sha256 = "05bnn4lxrrcv1ha3jdfrgwg4ar576161n3j9d4gpc14ww3zgf9vz";
}; };
# Dependencies are underspecified: "make -C src gtest/zcash_gtest-test_merkletree.o"
# fails with "fatal error: test/data/merkle_roots.json.h: No such file or directory"
enableParallelBuilding = false;
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ gtest gmock gmp openssl wget db62 boost zlib buildInputs = [ gtest gmock gmp openssl wget db62 boost17x zlib
protobuf libevent libsodium librustzcash libsnark ] protobuf libevent libsodium librustzcash ]
++ optionals stdenv.isLinux [ utillinux ] ++ optionals stdenv.isLinux [ utillinux ];
++ optionals withGui [ qt4 qrencode ];
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" configureFlags = [ "--with-boost-libdir=${boost17x.out}/lib" ];
] ++ optionals withGui [ "--with-gui=qt4" ];
patchPhase = '' patchPhase = ''
sed -i"" 's,-lboost_system-mt,-lboost_system,' configure.ac
sed -i"" 's,-fvisibility=hidden,,g' src/Makefile.am sed -i"" 's,-fvisibility=hidden,,g' src/Makefile.am
''; '';
@ -42,7 +34,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Peer-to-peer, anonymous electronic cash system"; description = "Peer-to-peer, anonymous electronic cash system";
homepage = https://z.cash/; homepage = https://z.cash/;
maintainers = with maintainers; [ rht ]; maintainers = with maintainers; [ rht tkerber ];
license = licenses.mit; license = licenses.mit;
platforms = platforms.linux; platforms = platforms.linux;
}; };

View File

@ -2,28 +2,30 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "librustzcash-unstable"; pname = "librustzcash-unstable";
version = "2017-03-17"; version = "2018-10-27";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zcash"; owner = "zcash";
repo = "librustzcash"; repo = "librustzcash";
rev = "91348647a86201a9482ad4ad68398152dc3d635e"; rev = "06da3b9ac8f278e5d4ae13088cf0a4c03d2c13f5";
sha256 = "02l1f46frpvw1r6k1wfh77mrsnmsdvifqx0vnscxz4xgb9ia9d1c"; sha256 = "0md0pp3k97iv7kfjpfkg14pjanhrql4vafa8ggbxpkajv1j4xldv";
}; };
cargoSha256 = "1xlq8vkzfyr5q8gxvzkwi8r1kxg4rg8l1ckdwfdxlkhnw0yscbra"; cargoSha256 = "166v8cxlpfslbs5gljbh7wp0lxqakayw47ikxm9r9a39n7j36mq1";
installPhase = '' installPhase = ''
mkdir -p $out/lib mkdir -p $out/lib
cp target/release/librustzcash.a $out/lib/ cp target/release/librustzcash.a $out/lib/
mkdir -p $out/include mkdir -p $out/include
cp include/librustzcash.h $out/include/ cp librustzcash/include/librustzcash.h $out/include/
''; '';
doCheck = false;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Rust-language assets for Zcash"; description = "Rust-language assets for Zcash";
homepage = https://github.com/zcash/librustzcash; homepage = https://github.com/zcash/librustzcash;
maintainers = with maintainers; [ rht ]; maintainers = with maintainers; [ rht tkerber ];
license = with licenses; [ mit asl20 ]; license = with licenses; [ mit asl20 ];
platforms = platforms.unix; platforms = platforms.unix;
}; };

View File

@ -22444,9 +22444,7 @@ in
wownero = callPackage ../applications/blockchains/wownero.nix {}; wownero = callPackage ../applications/blockchains/wownero.nix {};
zcash = callPackage ../applications/blockchains/zcash { zcash = callPackage ../applications/blockchains/zcash { };
withGui = false;
};
parity = callPackage ../applications/blockchains/parity { }; parity = callPackage ../applications/blockchains/parity { };
parity-beta = callPackage ../applications/blockchains/parity/beta.nix { }; parity-beta = callPackage ../applications/blockchains/parity/beta.nix { };