diff options
author | Raghav Sood <r@raghavsood.com> | 2020-12-06 14:48:59 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-06 14:48:59 +0000 |
commit | 6c94fd93bc12a578e499b9a5bf1880ac9cf5f75c (patch) | |
tree | 9ee64b97b1ead54d34c2f9ea1683c62eb38b39c4 /pkgs/applications/blockchains | |
parent | 5b06df093f806a8b27441abe8b2666fb07de434d (diff) | |
parent | 7e3fc72080bca23378295cc269f3aa38e4528657 (diff) |
Merge pull request #106010 from rnhmjoj/monero
monero 0.17.1.3 -> 0.17.1.5
Diffstat (limited to 'pkgs/applications/blockchains')
-rw-r--r-- | pkgs/applications/blockchains/monero-gui/default.nix | 14 | ||||
-rw-r--r-- | pkgs/applications/blockchains/monero/default.nix | 4 |
2 files changed, 5 insertions, 13 deletions
diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 6275a26118f6..16f4aefe349e 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -1,6 +1,5 @@ { stdenv, wrapQtAppsHook, makeDesktopItem , fetchFromGitHub -, fetchpatch , cmake, qttools, pkgconfig , qtbase, qtdeclarative, qtgraphicaleffects , qtmultimedia, qtxmlpatterns @@ -28,13 +27,13 @@ in stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.17.1.4"; + version = "0.17.1.5"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "1ixjfdlvwr2an2s9jaql240bk7jpq5hhm5c4hww0bicyy3fp12ng"; + sha256 = "0qlcqli0wvrjfy89mbgh1hpmk60dxgn5sws93h8lhgyfwx557iw0"; }; nativeBuildInputs = [ @@ -59,14 +58,7 @@ stdenv.mkDerivation rec { chmod -R +w source/monero ''; - patches = [ - ./move-log-file.patch - # fix build failure due to invalid use of CMAKE_PREFIX_PATH - (fetchpatch { - url = "https://github.com/monero-project/monero-gui/commit/ef2be82c21b0934522ad8e110805b66f5948da1f.patch"; - sha256 = "1rhazk2xwa5dv1cmkrkq8yr08qxslg4k929cvlliabrx20kbr5z5"; - }) - ]; + patches = [ ./move-log-file.patch ]; postPatch = '' # set monero-gui version diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 1010da81da34..2978d65e2ef0 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -17,13 +17,13 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; stdenv.mkDerivation rec { pname = "monero"; - version = "0.17.1.3"; + version = "0.17.1.5"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "1ddkdfd8i5q509qziwcx1f6nm8axs4a1ppzv2y5lgsqpq375if6j"; + sha256 = "0yy9n2qng02j314h8fh5n0mcy6vpdks0yk4d8ifn8hj03f3g2c8b"; fetchSubmodules = true; }; |