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

Merge pull request #48301 from rnhmjoj/monero

Browse Source 
Update Monero for upcoming hard fork
This commit is contained in:
Samuel Dionne-Riel
2018-10-17 09:39:33 -04:00
committed by GitHub
parent 695156e1f5 8e15e9c452
commit 2ed287720e
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/altcoins/monero-gui/default.nix
+5 -5
View File
@@ -5,20 +5,20 @@
, qtlocation, qtquickcontrols2, qtwebchannel , qtlocation, qtquickcontrols2, qtwebchannel
, qtwebengine, qtx11extras, qtxmlpatterns , qtwebengine, qtx11extras, qtxmlpatterns
, monero, unbound, readline, boost, libunwind , monero, unbound, readline, boost, libunwind
, pcsclite, zeromq, cppzmq, pkgconfig , libsodium, pcsclite, zeromq, cppzmq, pkgconfig
}: }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "monero-gui-${version}"; name = "monero-gui-${version}";
version = "0.12.3.0"; version = "0.13.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "monero-project"; owner = "monero-project";
repo = "monero-gui"; repo = "monero-gui";
rev = "v${version}"; rev = "v${version}";
sha256 = "1ry0455cgirkc6n46qnlv5p49axjllil78xmx6469nbp3a2r3z7i"; sha256 = "02419rqi3zfy6yjyw3b3gvkbxh2ypdfpijiiklc7lyblb9nnjr68";
}; };
nativeBuildInputs = [ qmake pkgconfig ]; nativeBuildInputs = [ qmake pkgconfig ];
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
qtdeclarative qtlocation qtquickcontrols2 qtdeclarative qtlocation qtquickcontrols2
qtwebchannel qtwebengine qtx11extras qtwebchannel qtwebengine qtx11extras
qtxmlpatterns monero unbound readline qtxmlpatterns monero unbound readline
boost libunwind pcsclite zeromq cppzmq boost libunwind libsodium pcsclite zeromq
makeWrapper cppzmq makeWrapper
]; ];
patches = [ patches = [
pkgs/applications/altcoins/monero/default.nix
+4 -3
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchgit { stdenv, fetchgit
, cmake, pkgconfig, git , cmake, pkgconfig, git
, boost, miniupnpc, openssl, unbound, cppzmq , boost, miniupnpc, openssl, unbound, cppzmq
, zeromq, pcsclite, readline , zeromq, pcsclite, readline, libsodium
, CoreData, IOKit, PCSC , CoreData, IOKit, PCSC
}: }:
@@ -11,12 +11,12 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "monero-${version}"; name = "monero-${version}";
version = "0.12.3.0"; version = "0.13.0.2";
src = fetchgit { src = fetchgit {
url = "https://github.com/monero-project/monero.git"; url = "https://github.com/monero-project/monero.git";
rev = "v${version}"; rev = "v${version}";
sha256 = "1609k1qn9xx37a92ai36rajds9cmdjlkqyka95hks5xjr3l5ca8i"; sha256 = "078iw76ajvaj08rgnx3c13pnq8fxah1z9wwyz54fcnj2349sjbf5";
}; };
nativeBuildInputs = [ cmake pkgconfig git ]; nativeBuildInputs = [ cmake pkgconfig git ];
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
boost miniupnpc openssl unbound boost miniupnpc openssl unbound
cppzmq zeromq pcsclite readline cppzmq zeromq pcsclite readline
libsodium
] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ]; ] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ];
cmakeFlags = [ cmakeFlags = [
pkgs/applications/misc/xmr-stak/default.nix
+2 -2
View File
@@ -12,13 +12,13 @@ in
stdenv'.mkDerivation rec { stdenv'.mkDerivation rec {
name = "xmr-stak-${version}"; name = "xmr-stak-${version}";
version = "2.4.7"; version = "2.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fireice-uk"; owner = "fireice-uk";
repo = "xmr-stak"; repo = "xmr-stak";
rev = "${version}"; rev = "${version}";
sha256 = "072gapchmd05ir5ygrvbgdhpjhm7pdjyl61n1ykxzvnvi81z6817"; sha256 = "1qls0rai9c1cszcqqqmhcdvcsmm23w1jxzlq2b035apkz7ywbxjl";
}; };
NIX_CFLAGS_COMPILE = "-O3"; NIX_CFLAGS_COMPILE = "-O3";