diff options
author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2018-10-17 09:39:33 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-17 09:39:33 -0400 |
commit | 2ed287720e0109f0de96472e0a038a0cc081c27b (patch) | |
tree | 8d345ed251ea8a978a63e4b88c06db57612d3cdd | |
parent | 695156e1f5f4cbb0b4fe356c8d1a8bf2796c0681 (diff) | |
parent | 8e15e9c45235f015bb7cfbb634fd5f91a03acbb2 (diff) | |
download | nixlib-2ed287720e0109f0de96472e0a038a0cc081c27b.tar nixlib-2ed287720e0109f0de96472e0a038a0cc081c27b.tar.gz nixlib-2ed287720e0109f0de96472e0a038a0cc081c27b.tar.bz2 nixlib-2ed287720e0109f0de96472e0a038a0cc081c27b.tar.lz nixlib-2ed287720e0109f0de96472e0a038a0cc081c27b.tar.xz nixlib-2ed287720e0109f0de96472e0a038a0cc081c27b.tar.zst nixlib-2ed287720e0109f0de96472e0a038a0cc081c27b.zip |
Merge pull request #48301 from rnhmjoj/monero
Update Monero for upcoming hard fork
-rw-r--r-- | pkgs/applications/altcoins/monero-gui/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/altcoins/monero/default.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/misc/xmr-stak/default.nix | 4 |
3 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix index 49b8db51bcc8..c26df670930b 100644 --- a/pkgs/applications/altcoins/monero-gui/default.nix +++ b/pkgs/applications/altcoins/monero-gui/default.nix @@ -5,20 +5,20 @@ , qtlocation, qtquickcontrols2, qtwebchannel , qtwebengine, qtx11extras, qtxmlpatterns , monero, unbound, readline, boost, libunwind -, pcsclite, zeromq, cppzmq, pkgconfig +, libsodium, pcsclite, zeromq, cppzmq, pkgconfig }: with stdenv.lib; stdenv.mkDerivation rec { name = "monero-gui-${version}"; - version = "0.12.3.0"; + version = "0.13.0.2"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "1ry0455cgirkc6n46qnlv5p49axjllil78xmx6469nbp3a2r3z7i"; + sha256 = "02419rqi3zfy6yjyw3b3gvkbxh2ypdfpijiiklc7lyblb9nnjr68"; }; nativeBuildInputs = [ qmake pkgconfig ]; @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine qtx11extras qtxmlpatterns monero unbound readline - boost libunwind pcsclite zeromq cppzmq - makeWrapper + boost libunwind libsodium pcsclite zeromq + cppzmq makeWrapper ]; patches = [ diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix index a4a884707a98..2b396c4b938d 100644 --- a/pkgs/applications/altcoins/monero/default.nix +++ b/pkgs/applications/altcoins/monero/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit , cmake, pkgconfig, git , boost, miniupnpc, openssl, unbound, cppzmq -, zeromq, pcsclite, readline +, zeromq, pcsclite, readline, libsodium , CoreData, IOKit, PCSC }: @@ -11,12 +11,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "monero-${version}"; - version = "0.12.3.0"; + version = "0.13.0.2"; src = fetchgit { url = "https://github.com/monero-project/monero.git"; rev = "v${version}"; - sha256 = "1609k1qn9xx37a92ai36rajds9cmdjlkqyka95hks5xjr3l5ca8i"; + sha256 = "078iw76ajvaj08rgnx3c13pnq8fxah1z9wwyz54fcnj2349sjbf5"; }; nativeBuildInputs = [ cmake pkgconfig git ]; @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost miniupnpc openssl unbound cppzmq zeromq pcsclite readline + libsodium ] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ]; cmakeFlags = [ diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index b98d10efdee1..877a25fe662e 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -12,13 +12,13 @@ in stdenv'.mkDerivation rec { name = "xmr-stak-${version}"; - version = "2.4.7"; + version = "2.5.0"; src = fetchFromGitHub { owner = "fireice-uk"; repo = "xmr-stak"; rev = "${version}"; - sha256 = "072gapchmd05ir5ygrvbgdhpjhm7pdjyl61n1ykxzvnvi81z6817"; + sha256 = "1qls0rai9c1cszcqqqmhcdvcsmm23w1jxzlq2b035apkz7ywbxjl"; }; NIX_CFLAGS_COMPILE = "-O3"; |