From 5ddb0a51e667ddff7e2c9979a35ae11225f81ba2 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Thu, 24 Jul 2025 11:15:46 +0200
Subject: [PATCH] piper-{tts, train}: move to by-name

---
 .../train.nix => by-name/pi/piper-train/package.nix}      | 0
 .../default.nix => by-name/pi/piper-tts/package.nix}      | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 3 ---
 3 files changed, 4 insertions(+), 7 deletions(-)
 rename pkgs/{tools/audio/piper/train.nix => by-name/pi/piper-train/package.nix} (100%)
 rename pkgs/{tools/audio/piper/default.nix => by-name/pi/piper-tts/package.nix} (91%)

diff --git a/pkgs/tools/audio/piper/train.nix b/pkgs/by-name/pi/piper-train/package.nix
similarity index 100%
rename from pkgs/tools/audio/piper/train.nix
rename to pkgs/by-name/pi/piper-train/package.nix
diff --git a/pkgs/tools/audio/piper/default.nix b/pkgs/by-name/pi/piper-tts/package.nix
similarity index 91%
rename from pkgs/tools/audio/piper/default.nix
rename to pkgs/by-name/pi/piper-tts/package.nix
index deb718b916ae..7e7782e81328 100644
--- a/pkgs/tools/audio/piper/default.nix
+++ b/pkgs/by-name/pi/piper-tts/package.nix
@@ -19,7 +19,7 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "piper";
+  pname = "piper-tts";
   version = "2023.11.14-2";
 
   src = fetchFromGitHub {
@@ -65,12 +65,12 @@ stdenv.mkDerivation (finalAttrs: {
     inherit piper-train;
   };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/rhasspy/piper/releases/tag/v${finalAttrs.version}";
     description = "Fast, local neural text to speech system";
     homepage = "https://github.com/rhasspy/piper";
-    license = licenses.mit;
-    maintainers = with maintainers; [ hexa ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ hexa ];
     mainProgram = "piper";
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5929c845e691..cc2594cae007 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4094,9 +4094,6 @@ with pkgs;
 
   pfstools = libsForQt5.callPackage ../tools/graphics/pfstools { };
 
-  piper-train = callPackage ../tools/audio/piper/train.nix { };
-  piper-tts = callPackage ../tools/audio/piper { };
-
   phosh = callPackage ../applications/window-managers/phosh { };
 
   phosh-mobile-settings =