From 9a5767cd5c147afab072d369e7ac3a73eadb79bf Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 21 Feb 2022 19:01:54 +0100 Subject: [PATCH 1/2] amuleGui,amuleDaemon: remove appendToName to have a consistent package name for repology --- pkgs/tools/networking/p2p/amule/default.nix | 16 +++++++++++++--- pkgs/top-level/all-packages.nix | 8 ++++---- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index c2e5f4568242..fc389f2c4dc4 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -20,8 +20,13 @@ , libX11 }: +# daemon and client are not build monolithic +assert monolithic || (!monolithic && (enableDaemon || client)); + stdenv.mkDerivation rec { - pname = "amule"; + pname = "amule" + + lib.optionalString enableDaemon "-daemon" + + lib.optionalString client "-gui"; version = "2.3.3"; src = fetchFromGitHub { @@ -34,9 +39,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gettext makeWrapper pkg-config ]; buildInputs = [ - zlib wxGTK30-gtk3 perl cryptopp.dev libupnp boost + zlib + wxGTK30-gtk3 + perl + cryptopp.dev + libupnp + boost ] ++ lib.optional httpServer libpng - ++ lib.optional client libX11; + ++ lib.optional client libX11; cmakeFlags = [ "-DBUILD_MONOLITHIC=${if monolithic then "ON" else "OFF"}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bcf252e06c9..fb1cc2b3de0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1530,15 +1530,15 @@ with pkgs; amule = callPackage ../tools/networking/p2p/amule { }; - amuleDaemon = appendToName "daemon" (amule.override { + amuleDaemon = amule.override { monolithic = false; enableDaemon = true; - }); + }; - amuleGui = appendToName "gui" (amule.override { + amuleGui = amule.override { monolithic = false; client = true; - }); + }; antennas = nodePackages.antennas; From 81ef57d6949b8a7b80a7e7ccf792df0be7df0e84 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 21 Feb 2022 21:24:11 +0100 Subject: [PATCH 2/2] amule-{daemon,gui}: renamed package name to kebap-case --- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index afce83f9c5e0..b5712c605a27 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -63,6 +63,8 @@ mapAliases ({ amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # Added 2020-10-30 aminal = throw "aminal was renamed to darktile."; # Added 2021-09-28 ammonite-repl = ammonite; # Added 2017-05-02 + amuleDaemon = throw "amuleDaemon was renamed to amule-daemon."; # Added 2022-02-11 + amuleGui = throw "amuleGui was renamed to amule-gui."; # Added 2022-02-11 amsn = throw "amsn has been removed due to being unmaintained."; # Added 2020-12-09 angelfish = libsForQt5.plasmaMobileGear.angelfish; # Added 2021-10-06 antimicro = throw "antimicro has been removed as it was broken, see antimicrox instead."; # Added 2020-08-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb1cc2b3de0d..3ef34830ac19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1530,12 +1530,12 @@ with pkgs; amule = callPackage ../tools/networking/p2p/amule { }; - amuleDaemon = amule.override { + amule-daemon = amule.override { monolithic = false; enableDaemon = true; }; - amuleGui = amule.override { + amule-gui = amule.override { monolithic = false; client = true; };