public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #107393 from prusnak/monero 

monero{,-gui}: 0.17.1.6 -> 0.17.1.7
This commit is contained in:
Michele Guerini Rocco 2020-12-22 19:26:17 +01:00 committed by GitHub
parent 9232d4168e b45e4ddb25
commit 275337c5b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/blockchains/monero-gui/default.nix
View File

@ -4,6 +4,7 @@
, qtbase, qtdeclarative, qtgraphicaleffects , qtbase, qtdeclarative, qtgraphicaleffects
, qtmultimedia, qtxmlpatterns , qtmultimedia, qtxmlpatterns
, qtquickcontrols, qtquickcontrols2 , qtquickcontrols, qtquickcontrols2
, qtmacextras
, monero, miniupnpc, unbound, readline , monero, miniupnpc, unbound, readline
, boost, libunwind, libsodium, pcsclite , boost, libunwind, libsodium, pcsclite
, randomx, zeromq, libgcrypt, libgpgerror , randomx, zeromq, libgcrypt, libgpgerror
@ -27,13 +28,13 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "monero-gui"; pname = "monero-gui";
version = "0.17.1.6"; version = "0.17.1.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "monero-project"; owner = "monero-project";
repo = "monero-gui"; repo = "monero-gui";
rev = "v${version}"; rev = "v${version}";
sha256 = "0kn5wvx2psbdaqmy1cxlbf5l1mdpvh0b6hh9drah3s7nj3654a3r"; sha256 = "1dd2ddkxh9ynxnscysl46hj4dm063h1v13fnyah69am26qzzbby4";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -49,7 +50,8 @@ stdenv.mkDerivation rec {
randomx libgcrypt libgpgerror randomx libgcrypt libgpgerror
boost libunwind libsodium pcsclite boost libunwind libsodium pcsclite
zeromq hidapi rapidjson zeromq hidapi rapidjson
] ++ optionals trezorSupport [ libusb1 protobuf python3 ]; ] ++ optionals trezorSupport [ libusb1 protobuf python3 ]
++ optionals stdenv.isDarwin [ qtmacextras ];
postUnpack = '' postUnpack = ''
# copy monero sources here # copy monero sources here
@ -105,7 +107,6 @@ stdenv.mkDerivation rec {
homepage = "https://getmonero.org/"; homepage = "https://getmonero.org/";
license = licenses.bsd3; license = licenses.bsd3;
platforms = platforms.all; platforms = platforms.all;
badPlatforms = platforms.darwin;
maintainers = with maintainers; [ rnhmjoj ]; maintainers = with maintainers; [ rnhmjoj ];
}; };
} }

4
pkgs/applications/blockchains/monero/default.nix
View File

@ -17,13 +17,13 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ];
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "monero"; pname = "monero";
version = "0.17.1.6"; version = "0.17.1.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "monero-project"; owner = "monero-project";
repo = "monero"; repo = "monero";
rev = "v${version}"; rev = "v${version}";
sha256 = "0b6zyr3mzqvcxf48i2g45gr649x6nhppik5598jsvg0z7i2hxb9q"; sha256 = "1fdw4i4rw87yz3hz4yc1gdw0gr2mmf9038xaw2l4rrk5y50phjp4";
fetchSubmodules = true; fetchSubmodules = true;
}; };