Merge pull request #73162 from rnhmjoj/monero
monero: 0.14.1.2 -> 0.15.0.0
This commit is contained in:
commit
84c44d8caf
@ -1,27 +1,27 @@
|
||||
{ mkDerivation, lib, makeDesktopItem, fetchFromGitHub
|
||||
{ stdenv, wrapQtAppsHook, makeDesktopItem, fetchFromGitHub
|
||||
, qtbase, qmake, qtmultimedia, qttools
|
||||
, qtgraphicaleffects, qtdeclarative
|
||||
, qtlocation, qtquickcontrols, qtquickcontrols2
|
||||
, qtwebchannel, qtwebengine, qtx11extras, qtxmlpatterns
|
||||
, monero, unbound, readline, boost, libunwind
|
||||
, libsodium, pcsclite, zeromq, cppzmq, pkgconfig
|
||||
, hidapi
|
||||
, hidapi, randomx
|
||||
}:
|
||||
|
||||
with lib;
|
||||
with stdenv.lib;
|
||||
|
||||
mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "monero-gui";
|
||||
version = "0.14.1.2";
|
||||
version = "0.15.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "monero-project";
|
||||
repo = "monero-gui";
|
||||
rev = "v${version}";
|
||||
sha256 = "1rm043r6y2mzy8pclnzbjjfxgps8pkfa2b92p66k8y8rdmgq6m1k";
|
||||
sha256 = "1shpnly2dym5jhvk8zk10p69mz062dihx979djg74q6hgkhhhqsh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake pkgconfig ];
|
||||
nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [
|
||||
qtbase qtmultimedia qtgraphicaleffects
|
||||
@ -30,7 +30,7 @@ mkDerivation rec {
|
||||
qtwebchannel qtwebengine qtx11extras
|
||||
qtxmlpatterns monero unbound readline
|
||||
boost libunwind libsodium pcsclite zeromq
|
||||
cppzmq hidapi
|
||||
cppzmq hidapi randomx
|
||||
];
|
||||
|
||||
patches = [ ./move-log-file.patch ];
|
||||
|
@ -1,43 +1,41 @@
|
||||
{ stdenv, fetchgit
|
||||
, cmake, pkgconfig, git
|
||||
{ stdenv, fetchFromGitHub
|
||||
, cmake, pkgconfig
|
||||
, boost, miniupnpc, openssl, unbound, cppzmq
|
||||
, zeromq, pcsclite, readline, libsodium, hidapi
|
||||
, python3Packages
|
||||
, python3Packages, randomx, rapidjson
|
||||
, CoreData, IOKit, PCSC
|
||||
}:
|
||||
|
||||
assert stdenv.isDarwin -> IOKit != null;
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "monero";
|
||||
version = "0.14.1.0";
|
||||
version = "0.15.0.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/monero-project/monero.git";
|
||||
rev = "v${version}";
|
||||
sha256 = "1asa197fad81jfv12qgaa7y7pdr1r1pda96m9pvivkh4v30cx0nh";
|
||||
src = fetchFromGitHub {
|
||||
owner = "monero-project";
|
||||
repo = "monero";
|
||||
rev = "v${version}";
|
||||
sha256 = "19y4kcj4agws7swfa3draysb1y18c3xb13r8cg0faxx1dlm0zbnr";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig git ];
|
||||
nativeBuildInputs = [ cmake pkgconfig ];
|
||||
|
||||
buildInputs = [
|
||||
boost miniupnpc openssl unbound
|
||||
cppzmq zeromq pcsclite readline
|
||||
libsodium hidapi
|
||||
libsodium hidapi randomx rapidjson
|
||||
python3Packages.protobuf
|
||||
] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ];
|
||||
] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
"-DBUILD_GUI_DEPS=ON"
|
||||
"-DReadline_ROOT_DIR=${readline.dev}"
|
||||
] ++ optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF";
|
||||
] ++ stdenv.lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF";
|
||||
|
||||
hardeningDisable = [ "fortify" ];
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Private, secure, untraceable currency";
|
||||
homepage = https://getmonero.org/;
|
||||
license = licenses.bsd3;
|
||||
|
24
pkgs/development/libraries/randomx/default.nix
Normal file
24
pkgs/development/libraries/randomx/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ stdenv, fetchFromGitHub, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "randomX";
|
||||
version = "1.1.6";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tevador";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1qd0rbzgxdy87wwy0n6ca29bcq25j5ndnfgmx8iyf225m4rcwngf";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Proof of work algorithm based on random code execution";
|
||||
homepage = https://github.com/tevador/RandomX;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ rnhmjoj ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
}
|
@ -13763,6 +13763,8 @@ in
|
||||
|
||||
qgnomeplatform = libsForQt5.callPackage ../development/libraries/qgnomeplatform { };
|
||||
|
||||
randomx = callPackage ../development/libraries/randomx { };
|
||||
|
||||
resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { };
|
||||
|
||||
rhino = callPackage ../development/libraries/java/rhino {
|
||||
|
Loading…
Reference in New Issue
Block a user