From 97a3b2af1dc0a781f6a5886b536628d374c65c4b Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 28 Nov 2021 11:04:42 +0100 Subject: [PATCH] monero: rename to monero-cli To make repology.org happy, use the -cli suffix. --- nixos/modules/services/networking/monero.nix | 2 +- .../blockchains/{monero => monero-cli}/default.nix | 2 +- .../{monero => monero-cli}/use-system-libraries.patch | 0 pkgs/applications/blockchains/monero-gui/default.nix | 8 ++++---- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 6 +++--- 6 files changed, 10 insertions(+), 9 deletions(-) rename pkgs/applications/blockchains/{monero => monero-cli}/default.nix (98%) rename pkgs/applications/blockchains/{monero => monero-cli}/use-system-libraries.patch (100%) diff --git a/nixos/modules/services/networking/monero.nix b/nixos/modules/services/networking/monero.nix index 9a9084e4ce1a..8bed89917c85 100644 --- a/nixos/modules/services/networking/monero.nix +++ b/nixos/modules/services/networking/monero.nix @@ -222,7 +222,7 @@ in serviceConfig = { User = "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"; SuccessExitStatus = [ 0 1 ]; }; diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero-cli/default.nix similarity index 98% rename from pkgs/applications/blockchains/monero/default.nix rename to pkgs/applications/blockchains/monero-cli/default.nix index ad07c3eba0b9..975253741b09 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero-cli/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - pname = "monero"; + pname = "monero-cli"; version = "0.17.2.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/blockchains/monero/use-system-libraries.patch b/pkgs/applications/blockchains/monero-cli/use-system-libraries.patch similarity index 100% rename from pkgs/applications/blockchains/monero/use-system-libraries.patch rename to pkgs/applications/blockchains/monero-cli/use-system-libraries.patch diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 303cc6c54c5b..af273fe9030b 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -5,7 +5,7 @@ , qtmultimedia, qtxmlpatterns , qtquickcontrols, qtquickcontrols2 , qtmacextras -, monero, miniupnpc, unbound, readline +, monero-cli, miniupnpc, unbound, readline , boost, libunwind, libsodium, pcsclite , randomx, zeromq, libgcrypt, libgpg-error , hidapi, rapidjson, quirc @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { qtbase qtdeclarative qtgraphicaleffects qtmultimedia qtquickcontrols qtquickcontrols2 qtxmlpatterns - monero miniupnpc unbound readline + monero-cli miniupnpc unbound readline randomx libgcrypt libgpg-error boost libunwind libsodium pcsclite zeromq hidapi rapidjson quirc @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { postUnpack = '' # copy monero sources here # (needs to be writable) - cp -r ${monero.source}/* source/monero + cp -r ${monero-cli.source}/* source/monero chmod -R +w source/monero ''; @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { # use monerod from the monero package 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 # 2: use nixpkgs libraries diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a4d61e34ca9d..7e89081aef3c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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-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 + 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-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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 404b07db8a81..e6663ae9d4ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29752,16 +29752,16 @@ with pkgs; 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; boost = boost17x; }; - oxen = callPackage ../applications/blockchains/oxen { + monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { boost = boost17x; }; - monero-gui = libsForQt5.callPackage ../applications/blockchains/monero-gui { + oxen = callPackage ../applications/blockchains/oxen { boost = boost17x; };