Merge pull request #147683 from rnhmjoj/pr-monero-cli
monero: rename to monero-cli
This commit is contained in:
commit
af63e81ad9
@ -222,7 +222,7 @@ in
|
|||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
User = "monero";
|
User = "monero";
|
||||||
Group = "monero";
|
Group = "monero";
|
||||||
ExecStart = "${pkgs.monero}/bin/monerod --config-file=${configFile} --non-interactive";
|
ExecStart = "${pkgs.monero-cli}/bin/monerod --config-file=${configFile} --non-interactive";
|
||||||
Restart = "always";
|
Restart = "always";
|
||||||
SuccessExitStatus = [ 0 1 ];
|
SuccessExitStatus = [ 0 1 ];
|
||||||
};
|
};
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "monero";
|
pname = "monero-cli";
|
||||||
version = "0.17.2.3";
|
version = "0.17.2.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
@ -5,7 +5,7 @@
|
|||||||
, qtmultimedia, qtxmlpatterns
|
, qtmultimedia, qtxmlpatterns
|
||||||
, qtquickcontrols, qtquickcontrols2
|
, qtquickcontrols, qtquickcontrols2
|
||||||
, qtmacextras
|
, qtmacextras
|
||||||
, monero, miniupnpc, unbound, readline
|
, monero-cli, miniupnpc, unbound, readline
|
||||||
, boost, libunwind, libsodium, pcsclite
|
, boost, libunwind, libsodium, pcsclite
|
||||||
, randomx, zeromq, libgcrypt, libgpg-error
|
, randomx, zeromq, libgcrypt, libgpg-error
|
||||||
, hidapi, rapidjson, quirc
|
, hidapi, rapidjson, quirc
|
||||||
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
|||||||
qtbase qtdeclarative qtgraphicaleffects
|
qtbase qtdeclarative qtgraphicaleffects
|
||||||
qtmultimedia qtquickcontrols qtquickcontrols2
|
qtmultimedia qtquickcontrols qtquickcontrols2
|
||||||
qtxmlpatterns
|
qtxmlpatterns
|
||||||
monero miniupnpc unbound readline
|
monero-cli miniupnpc unbound readline
|
||||||
randomx libgcrypt libgpg-error
|
randomx libgcrypt libgpg-error
|
||||||
boost libunwind libsodium pcsclite
|
boost libunwind libsodium pcsclite
|
||||||
zeromq hidapi rapidjson quirc
|
zeromq hidapi rapidjson quirc
|
||||||
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
|||||||
postUnpack = ''
|
postUnpack = ''
|
||||||
# copy monero sources here
|
# copy monero sources here
|
||||||
# (needs to be writable)
|
# (needs to be writable)
|
||||||
cp -r ${monero.source}/* source/monero
|
cp -r ${monero-cli.source}/* source/monero
|
||||||
chmod -R +w source/monero
|
chmod -R +w source/monero
|
||||||
'';
|
'';
|
||||||
|
|
||||||
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
# use monerod from the monero package
|
# use monerod from the monero package
|
||||||
substituteInPlace src/daemon/DaemonManager.cpp \
|
substituteInPlace src/daemon/DaemonManager.cpp \
|
||||||
--replace 'QApplication::applicationDirPath() + "' '"${monero}/bin'
|
--replace 'QApplication::applicationDirPath() + "' '"${monero-cli}/bin'
|
||||||
|
|
||||||
# 1: only build external deps, *not* the full monero
|
# 1: only build external deps, *not* the full monero
|
||||||
# 2: use nixpkgs libraries
|
# 2: use nixpkgs libraries
|
||||||
|
@ -550,6 +550,7 @@ mapAliases ({
|
|||||||
minergate = throw "minergate has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13
|
minergate = throw "minergate has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13
|
||||||
minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13
|
minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13
|
||||||
minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # added 2021-10-14
|
minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # added 2021-10-14
|
||||||
|
monero = monero-cli; # added 2021-11-28
|
||||||
mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # added 2021-03-07
|
mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # added 2021-03-07
|
||||||
mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # added 2020-10-18
|
mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # added 2020-10-18
|
||||||
mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # added 2020-10-18
|
mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # added 2020-10-18
|
||||||
|
@ -29752,16 +29752,16 @@ with pkgs;
|
|||||||
|
|
||||||
lndmanage = callPackage ../applications/blockchains/lndmanage { };
|
lndmanage = callPackage ../applications/blockchains/lndmanage { };
|
||||||
|
|
||||||
monero = callPackage ../applications/blockchains/monero {
|
monero-cli = callPackage ../applications/blockchains/monero-cli {
|
||||||
inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC;
|
inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC;
|
||||||
boost = boost17x;
|
boost = boost17x;
|
||||||
};
|
};
|
||||||
|
|
||||||
oxen = callPackage ../applications/blockchains/oxen {
|
monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui {
|
||||||
boost = boost17x;
|
boost = boost17x;
|
||||||
};
|
};
|
||||||
|
|
||||||
monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui {
|
oxen = callPackage ../applications/blockchains/oxen {
|
||||||
boost = boost17x;
|
boost = boost17x;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user