From acb5e4763e151dd12b35657911bf50f6a3de7693 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 17:08:06 -0700
Subject: [PATCH 01/32] iannix: modernize, move to by-name/

---
 .../ia/iannix/package.nix}                    | 23 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 11 insertions(+), 14 deletions(-)
 rename pkgs/{applications/audio/iannix/default.nix => by-name/ia/iannix/package.nix} (67%)

diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/by-name/ia/iannix/package.nix
similarity index 67%
rename from pkgs/applications/audio/iannix/default.nix
rename to pkgs/by-name/ia/iannix/package.nix
index a6b3cd769205..1ba5fd2405cd 100644
--- a/pkgs/applications/audio/iannix/default.nix
+++ b/pkgs/by-name/ia/iannix/package.nix
@@ -1,15 +1,13 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchFromGitHub,
   alsa-lib,
   pkg-config,
-  qtbase,
-  qtscript,
-  qmake,
+  libsForQt5,
 }:
 
-mkDerivation {
+stdenv.mkDerivation {
   pname = "iannix";
   version = "unstable-2020-12-09";
 
@@ -22,24 +20,25 @@ mkDerivation {
 
   nativeBuildInputs = [
     pkg-config
-    qmake
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     alsa-lib
-    qtbase
-    qtscript
+    libsForQt5.qtbase
+    libsForQt5.qtscript
   ];
 
   qmakeFlags = [ "PREFIX=/" ];
 
   installFlags = [ "INSTALL_ROOT=$(out)" ];
 
-  meta = with lib; {
+  meta = {
     description = "Graphical open-source sequencer";
     mainProgram = "iannix";
     homepage = "https://www.iannix.org/";
-    license = licenses.lgpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ freezeboy ];
+    license = lib.licenses.lgpl3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ freezeboy ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5b1888b04b63..248202caea78 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3078,8 +3078,6 @@ with pkgs;
 
   hyphenDicts = recurseIntoAttrs (callPackages ../development/libraries/hyphen/dictionaries.nix { });
 
-  iannix = libsForQt5.callPackage ../applications/audio/iannix { };
-
   iaito = libsForQt5.callPackage ../tools/security/iaito { };
 
   icemon = libsForQt5.callPackage ../applications/networking/icemon { };

From 236eab40dc3d00512351c54f56f2b8f1fc4c7963 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 17:17:26 -0700
Subject: [PATCH 02/32] muse: move to by-name/

---
 .../muse/default.nix => by-name/mu/muse/package.nix} | 12 +++++-------
 pkgs/top-level/all-packages.nix                      |  2 --
 2 files changed, 5 insertions(+), 9 deletions(-)
 rename pkgs/{applications/audio/muse/default.nix => by-name/mu/muse/package.nix} (93%)

diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/by-name/mu/muse/package.nix
similarity index 93%
rename from pkgs/applications/audio/muse/default.nix
rename to pkgs/by-name/mu/muse/package.nix
index 5bf3612596b2..411bc19c4c0f 100644
--- a/pkgs/applications/audio/muse/default.nix
+++ b/pkgs/by-name/mu/muse/package.nix
@@ -5,8 +5,6 @@
   cmake,
   extra-cmake-modules,
   pkg-config,
-  qttools,
-  wrapQtAppsHook,
   alsa-lib,
   dssi,
   fluidsynth,
@@ -20,11 +18,11 @@
   lilv,
   lrdf,
   lv2,
-  qtsvg,
   rtaudio,
   rubberband,
   sord,
   serd,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -34,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "muse-sequencer";
     repo = "muse";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-LxibuqopMHuKEfTWXSEXc1g3wTm2F3NQRiV71FHvaY0=";
   };
 
@@ -44,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     extra-cmake-modules
     pkg-config
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -62,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     lilv
     lrdf
     lv2
-    qtsvg
+    libsForQt5.qtsvg
     rtaudio
     rubberband
     sord
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 248202caea78..08eda57a5239 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14290,8 +14290,6 @@ with pkgs;
 
   openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { };
 
-  muse = libsForQt5.callPackage ../applications/audio/muse { };
-
   nixDependencies = recurseIntoAttrs (
     callPackage ../tools/package-management/nix/dependencies-scope.nix { }
   );

From 60b91288d9145100befa651b2c37dfd6831e92af Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 17:25:56 -0700
Subject: [PATCH 03/32] jack-autoconnect: move to by-name/

---
 .../ja/jack-autoconnect/package.nix}          | 23 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  1 -
 2 files changed, 12 insertions(+), 12 deletions(-)
 rename pkgs/{applications/audio/jack-autoconnect/default.nix => by-name/ja/jack-autoconnect/package.nix} (67%)

diff --git a/pkgs/applications/audio/jack-autoconnect/default.nix b/pkgs/by-name/ja/jack-autoconnect/package.nix
similarity index 67%
rename from pkgs/applications/audio/jack-autoconnect/default.nix
rename to pkgs/by-name/ja/jack-autoconnect/package.nix
index 9d84c9ff669e..f46a4882b66b 100644
--- a/pkgs/applications/audio/jack-autoconnect/default.nix
+++ b/pkgs/by-name/ja/jack-autoconnect/package.nix
@@ -1,13 +1,12 @@
 {
+  stdenv,
   lib,
-  mkDerivation,
   fetchFromGitHub,
   pkg-config,
-  qmake,
-  qtbase,
   libjack2,
+  libsForQt5,
 }:
-mkDerivation {
+stdenv.mkDerivation {
   pname = "jack_autoconnect";
 
   # It does not have any versions (yet?)
@@ -17,16 +16,18 @@ mkDerivation {
     owner = "kripton";
     repo = "jack_autoconnect";
     rev = "fe0c8f69149e30979e067646f80b9d326341c02b";
-    sha256 = "sha256-imvNc498Q2W9RKmiOoNepSoJzIv2tGvFG6hx+seiifw=";
+    hash = "sha256-imvNc498Q2W9RKmiOoNepSoJzIv2tGvFG6hx+seiifw=";
   };
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     libjack2
   ];
+
   nativeBuildInputs = [
     pkg-config
-    qmake
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   installPhase = ''
@@ -34,12 +35,12 @@ mkDerivation {
     cp -- jack_autoconnect "$out/bin"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/kripton/jack_autoconnect";
     description = "Tiny application that reacts on port registrations by clients and connects them";
     mainProgram = "jack_autoconnect";
-    maintainers = with maintainers; [ unclechu ];
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ unclechu ];
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 08eda57a5239..a5bb892fea6d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14254,7 +14254,6 @@ with pkgs;
 
   libjack2 = jack2.override { prefix = "lib"; };
 
-  jack-autoconnect = libsForQt5.callPackage ../applications/audio/jack-autoconnect { };
   jack_autoconnect = jack-autoconnect;
 
   j2cli = with python311Packages; toPythonApplication j2cli;

From 72641301aef9fbd5376f231f78b8f9a2821613bc Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 17:35:55 -0700
Subject: [PATCH 04/32] mt32emu-qt: modernize, move to by-name/

---
 .../mt/mt32emu-qt/package.nix}                | 32 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 14 insertions(+), 20 deletions(-)
 rename pkgs/{applications/audio/munt/mt32emu-qt.nix => by-name/mt/mt32emu-qt/package.nix} (68%)

diff --git a/pkgs/applications/audio/munt/mt32emu-qt.nix b/pkgs/by-name/mt/mt32emu-qt/package.nix
similarity index 68%
rename from pkgs/applications/audio/munt/mt32emu-qt.nix
rename to pkgs/by-name/mt/mt32emu-qt/package.nix
index ca2d22cc8071..a7eb6f529ca3 100644
--- a/pkgs/applications/audio/munt/mt32emu-qt.nix
+++ b/pkgs/by-name/mt/mt32emu-qt/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  mkDerivation,
   fetchFromGitHub,
   alsa-lib,
   cmake,
@@ -9,24 +8,20 @@
   libmt32emu,
   pkg-config,
   portaudio,
-  qtbase,
-  qtmultimedia,
   withJack ? stdenv.hostPlatform.isUnix,
   libjack2,
+  libsForQt5,
 }:
 
-let
-  char2underscore = char: str: lib.replaceStrings [ char ] [ "_" ] str;
-in
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mt32emu-qt";
   version = "1.11.1";
 
   src = fetchFromGitHub {
     owner = "munt";
     repo = "munt";
-    rev = "${char2underscore "-" pname}_${char2underscore "." version}";
-    sha256 = "sha256-PqYPYnKPlnU3PByxksBscl4GqDRllQdmD6RWpy/Ura0=";
+    tag = "mt32emu_qt_${lib.replaceString "." "_" finalAttrs.version}";
+    hash = "sha256-PqYPYnKPlnU3PByxksBscl4GqDRllQdmD6RWpy/Ura0=";
   };
 
   postPatch = ''
@@ -36,13 +31,14 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     libmt32emu
     portaudio
-    qtbase
-    qtmultimedia
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
@@ -58,11 +54,11 @@ mkDerivation rec {
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir $out/Applications
-    mv $out/bin/${pname}.app $out/Applications/
-    ln -s $out/{Applications/${pname}.app/Contents/MacOS,bin}/${pname}
+    mv $out/bin/mt32emu-qt.app $out/Applications/
+    ln -s $out/{Applications/mt32emu-qt.app/Contents/MacOS,bin}/mt32emu-qt
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://munt.sourceforge.net/";
     description = "Synthesizer application built on Qt and libmt32emu";
     mainProgram = "mt32emu-qt";
@@ -71,8 +67,8 @@ mkDerivation rec {
       synthesis and conversion of pre-recorded SMF files to WAVE making use of
       the mt32emu library and the Qt framework.
     '';
-    license = with licenses; [ gpl3Plus ];
-    maintainers = with maintainers; [ OPNA2608 ];
-    platforms = platforms.all;
+    license = with lib.licenses; [ gpl3Plus ];
+    maintainers = with lib.maintainers; [ OPNA2608 ];
+    platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5bb892fea6d..1098b9c343ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11377,8 +11377,6 @@ with pkgs;
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
 
-  mt32emu-qt = libsForQt5.callPackage ../applications/audio/munt/mt32emu-qt.nix { };
-
   pass2csv = python3Packages.callPackage ../tools/security/pass2csv { };
 
   pinboard = with python3Packages; toPythonApplication pinboard;

From e1a909b7a1f46d2b65ef2b1221c00f3cc0685d72 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 17:46:46 -0700
Subject: [PATCH 05/32] synthv1: modernize, move to by-name/

---
 .../sy/synthv1/package.nix}                   | 28 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 15 insertions(+), 15 deletions(-)
 rename pkgs/{applications/audio/synthv1/default.nix => by-name/sy/synthv1/package.nix} (50%)

diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/by-name/sy/synthv1/package.nix
similarity index 50%
rename from pkgs/applications/audio/synthv1/default.nix
rename to pkgs/by-name/sy/synthv1/package.nix
index 4f6582a875cc..cda48be4f6ae 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/by-name/sy/synthv1/package.nix
@@ -1,42 +1,44 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchurl,
   pkg-config,
-  qtbase,
-  qttools,
   libjack2,
   alsa-lib,
   liblo,
   lv2,
+  libsForQt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "synthv1";
   version = "0.9.23";
 
   src = fetchurl {
-    url = "mirror://sourceforge/synthv1/${pname}-${version}.tar.gz";
-    sha256 = "sha256-0V72T51icT/t9fJf4mwcMYZLjzTPnmiCbU+BdwnCmw4=";
+    url = "mirror://sourceforge/synthv1/synthv1-${finalAttrs.version}.tar.gz";
+    hash = "sha256-0V72T51icT/t9fJf4mwcMYZLjzTPnmiCbU+BdwnCmw4=";
   };
 
   buildInputs = [
-    qtbase
-    qttools
+    libsForQt5.qtbase
+    libsForQt5.qttools
     libjack2
     alsa-lib
     liblo
     lv2
   ];
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    pkg-config
+    libsForQt5.wrapQtAppsHook
+  ];
 
-  meta = with lib; {
+  meta = {
     description = "Old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx";
     mainProgram = "synthv1_jack";
     homepage = "https://synthv1.sourceforge.io/";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1098b9c343ff..5c68da360a1c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13526,8 +13526,6 @@ with pkgs;
 
   stuntrally = callPackage ../games/stuntrally { boost = boost183; };
 
-  synthv1 = libsForQt5.callPackage ../applications/audio/synthv1 { };
-
   the-powder-toy = callPackage ../by-name/th/the-powder-toy/package.nix {
     lua = lua5_2;
   };

From 490bc12f6de312c9d27a90e1d4dce1f005337123 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 17:50:33 -0700
Subject: [PATCH 06/32] traverso: move to by-name/

---
 .../tr/traverso/package.nix}                  | 22 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 12 insertions(+), 12 deletions(-)
 rename pkgs/{applications/audio/traverso/default.nix => by-name/tr/traverso/package.nix} (74%)

diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/by-name/tr/traverso/package.nix
similarity index 74%
rename from pkgs/applications/audio/traverso/default.nix
rename to pkgs/by-name/tr/traverso/package.nix
index d58ccbf940f0..c554ac5683c9 100644
--- a/pkgs/applications/audio/traverso/default.nix
+++ b/pkgs/by-name/tr/traverso/package.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchurl,
   cmake,
@@ -15,22 +15,24 @@
   libsndfile,
   libvorbis,
   portaudio,
-  qtbase,
   wavpack,
+  libsForQt5,
 }:
-mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "traverso";
   version = "0.49.6";
 
   src = fetchurl {
-    url = "https://traverso-daw.org/traverso-0.49.6.tar.gz";
+    url = "https://traverso-daw.org/traverso-${finalAttrs.version}.tar.gz";
     sha256 = "12f7x8kw4fw1j0xkwjrp54cy4cv1ql0zwz2ba5arclk4pf6bhl7q";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
+    libsForQt5.wrapQtAppsHook
   ];
+
   buildInputs = [
     alsa-lib
     fftw
@@ -43,7 +45,7 @@ mkDerivation {
     libsndfile.dev
     libvorbis
     portaudio
-    qtbase
+    libsForQt5.qtbase
     wavpack
   ];
 
@@ -56,15 +58,15 @@ mkDerivation {
 
   hardeningDisable = [ "format" ];
 
-  meta = with lib; {
+  meta = {
     description = "Cross-platform multitrack audio recording and audio editing suite";
     mainProgram = "traverso";
     homepage = "https://traverso-daw.org/";
-    license = with licenses; [
+    license = with lib.licenses; [
       gpl2Plus
       lgpl21Plus
     ];
-    platforms = platforms.all;
-    maintainers = with maintainers; [ coconnor ];
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ coconnor ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c68da360a1c..28073e101548 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12634,8 +12634,6 @@ with pkgs;
   transmission_4-qt6 = transmission_4.override { enableQt6 = true; };
   transmission_4-qt = transmission_4-qt5;
 
-  traverso = libsForQt5.callPackage ../applications/audio/traverso { };
-
   tinywl = callPackage ../applications/window-managers/tinywl {
     wlroots = wlroots_0_19;
   };

From 94e81c1f953643fbdd1eebe79f9f1edc36d97cf7 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 18:35:19 -0700
Subject: [PATCH 07/32] sayonara: modernize, move to by-name/

---
 .../sa/sayonara/package.nix}                  | 24 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 12 insertions(+), 14 deletions(-)
 rename pkgs/{applications/audio/sayonara/default.nix => by-name/sa/sayonara/package.nix} (83%)

diff --git a/pkgs/applications/audio/sayonara/default.nix b/pkgs/by-name/sa/sayonara/package.nix
similarity index 83%
rename from pkgs/applications/audio/sayonara/default.nix
rename to pkgs/by-name/sa/sayonara/package.nix
index bd9331d6bc7e..ac4043f3b686 100644
--- a/pkgs/applications/audio/sayonara/default.nix
+++ b/pkgs/by-name/sa/sayonara/package.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation,
+  stdenv,
   cmake,
   fetchFromGitLab,
   nix-update-script,
@@ -9,11 +9,10 @@
   ninja,
   pcre,
   pkg-config,
-  qtbase,
-  qttools,
   taglib,
   zlib,
   python3,
+  libsForQt5,
 }:
 
 let
@@ -23,14 +22,14 @@ let
     ]
   );
 in
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sayonara";
   version = "1.10.0-stable1";
 
   src = fetchFromGitLab {
     owner = "luciocarreras";
     repo = "sayonara-player";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-ZcuWe1dsLJS4/nLXSSKB7wzPU9COFyE4vPSwZIo0bgI=";
   };
 
@@ -44,13 +43,14 @@ mkDerivation rec {
     cmake
     ninja
     pkg-config
-    qttools
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     libpulseaudio
     pcre
-    qtbase
+    libsForQt5.qtbase
     taglib
     zlib
     py
@@ -80,11 +80,11 @@ mkDerivation rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Sayonara music player";
     homepage = "https://sayonara-player.com/";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ deepfire ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ deepfire ];
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28073e101548..5a0e4d8350ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12357,8 +12357,6 @@ with pkgs;
 
   rusty-psn-gui = rusty-psn.override { withGui = true; };
 
-  sayonara = libsForQt5.callPackage ../applications/audio/sayonara { };
-
   scantailor-advanced = callPackage ../applications/graphics/scantailor/advanced.nix { };
 
   scantailor-universal = callPackage ../applications/graphics/scantailor/universal.nix { };

From db37f785a819c352879d95ad4d1d52471cea55fd Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 18:50:03 -0700
Subject: [PATCH 08/32] dfasma: modernize, move to by-name/

---
 .../df/dfasma/package.nix}                    | 27 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 14 insertions(+), 15 deletions(-)
 rename pkgs/{applications/audio/dfasma/default.nix => by-name/df/dfasma/package.nix} (85%)

diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/by-name/df/dfasma/package.nix
similarity index 85%
rename from pkgs/applications/audio/dfasma/default.nix
rename to pkgs/by-name/df/dfasma/package.nix
index dd3827ab8a19..96ad53f3bb7b 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/by-name/df/dfasma/package.nix
@@ -1,12 +1,10 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchFromGitHub,
   fftw,
   libsndfile,
-  qtbase,
-  qtmultimedia,
-  qmake,
+  libsForQt5,
 }:
 
 let
@@ -36,13 +34,13 @@ let
   };
 
 in
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "dfasma";
   version = "1.4.5";
 
   src = fetchFromGitHub {
     sha256 = "09fcyjm0hg3y51fnjax88m93im39nbynxj79ffdknsazmqw9ac0h";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     repo = "dfasma";
     owner = "gillesdegottex";
   };
@@ -50,11 +48,14 @@ mkDerivation rec {
   buildInputs = [
     fftw
     libsndfile
-    qtbase
-    qtmultimedia
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
   ];
 
-  nativeBuildInputs = [ qmake ];
+  nativeBuildInputs = [
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
+  ];
 
   postPatch = ''
     cp -Rv "${reaperFork.src}"/* external/REAPER
@@ -62,7 +63,7 @@ mkDerivation rec {
     substituteInPlace dfasma.pro --replace "CONFIG += file_sdif" "";
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Analyse and compare audio files in time and frequency";
     mainProgram = "dfasma";
     longDescription = ''
@@ -75,9 +76,9 @@ mkDerivation rec {
     '';
     homepage = "https://gillesdegottex.gitlab.io/dfasma-website/";
     license = [
-      licenses.gpl3Plus
+      lib.licenses.gpl3Plus
       reaperFork.meta.license
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a0e4d8350ee..a820d305ac35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10934,8 +10934,6 @@ with pkgs;
 
   inherit (callPackage ../development/tools/devpod { }) devpod devpod-desktop;
 
-  dfasma = libsForQt5.callPackage ../applications/audio/dfasma { };
-
   djv = callPackage ../by-name/dj/djv/package.nix { openexr = openexr_2; };
 
   djview4 = djview;

From f4ec3db3f4ffbe83f3fe99f814a2f4141d96d099 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 19:08:04 -0700
Subject: [PATCH 09/32] qmidinet: modernize, move to by-name/

---
 .../qm/qmidinet/package.nix}                  | 28 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 15 insertions(+), 15 deletions(-)
 rename pkgs/{applications/audio/qmidinet/default.nix => by-name/qm/qmidinet/package.nix} (55%)

diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/by-name/qm/qmidinet/package.nix
similarity index 55%
rename from pkgs/applications/audio/qmidinet/default.nix
rename to pkgs/by-name/qm/qmidinet/package.nix
index 782ddc613260..ba981125e1ac 100644
--- a/pkgs/applications/audio/qmidinet/default.nix
+++ b/pkgs/by-name/qm/qmidinet/package.nix
@@ -1,40 +1,42 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchurl,
   pkg-config,
-  qtbase,
-  qttools,
   alsa-lib,
   libjack2,
+  libsForQt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   version = "0.9.4";
   pname = "qmidinet";
 
   src = fetchurl {
-    url = "mirror://sourceforge/qmidinet/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/qmidinet/qmidinet-${finalAttrs.version}.tar.gz";
     sha256 = "sha256-7Ui4kUgYgpPVAaaINrd6WGZoYon5UuHszGVaHafb/p0=";
   };
 
   hardeningDisable = [ "format" ];
 
   buildInputs = [
-    qtbase
-    qttools
+    libsForQt5.qtbase
+    libsForQt5.qttools
     alsa-lib
     libjack2
   ];
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    pkg-config
+    libsForQt5.wrapQtAppsHook
+  ];
 
-  meta = with lib; {
+  meta = {
     description = "MIDI network gateway application that sends and receives MIDI data (ALSA Sequencer and/or JACK MIDI) over the network";
     mainProgram = "qmidinet";
     homepage = "http://qmidinet.sourceforge.net/";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.magnetophon ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ magnetophon ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a820d305ac35..575e54cfa88f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12218,8 +12218,6 @@ with pkgs;
   qmplay2-qt5 = qmplay2.override { qtVersion = "5"; };
   qmplay2-qt6 = qmplay2.override { qtVersion = "6"; };
 
-  qmidinet = libsForQt5.callPackage ../applications/audio/qmidinet { };
-
   qnotero = libsForQt5.callPackage ../applications/office/qnotero { };
 
   qsampler = libsForQt5.callPackage ../applications/audio/qsampler { };

From 3691402438faaa7ac686cfc9e9d919b5fcc37efe Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 19:18:45 -0700
Subject: [PATCH 10/32] qjackctl: modernize, move to by-name/

---
 .../qj/qjackctl/package.nix}                  | 27 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 13 insertions(+), 16 deletions(-)
 rename pkgs/{applications/audio/qjackctl/default.nix => by-name/qj/qjackctl/package.nix} (65%)

diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/by-name/qj/qjackctl/package.nix
similarity index 65%
rename from pkgs/applications/audio/qjackctl/default.nix
rename to pkgs/by-name/qj/qjackctl/package.nix
index 49adf9fab6f9..fc2a1cdd8bf4 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/by-name/qj/qjackctl/package.nix
@@ -1,20 +1,18 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   pkg-config,
   cmake,
   alsa-lib,
   libjack2,
   dbus,
-  qtbase,
-  qttools,
-  qtx11extras,
+  libsForQt5,
   # Enable jack session support
   jackSession ? false,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   version = "0.9.91";
   pname = "qjackctl";
 
@@ -23,14 +21,14 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rncbc";
     repo = "qjackctl";
-    rev = "${pname}_${lib.replaceStrings [ "." ] [ "_" ] version}";
-    sha256 = "sha256-YfdRyylU/ktFvsh18FjpnG9MkV1HxHJBhRnHWQ7I+hY=";
+    tag = "qjackctl_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
+    hash = "sha256-YfdRyylU/ktFvsh18FjpnG9MkV1HxHJBhRnHWQ7I+hY=";
   };
 
   buildInputs = [
-    qtbase
-    qtx11extras
-    qttools
+    libsForQt5.qtbase
+    libsForQt5.qtx11extras
+    libsForQt5.qttools
     alsa-lib
     libjack2
     dbus
@@ -39,6 +37,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
+    libsForQt5.wrapQtAppsHook
   ];
 
   cmakeFlags = [
@@ -46,12 +45,12 @@ mkDerivation rec {
     "-DCONFIG_JACK_SESSION=${toString jackSession}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Qt application to control the JACK sound server daemon";
     mainProgram = "qjackctl";
     homepage = "https://github.com/rncbc/qjackctl";
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     maintainers = [ ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 575e54cfa88f..4ce134137a6e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12211,8 +12211,6 @@ with pkgs;
 
   wrapQemuBinfmtP = callPackage ../applications/virtualization/qemu/binfmt-p-wrapper.nix { };
 
-  qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { };
-
   qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { };
 
   qmplay2-qt5 = qmplay2.override { qtVersion = "5"; };

From ffa273ca0cdd894176abd4e1040b94dda88d94a3 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 19:21:42 -0700
Subject: [PATCH 11/32] qsampler: modernize, move to by-name/

---
 .../qs/qsampler/package.nix}                  | 22 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 11 insertions(+), 13 deletions(-)
 rename pkgs/{applications/audio/qsampler/default.nix => by-name/qs/qsampler/package.nix} (66%)

diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/by-name/qs/qsampler/package.nix
similarity index 66%
rename from pkgs/applications/audio/qsampler/default.nix
rename to pkgs/by-name/qs/qsampler/package.nix
index 46e7a5c7fea3..1abc916de994 100644
--- a/pkgs/applications/audio/qsampler/default.nix
+++ b/pkgs/by-name/qs/qsampler/package.nix
@@ -1,23 +1,22 @@
 {
   lib,
+  stdenv,
   fetchurl,
   autoconf,
   automake,
   libtool,
   pkg-config,
-  qttools,
   liblscp,
   libgig,
-  qtbase,
-  mkDerivation,
+  libsForQt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qsampler";
   version = "0.6.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/qsampler/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/qsampler/qsampler-${finalAttrs.version}.tar.gz";
     sha256 = "1wr7k739zx2nz00b810f60g9k3y92w05nfci987hw7y2sks9rd8j";
   };
 
@@ -26,24 +25,25 @@ mkDerivation rec {
     automake
     libtool
     pkg-config
-    qttools
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     liblscp
     libgig
-    qtbase
+    libsForQt5.qtbase
   ];
 
   preConfigure = "make -f Makefile.svn";
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "http://www.linuxsampler.org";
     description = "Graphical frontend to LinuxSampler";
     mainProgram = "qsampler";
-    license = licenses.gpl2;
+    license = lib.licenses.gpl2;
     maintainers = [ ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ce134137a6e..77825ef64ec5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12218,8 +12218,6 @@ with pkgs;
 
   qnotero = libsForQt5.callPackage ../applications/office/qnotero { };
 
-  qsampler = libsForQt5.callPackage ../applications/audio/qsampler { };
-
   qsstv = qt5.callPackage ../applications/radio/qsstv { };
 
   qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { };

From b2ed4d386a8178619db0fa00e9df664573c18595 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 19:51:00 -0700
Subject: [PATCH 12/32] projectm_3: move to by-name/

---
 .../pr/projectm_3/package.nix}                     | 14 +++++++-------
 pkgs/top-level/all-packages.nix                    |  2 --
 2 files changed, 7 insertions(+), 9 deletions(-)
 rename pkgs/{applications/audio/projectm_3/default.nix => by-name/pr/projectm_3/package.nix} (88%)

diff --git a/pkgs/applications/audio/projectm_3/default.nix b/pkgs/by-name/pr/projectm_3/package.nix
similarity index 88%
rename from pkgs/applications/audio/projectm_3/default.nix
rename to pkgs/by-name/pr/projectm_3/package.nix
index 09db5ad83393..fb283966c723 100644
--- a/pkgs/applications/audio/projectm_3/default.nix
+++ b/pkgs/by-name/pr/projectm_3/package.nix
@@ -1,37 +1,37 @@
 {
   stdenv,
-  mkDerivation,
   lib,
   fetchFromGitHub,
   autoreconfHook,
   pkg-config,
   SDL2,
-  qtdeclarative,
   libpulseaudio,
   glm,
   which,
+  libsForQt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "projectm";
   version = "3.1.12";
 
   src = fetchFromGitHub {
     owner = "projectM-visualizer";
     repo = "projectM";
-    rev = "v${version}";
-    sha256 = "sha256-oEfOx93JyR94II5NkUCvMwqxuV7ktpOHZ8PNMLCiqDw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-oEfOx93JyR94II5NkUCvMwqxuV7ktpOHZ8PNMLCiqDw=";
   };
 
   nativeBuildInputs = [
     pkg-config
     autoreconfHook
     which
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     SDL2
-    qtdeclarative
+    libsForQt5.qtdeclarative
     libpulseaudio
     glm
   ];
@@ -65,4 +65,4 @@ mkDerivation rec {
       Read an audio input and produces mesmerizing visuals, detecting tempo, and rendering advanced equations into a limitless array of user-contributed visualizations.
     '';
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 77825ef64ec5..96ce666dc72a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3833,8 +3833,6 @@ with pkgs;
 
   polaris-web = callPackage ../servers/polaris/web.nix { };
 
-  projectm_3 = libsForQt5.callPackage ../applications/audio/projectm_3 { };
-
   proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix { };
 
   pycflow2dot = with python3.pkgs; toPythonApplication pycflow2dot;

From 0d1e5fd68008ccc0c3a830e5213f77afd42192e7 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 19:54:01 -0700
Subject: [PATCH 13/32] jackmix: modernize, move to by-name/

---
 .../audio => by-name/ja}/jackmix/no_error.patch     |  0
 .../default.nix => by-name/ja/jackmix/package.nix}  | 13 +++++++------
 pkgs/top-level/all-packages.nix                     |  1 -
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename pkgs/{applications/audio => by-name/ja}/jackmix/no_error.patch (100%)
 rename pkgs/{applications/audio/jackmix/default.nix => by-name/ja/jackmix/package.nix} (88%)

diff --git a/pkgs/applications/audio/jackmix/no_error.patch b/pkgs/by-name/ja/jackmix/no_error.patch
similarity index 100%
rename from pkgs/applications/audio/jackmix/no_error.patch
rename to pkgs/by-name/ja/jackmix/no_error.patch
diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/by-name/ja/jackmix/package.nix
similarity index 88%
rename from pkgs/applications/audio/jackmix/default.nix
rename to pkgs/by-name/ja/jackmix/package.nix
index d4a0bf6064a4..7b57e6571bcb 100644
--- a/pkgs/applications/audio/jackmix/default.nix
+++ b/pkgs/by-name/ja/jackmix/package.nix
@@ -1,25 +1,25 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchFromGitHub,
   pkg-config,
   scons,
-  qtbase,
   lash,
   libjack2,
   jack ? libjack2,
   alsa-lib,
+  libsForQt5,
   fetchpatch,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "jackmix";
   version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "kampfschlaefer";
     repo = "jackmix";
-    rev = version;
+    tag = finalAttrs.version;
     sha256 = "0p59411vk38lccn24r7nih10jpgg9i46yc26zpc3x13amxwwpd4h";
   };
 
@@ -35,9 +35,10 @@ mkDerivation rec {
   nativeBuildInputs = [
     scons
     pkg-config
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     lash
     jack
     alsa-lib
@@ -55,4 +56,4 @@ mkDerivation rec {
     maintainers = with maintainers; [ kampfschlaefer ];
     platforms = platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96ce666dc72a..8b0c025fd583 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11578,7 +11578,6 @@ with pkgs;
     subproject = "reader";
   };
 
-  jackmix = libsForQt5.callPackage ../applications/audio/jackmix { };
   jackmix_jack1 = jackmix.override { jack = jack1; };
 
   js8call = qt5.callPackage ../applications/radio/js8call { };

From 38a526329486c6091a6d7e5a6ed0e8616c053171 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 20:20:42 -0700
Subject: [PATCH 14/32] carla: move to by-name/

---
 .../ca/carla/package.nix}                     | 21 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 10 insertions(+), 13 deletions(-)
 rename pkgs/{applications/audio/carla/default.nix => by-name/ca/carla/package.nix} (87%)

diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/by-name/ca/carla/package.nix
similarity index 87%
rename from pkgs/applications/audio/carla/default.nix
rename to pkgs/by-name/ca/carla/package.nix
index ece20404eac8..5e89d64292bf 100644
--- a/pkgs/applications/audio/carla/default.nix
+++ b/pkgs/by-name/ca/carla/package.nix
@@ -11,17 +11,16 @@
   libsndfile,
   pkg-config,
   python3Packages,
+  libsForQt5,
   which,
   gtk3 ? null,
-  qtbase ? null,
   withFrontend ? true,
   withGtk3 ? true,
   withQt ? true,
-  wrapQtAppsHook ? null,
 }:
 
-assert withQt -> qtbase != null;
-assert withQt -> wrapQtAppsHook != null;
+assert withQt -> libsForQt5.qtbase != null;
+assert withQt -> libsForQt5.wrapQtAppsHook != null;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "carla";
@@ -30,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "falkTX";
     repo = "carla";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-21QaFCIjGjRTcJtf2nwC5RcVJF8JgcFPIbS8apvf9tw=";
   };
 
@@ -38,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     python3Packages.wrapPython
     pkg-config
     which
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   pythonPath =
@@ -58,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpulseaudio
     libsndfile
   ]
-  ++ lib.optional withQt qtbase
+  ++ lib.optional withQt libsForQt5.qtbase
   ++ lib.optional withGtk3 gtk3;
 
   propagatedBuildInputs = finalAttrs.pythonPath;
@@ -99,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://kx.studio/Applications:Carla";
     description = "Audio plugin host";
     longDescription = ''
@@ -108,8 +107,8 @@ stdenv.mkDerivation (finalAttrs: {
       It uses JACK as the default and preferred audio driver but also
       supports native drivers like ALSA, DirectSound or CoreAudio.
     '';
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.minijackson ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ minijackson ];
+    platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b0c025fd583..9822dbf4263c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10842,8 +10842,6 @@ with pkgs;
     confd-calico
     ;
 
-  carla = libsForQt5.callPackage ../applications/audio/carla { };
-
   cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { };
 
   cbconvert-gui = cbconvert.gui;

From 873872959d90f6539061bdf229c76e027b1527c6 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 20:51:34 -0700
Subject: [PATCH 15/32] seq66: move to by-name/

---
 .../se/seq66/package.nix}                     | 26 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 12 insertions(+), 16 deletions(-)
 rename pkgs/{applications/audio/seq66/default.nix => by-name/se/seq66/package.nix} (73%)

diff --git a/pkgs/applications/audio/seq66/default.nix b/pkgs/by-name/se/seq66/package.nix
similarity index 73%
rename from pkgs/applications/audio/seq66/default.nix
rename to pkgs/by-name/se/seq66/package.nix
index 90ed92fa2039..0d0415ba25cb 100644
--- a/pkgs/applications/audio/seq66/default.nix
+++ b/pkgs/by-name/se/seq66/package.nix
@@ -4,55 +4,53 @@
   fetchFromGitHub,
   autoreconfHook,
   pkg-config,
-  qttools,
   which,
   alsa-lib,
   libjack2,
   liblo,
-  qtbase,
-  wrapQtAppsHook,
+  qt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "seq66";
   version = "0.99.21";
 
   src = fetchFromGitHub {
     owner = "ahlstromcj";
     repo = "seq66";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-0joa69nSX3lcpoRq9YToNA75Sg9dlYMGRZEfcJm9Vjg=";
   };
 
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
-    qttools
+    qt5.qttools
     which
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     alsa-lib
     libjack2
     liblo
-    qtbase
+    qt5.qtbase
   ];
 
   postPatch = ''
     for d in libseq66/src libsessions/include libsessions/src seq_qt5/src seq_rtmidi/src; do
-      substituteInPlace "$d/Makefile.am" --replace-fail '$(git_info)' '${version}'
+      substituteInPlace "$d/Makefile.am" --replace-fail '$(git_info)' '${finalAttrs.version}'
     done
   '';
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/ahlstromcj/seq66";
     description = "Loop based midi sequencer with Qt GUI derived from seq24 and sequencer64";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ orivej ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ orivej ];
     mainProgram = "qseq66";
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9822dbf4263c..1e7eadd6cb59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12348,8 +12348,6 @@ with pkgs;
 
   scantailor-universal = callPackage ../applications/graphics/scantailor/universal.nix { };
 
-  seq66 = qt5.callPackage ../applications/audio/seq66 { };
-
   sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { };
 
   stag = callPackage ../applications/misc/stag {

From 62c2b9c6f1560b1cb4005c1006bb47448f7a9027 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 21:27:49 -0700
Subject: [PATCH 16/32] samplv1: move to by-name/

---
 .../sa/samplv1/package.nix}                   | 19 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 8 insertions(+), 13 deletions(-)
 rename pkgs/{applications/audio/samplv1/default.nix => by-name/sa/samplv1/package.nix} (75%)

diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/by-name/sa/samplv1/package.nix
similarity index 75%
rename from pkgs/applications/audio/samplv1/default.nix
rename to pkgs/by-name/sa/samplv1/package.nix
index c15e62c3612a..9991c26e50db 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/by-name/sa/samplv1/package.nix
@@ -8,27 +8,24 @@
   liblo,
   libsndfile,
   lv2,
-  qtbase,
-  qttools,
   rubberband,
-  wrapQtAppsHook,
   cmake,
-  qtsvg,
+  kdePackages,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "samplv1";
   version = "1.3.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/samplv1/samplv1-${version}.tar.gz";
+    url = "mirror://sourceforge/samplv1/samplv1-${finalAttrs.version}.tar.gz";
     hash = "sha256-YCxt9RAP02uAigddA6HjBt2ryM6MyOtI3L2eLg0AhFg=";
   };
 
   nativeBuildInputs = [
-    qttools
+    kdePackages.qttools
     pkg-config
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
     cmake
   ];
 
@@ -38,9 +35,9 @@ stdenv.mkDerivation rec {
     liblo
     libsndfile
     lv2
-    qtbase
+    kdePackages.qtbase
     rubberband
-    qtsvg
+    kdePackages.qtsvg
   ];
 
   meta = {
@@ -51,4 +48,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e7eadd6cb59..214bea99b2ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13104,8 +13104,6 @@ with pkgs;
     stdenv = llvmPackages.stdenv;
   };
 
-  samplv1 = qt6.callPackage ../applications/audio/samplv1 { };
-
   beancount = with python3.pkgs; toPythonApplication beancount;
 
   beancount_2 = with python3.pkgs; toPythonApplication beancount_2;

From 89d1c448c15200fa772aeef5aa6bb182474201f3 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 21:32:44 -0700
Subject: [PATCH 17/32] mbrola{-voices}: move to by-name/

---
 .../voices.nix => by-name/mb/mbrola-voices/package.nix}       | 0
 .../mbrola/default.nix => by-name/mb/mbrola/package.nix}      | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 3 files changed, 4 deletions(-)
 rename pkgs/{applications/audio/mbrola/voices.nix => by-name/mb/mbrola-voices/package.nix} (100%)
 rename pkgs/{applications/audio/mbrola/default.nix => by-name/mb/mbrola/package.nix} (100%)

diff --git a/pkgs/applications/audio/mbrola/voices.nix b/pkgs/by-name/mb/mbrola-voices/package.nix
similarity index 100%
rename from pkgs/applications/audio/mbrola/voices.nix
rename to pkgs/by-name/mb/mbrola-voices/package.nix
diff --git a/pkgs/applications/audio/mbrola/default.nix b/pkgs/by-name/mb/mbrola/package.nix
similarity index 100%
rename from pkgs/applications/audio/mbrola/default.nix
rename to pkgs/by-name/mb/mbrola/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 214bea99b2ff..2f5ec60f0304 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11774,10 +11774,6 @@ with pkgs;
     python3Packages.callPackage ../applications/networking/instant-messengers/matrix-commander
       { };
 
-  mbrola = callPackage ../applications/audio/mbrola { };
-
-  mbrola-voices = callPackage ../applications/audio/mbrola/voices.nix { };
-
   mediaelch-qt5 = callPackage ../by-name/me/mediaelch/package.nix { qtVersion = 5; };
   mediaelch-qt6 = mediaelch;
 

From 73e26854d1ed03f2df5bf12bb32aa6f072136570 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 21:57:21 -0700
Subject: [PATCH 18/32] patchance: move to by-name/

---
 .../pa/patchance/package.nix}                 | 19 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 9 insertions(+), 12 deletions(-)
 rename pkgs/{applications/audio/patchance/default.nix => by-name/pa/patchance/package.nix} (72%)

diff --git a/pkgs/applications/audio/patchance/default.nix b/pkgs/by-name/pa/patchance/package.nix
similarity index 72%
rename from pkgs/applications/audio/patchance/default.nix
rename to pkgs/by-name/pa/patchance/package.nix
index c527bc7037c2..dbe985fd808f 100644
--- a/pkgs/applications/audio/patchance/default.nix
+++ b/pkgs/by-name/pa/patchance/package.nix
@@ -1,27 +1,26 @@
 {
   lib,
   fetchurl,
-  buildPythonApplication,
+  python3Packages,
   libjack2,
-  pyqt5,
   qt5,
   which,
   bash,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "patchance";
   version = "1.1.0";
 
   src = fetchurl {
     url = "https://github.com/Houston4444/Patchance/releases/download/v${version}/Patchance-${version}-source.tar.gz";
-    sha256 = "sha256-wlkEKkPH2C/y7TQicIVycWbtLUdX2hICcUWi7nFN51w=";
+    hash = "sha256-wlkEKkPH2C/y7TQicIVycWbtLUdX2hICcUWi7nFN51w=";
   };
 
   format = "other";
 
   nativeBuildInputs = [
-    pyqt5 # pyuic5 and pyrcc5 to build resources.
+    python3Packages.pyqt5 # pyuic5 and pyrcc5 to build resources.
     qt5.qttools # lrelease to build translations.
     which # which to find lrelease.
     qt5.wrapQtAppsHook
@@ -30,7 +29,7 @@ buildPythonApplication rec {
     libjack2
     bash
   ];
-  propagatedBuildInputs = [ pyqt5 ];
+  propagatedBuildInputs = [ python3Packages.pyqt5 ];
 
   dontWrapQtApps = true; # The program is a python script.
 
@@ -54,12 +53,12 @@ buildPythonApplication rec {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/Houston4444/Patchance";
     description = "JACK Patchbay GUI";
     mainProgram = "patchance";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ orivej ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ orivej ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f5ec60f0304..b82f42e5eb62 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3747,8 +3747,6 @@ with pkgs;
 
   patch = gnupatch;
 
-  patchance = python3Packages.callPackage ../applications/audio/patchance { };
-
   pcscliteWithPolkit = pcsclite.override {
     pname = "pcsclite-with-polkit";
     polkitSupport = true;

From 83581bafc24ce2b89926f1630220a9ed960ba3da Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 21:59:27 -0700
Subject: [PATCH 19/32] raysession: move to by-name/

---
 .../ra/raysession/package.nix}                | 22 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 10 insertions(+), 14 deletions(-)
 rename pkgs/{applications/audio/raysession/default.nix => by-name/ra/raysession/package.nix} (76%)

diff --git a/pkgs/applications/audio/raysession/default.nix b/pkgs/by-name/ra/raysession/package.nix
similarity index 76%
rename from pkgs/applications/audio/raysession/default.nix
rename to pkgs/by-name/ra/raysession/package.nix
index ad6ae6e03dd9..27cfceef16e6 100644
--- a/pkgs/applications/audio/raysession/default.nix
+++ b/pkgs/by-name/ra/raysession/package.nix
@@ -1,22 +1,20 @@
 {
   lib,
   fetchurl,
-  buildPythonApplication,
+  python3Packages,
   libjack2,
-  pyliblo3,
-  pyqt5,
   which,
   bash,
   qt5,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "raysession";
   version = "0.14.4";
 
   src = fetchurl {
     url = "https://github.com/Houston4444/RaySession/releases/download/v${version}/RaySession-${version}-source.tar.gz";
-    sha256 = "sha256-cr9kqZdqY6Wq+RkzwYxNrb/PLFREKUgWeVNILVUkc7A=";
+    hash = "sha256-cr9kqZdqY6Wq+RkzwYxNrb/PLFREKUgWeVNILVUkc7A=";
   };
 
   postPatch = ''
@@ -30,7 +28,7 @@ buildPythonApplication rec {
   format = "other";
 
   nativeBuildInputs = [
-    pyqt5 # pyuic5 and pyrcc5 to build resources.
+    python3Packages.pyqt5 # pyuic5 and pyrcc5 to build resources.
     qt5.qttools # lrelease to build translations.
     which # which to find lrelease.
     qt5.wrapQtAppsHook
@@ -40,8 +38,8 @@ buildPythonApplication rec {
     bash
   ];
   dependencies = [
-    pyliblo3
-    pyqt5
+    python3Packages.pyliblo3
+    python3Packages.pyqt5
   ];
 
   dontWrapQtApps = true; # The program is a python script.
@@ -62,11 +60,11 @@ buildPythonApplication rec {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/Houston4444/RaySession";
     description = "Session manager for Linux musical programs";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ orivej ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ orivej ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b82f42e5eb62..85c68d5e51e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3847,8 +3847,6 @@ with pkgs;
 
   pywal = with python3Packages; toPythonApplication pywal;
 
-  raysession = python3Packages.callPackage ../applications/audio/raysession { };
-
   remarshal = with python3Packages; toPythonApplication remarshal;
 
   riseup-vpn = qt6Packages.callPackage ../tools/networking/bitmask-vpn {

From c8a90d6bb4906539aea1a1935148081d452ab162 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 13:17:17 -0700
Subject: [PATCH 20/32] mixxx: move to by-name/

---
 .../mi/mixxx/package.nix}                     | 19 +++++++------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 7 insertions(+), 14 deletions(-)
 rename pkgs/{applications/audio/mixxx/default.nix => by-name/mi/mixxx/package.nix} (93%)

diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/by-name/mi/mixxx/package.nix
similarity index 93%
rename from pkgs/applications/audio/mixxx/default.nix
rename to pkgs/by-name/mi/mixxx/package.nix
index 82bd51e8ad17..ee9cbed563a7 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/by-name/mi/mixxx/package.nix
@@ -36,11 +36,6 @@
   portaudio,
   portmidi,
   protobuf,
-  qt5compat,
-  qtbase,
-  qtdeclarative,
-  qtkeychain,
-  qtsvg,
   rubberband,
   serd,
   sord,
@@ -51,7 +46,7 @@
   upower,
   vamp-plugin-sdk,
   wavpack,
-  wrapQtAppsHook,
+  kdePackages,
 }:
 
 stdenv.mkDerivation rec {
@@ -74,7 +69,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -110,11 +105,11 @@ stdenv.mkDerivation rec {
     portaudio
     portmidi
     protobuf
-    qt5compat
-    qtbase
-    qtdeclarative
-    qtkeychain
-    qtsvg
+    kdePackages.qt5compat
+    kdePackages.qtbase
+    kdePackages.qtdeclarative
+    kdePackages.qtkeychain
+    kdePackages.qtsvg
     rubberband
     serd
     sord
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85c68d5e51e4..139fcdbf8766 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11795,8 +11795,6 @@ with pkgs;
 
   minitube = libsForQt5.callPackage ../applications/video/minitube { };
 
-  mixxx = qt6Packages.callPackage ../applications/audio/mixxx { };
-
   mldonkey = callPackage ../applications/networking/p2p/mldonkey {
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };

From ed5d911fafe738234b1046b7d611cfc665d80e74 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 13:34:57 -0700
Subject: [PATCH 21/32] pragha: modernize, move to by-name/

---
 .../pr/pragha/package.nix}                    | 27 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 14 insertions(+), 15 deletions(-)
 rename pkgs/{applications/audio/pragha/default.nix => by-name/pr/pragha/package.nix} (83%)

diff --git a/pkgs/applications/audio/pragha/default.nix b/pkgs/by-name/pr/pragha/package.nix
similarity index 83%
rename from pkgs/applications/audio/pragha/default.nix
rename to pkgs/by-name/pr/pragha/package.nix
index a96b037d8c5b..067359851eb7 100644
--- a/pkgs/applications/audio/pragha/default.nix
+++ b/pkgs/by-name/pr/pragha/package.nix
@@ -1,14 +1,13 @@
 {
   lib,
+  stdenv,
   intltool,
-  mkDerivation,
   installShellFiles,
   pkg-config,
   fetchFromGitHub,
   dbus-glib,
   desktop-file-utils,
   hicolor-icon-theme,
-  qtbase,
   sqlite,
   taglib,
   zlib,
@@ -17,6 +16,7 @@
   libcddb,
   libcdio,
   gst_all_1,
+  libsForQt5,
   withGstPlugins ? true,
   glyr,
   withGlyr ? true,
@@ -45,15 +45,15 @@
 assert withGlyr -> withLastfm;
 assert withLastfm -> withCD;
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pragha";
   version = "1.3.99.1";
 
   src = fetchFromGitHub {
     owner = "pragha-music-player";
     repo = "pragha";
-    rev = "v${version}";
-    sha256 = "sha256-C4zh2NHqP4bwKMi5s+3AfEtKqxRlzL66H8OyNonGzxE=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-C4zh2NHqP4bwKMi5s+3AfEtKqxRlzL66H8OyNonGzxE=";
   };
 
   nativeBuildInputs = [
@@ -62,6 +62,7 @@ mkDerivation rec {
     xfce.xfce4-dev-tools
     desktop-file-utils
     installShellFiles
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs =
@@ -73,7 +74,7 @@ mkDerivation rec {
       gtk3
       hicolor-icon-theme
       libpeas
-      qtbase
+      libsForQt5.qtbase
       sqlite
       taglib
       zlib
@@ -108,17 +109,17 @@ mkDerivation rec {
   postInstall = ''
     qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
 
-    install -m 444 data/${pname}.desktop $out/share/applications
+    install -m 444 data/pragha.desktop $out/share/applications
     install -d $out/share/pixmaps
-    installManPage data/${pname}.1
+    installManPage data/pragha.1
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Lightweight GTK+ music manager - fork of Consonance Music Manager";
     mainProgram = "pragha";
     homepage = "https://pragha-music-player.github.io/";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ mbaeten ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ mbaeten ];
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 139fcdbf8766..104ff7b6ca1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11858,8 +11858,6 @@ with pkgs;
     withConplay = false;
   };
 
-  pragha = libsForQt5.callPackage ../applications/audio/pragha { };
-
   rofi-emoji = (callPackage ../applications/misc/rofi-emoji { }).v3;
 
   rofi-rbw = python3Packages.callPackage ../applications/misc/rofi-rbw {

From 3f9b9a9212d9c5f749acc9901fb60e2a5af85b7e Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 15:06:20 -0700
Subject: [PATCH 22/32] hqplayer-desktop: move to by-name/

---
 .../hq/hqplayer-desktop/package.nix}          | 27 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 11 insertions(+), 18 deletions(-)
 rename pkgs/{applications/audio/hqplayer-desktop/default.nix => by-name/hq/hqplayer-desktop/package.nix} (87%)

diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/by-name/hq/hqplayer-desktop/package.nix
similarity index 87%
rename from pkgs/applications/audio/hqplayer-desktop/default.nix
rename to pkgs/by-name/hq/hqplayer-desktop/package.nix
index 36fc6235dad5..2b8acc8aa1ab 100644
--- a/pkgs/applications/audio/hqplayer-desktop/default.nix
+++ b/pkgs/by-name/hq/hqplayer-desktop/package.nix
@@ -12,13 +12,8 @@
   libusb-compat-0_1,
   llvmPackages,
   mpfr,
-  qtcharts,
-  qtdeclarative,
-  qtwayland,
-  qtwebengine,
-  qtwebview,
   wavpack,
-  wrapQtAppsHook,
+  kdePackages,
 }:
 
 let
@@ -44,7 +39,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     autoPatchelfHook
     dpkg
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -56,11 +51,11 @@ stdenv.mkDerivation {
     libusb-compat-0_1
     llvmPackages.openmp
     mpfr
-    qtcharts
-    qtdeclarative
-    qtwayland
-    qtwebengine
-    qtwebview
+    kdePackages.qtcharts
+    kdePackages.qtdeclarative
+    kdePackages.qtwayland
+    kdePackages.qtwebengine
+    kdePackages.qtwebview
     wavpack
   ];
 
@@ -111,12 +106,12 @@ stdenv.mkDerivation {
     patchelf --replace-needed libomp.so.5 libomp.so $out/bin/.hqplayer5*-wrapped
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.signalyst.com";
     description = "High-end upsampling multichannel software HD-audio player";
-    license = licenses.unfree;
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.unfree;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = builtins.attrNames srcs;
-    maintainers = with maintainers; [ lovesegfault ];
+    maintainers = with lib.maintainers; [ lovesegfault ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 104ff7b6ca1a..818bebe35901 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3062,8 +3062,6 @@ with pkgs;
 
   hpccm = with python3Packages; toPythonApplication hpccm;
 
-  hqplayer-desktop = qt6Packages.callPackage ../applications/audio/hqplayer-desktop { };
-
   html-proofer = callPackage ../tools/misc/html-proofer { };
 
   httpie = with python3Packages; toPythonApplication httpie;

From 101675411d30a3f8b0eaae967f203949c0b66fd6 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 15:17:55 -0700
Subject: [PATCH 23/32] mellowplayer: modernize, move to by-name/

---
 .../me/mellowplayer/package.nix}              | 39 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 17 insertions(+), 24 deletions(-)
 rename pkgs/{applications/audio/mellowplayer/default.nix => by-name/me/mellowplayer/package.nix} (77%)

diff --git a/pkgs/applications/audio/mellowplayer/default.nix b/pkgs/by-name/me/mellowplayer/package.nix
similarity index 77%
rename from pkgs/applications/audio/mellowplayer/default.nix
rename to pkgs/by-name/me/mellowplayer/package.nix
index 418e80e15c20..89429be73733 100644
--- a/pkgs/applications/audio/mellowplayer/default.nix
+++ b/pkgs/by-name/me/mellowplayer/package.nix
@@ -1,43 +1,38 @@
 {
+  stdenv,
   cmake,
   fetchFromGitLab,
   lib,
   libnotify,
-  mkDerivation,
   pkg-config,
-  qtbase,
-  qtdeclarative,
-  qtgraphicaleffects,
-  qtquickcontrols2,
-  qttools,
-  qtwebengine,
-  stdenv,
+  libsForQt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "MellowPlayer";
   version = "3.6.8";
 
   src = fetchFromGitLab {
     owner = "ColinDuquesnoy";
     repo = "MellowPlayer";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-rsF2xQet7U8d4oGU/HgghvE3vvmkxjlGXPBlLD9mWTk=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     libnotify
-    qtbase
-    qtdeclarative
-    qtgraphicaleffects
-    qtquickcontrols2
-    qttools
-    qtwebengine
+    libsForQt5.qtbase
+    libsForQt5.qtdeclarative
+    libsForQt5.qtgraphicaleffects
+    libsForQt5.qtquickcontrols2
+    libsForQt5.qttools
+    libsForQt5.qtwebengine
   ];
 
   doCheck = true;
@@ -63,18 +58,18 @@ mkDerivation rec {
         (lib.optionalString (pkg ? qtQmlPrefix) ''
           export QML2_IMPORT_PATH="${pkg}/${pkg.qtQmlPrefix}"''${QML2_IMPORT_PATH:+':'}$QML2_IMPORT_PATH
         '')
-      ]) buildInputs
+      ]) finalAttrs.buildInputs
     )
   ));
 
-  meta = with lib; {
-    inherit (qtbase.meta) platforms;
+  meta = {
+    inherit (libsForQt5.qtbase.meta) platforms;
     broken = stdenv.hostPlatform.isDarwin; # test build fails, but the project is not maintained anymore
 
     description = "Cloud music integration for your desktop";
     mainProgram = "MellowPlayer";
     homepage = "https://gitlab.com/ColinDuquesnoy/MellowPlayer";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ kalbasit ];
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ kalbasit ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 818bebe35901..523e9b6e1320 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2383,8 +2383,6 @@ with pkgs;
     protobuf = protobuf_21;
   };
 
-  mellowplayer = libsForQt5.callPackage ../applications/audio/mellowplayer { };
-
   circus = with python310Packages; toPythonApplication circus;
 
   inherit (callPackage ../applications/networking/remote/citrix-workspace { })

From a62102d5d241004d71e7ba4a4b682745c75d6186 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 16:12:59 -0700
Subject: [PATCH 24/32] greg: move to by-name/

---
 .../gr/greg/package.nix}                      | 19 +++++++++----------
 pkgs/top-level/all-packages.nix               |  4 ----
 2 files changed, 9 insertions(+), 14 deletions(-)
 rename pkgs/{applications/audio/greg/default.nix => by-name/gr/greg/package.nix} (53%)

diff --git a/pkgs/applications/audio/greg/default.nix b/pkgs/by-name/gr/greg/package.nix
similarity index 53%
rename from pkgs/applications/audio/greg/default.nix
rename to pkgs/by-name/gr/greg/package.nix
index 44bd16adf092..da9eca5d24ff 100644
--- a/pkgs/applications/audio/greg/default.nix
+++ b/pkgs/by-name/gr/greg/package.nix
@@ -1,34 +1,33 @@
 {
   lib,
   fetchFromGitHub,
-  pythonPackages,
+  python3Packages,
 }:
 
-with pythonPackages;
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "greg";
   version = "0.4.8";
   format = "setuptools";
 
-  disabled = !isPy3k;
+  disabled = !python3Packages.isPy3k;
 
   src = fetchFromGitHub {
     owner = "manolomartinez";
     repo = "greg";
     tag = "v${version}";
-    sha256 = "sha256-o4+tXVJTgT52JyJOC+Glr2cvZjbTaZL8TIsmz+A4vE4=";
+    hash = "sha256-o4+tXVJTgT52JyJOC+Glr2cvZjbTaZL8TIsmz+A4vE4=";
   };
 
   propagatedBuildInputs = [
-    setuptools
-    feedparser
+    python3Packages.setuptools
+    python3Packages.feedparser
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/manolomartinez/greg";
     description = "Command-line podcast aggregator";
     mainProgram = "greg";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ edwtjo ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ edwtjo ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 523e9b6e1320..4fe3da820ac4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2032,10 +2032,6 @@ with pkgs;
     inherit (darwin) libresolv;
   };
 
-  greg = callPackage ../applications/audio/greg {
-    pythonPackages = python3Packages;
-  };
-
   hocr-tools = with python3Packages; toPythonApplication hocr-tools;
 
   hopper = qt5.callPackage ../development/tools/analysis/hopper { };

From c159537648488d972f6acfed73c107f5d0fa0dec Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 16:19:27 -0700
Subject: [PATCH 25/32] deadbeef: modernize, move to by-name/

---
 .../de/deadbeef/package.nix}                       | 14 ++++++--------
 pkgs/top-level/all-packages.nix                    |  2 --
 2 files changed, 6 insertions(+), 10 deletions(-)
 rename pkgs/{applications/audio/deadbeef/default.nix => by-name/de/deadbeef/package.nix} (95%)

diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/by-name/de/deadbeef/package.nix
similarity index 95%
rename from pkgs/applications/audio/deadbeef/default.nix
rename to pkgs/by-name/de/deadbeef/package.nix
index afcd574395f4..6179b42afcad 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/by-name/de/deadbeef/package.nix
@@ -62,18 +62,16 @@
 
 let
   inherit (lib) optionals;
-
-  version = "1.10.0";
 in
-clangStdenv.mkDerivation {
+clangStdenv.mkDerivation (finalAttrs: {
   pname = "deadbeef";
-  inherit version;
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "DeaDBeeF-Player";
     repo = "deadbeef";
     fetchSubmodules = true;
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-qa0ULmE15lV2vkyXPNW9kSISQZEANrjwJwykTiifk5Q=";
   };
 
@@ -155,16 +153,16 @@ clangStdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     description = "Ultimate Music Player for GNU/Linux";
     mainProgram = "deadbeef";
     homepage = "http://deadbeef.sourceforge.net/";
     downloadPage = "https://github.com/DeaDBeeF-Player/deadbeef";
-    license = licenses.gpl2;
+    license = lib.licenses.gpl2;
     platforms = [
       "x86_64-linux"
       "i686-linux"
     ];
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4fe3da820ac4..68af85ebbdb7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10900,8 +10900,6 @@ with pkgs;
     inherit (darwin) autoSignDarwinBinariesHook;
   };
 
-  deadbeef = callPackage ../applications/audio/deadbeef { };
-
   deadbeefPlugins = {
     headerbar-gtk3 = callPackage ../applications/audio/deadbeef/plugins/headerbar-gtk3.nix { };
     lyricbar = callPackage ../applications/audio/deadbeef/plugins/lyricbar.nix { };

From 36967779e93f9c657dc288aabedf7f78f2764c68 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 16:38:09 -0700
Subject: [PATCH 26/32] petrifoo: modernize, move to by-name/

---
 .../pe/petrifoo/package.nix}                     | 16 ++++++++--------
 pkgs/top-level/all-packages.nix                  |  4 ----
 2 files changed, 8 insertions(+), 12 deletions(-)
 rename pkgs/{applications/audio/petrifoo/default.nix => by-name/pe/petrifoo/package.nix} (84%)

diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/by-name/pe/petrifoo/package.nix
similarity index 84%
rename from pkgs/applications/audio/petrifoo/default.nix
rename to pkgs/by-name/pe/petrifoo/package.nix
index 71eb8a766482..864c1668c47a 100644
--- a/pkgs/applications/audio/petrifoo/default.nix
+++ b/pkgs/by-name/pe/petrifoo/package.nix
@@ -7,7 +7,7 @@
   cmake,
   gtk2,
   libjack2,
-  libgnomecanvas,
+  gnome2,
   libpthreadstubs,
   libsamplerate,
   libsndfile,
@@ -17,12 +17,12 @@
   openssl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "petri-foo";
   version = "0.1.87";
 
   src = fetchurl {
-    url = "mirror://sourceforge/petri-foo/${pname}-${version}.tar.bz2";
+    url = "mirror://sourceforge/petri-foo/petri-foo-${finalAttrs.version}.tar.bz2";
     sha256 = "0b25iicgn8c42487fdw32ycfrll1pm2zjgy5djvgw6mfcaa4gizh";
   };
 
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     alsa-lib
     gtk2
     libjack2
-    libgnomecanvas
+    gnome2.libgnomecanvas
     libpthreadstubs
     libsamplerate
     libsndfile
@@ -61,13 +61,13 @@ stdenv.mkDerivation rec {
     openssl
   ];
 
-  meta = with lib; {
+  meta = {
     description = "MIDI controllable audio sampler";
     longDescription = "a fork of Specimen";
     homepage = "https://petri-foo.sourceforge.net";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
     maintainers = [ ];
     mainProgram = "petri-foo";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68af85ebbdb7..f219668bf496 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12084,10 +12084,6 @@ with pkgs;
     sed = gnused;
   };
 
-  petrifoo = callPackage ../applications/audio/petrifoo {
-    inherit (gnome2) libgnomecanvas;
-  };
-
   pdfpc = callPackage ../applications/misc/pdfpc {
     inherit (gst_all_1)
       gstreamer

From 161046a6d03393f7b00e6b215376cedb8bbf99e4 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 16:55:37 -0700
Subject: [PATCH 27/32] puredata: move to by-name/

---
 .../audio => by-name/pu}/puredata/expose-error.patch           | 0
 .../puredata/default.nix => by-name/pu/puredata/package.nix}   | 0
 pkgs/{applications/audio => by-name/pu}/puredata/wrapper.nix   | 0
 pkgs/top-level/all-packages.nix                                | 3 +--
 4 files changed, 1 insertion(+), 2 deletions(-)
 rename pkgs/{applications/audio => by-name/pu}/puredata/expose-error.patch (100%)
 rename pkgs/{applications/audio/puredata/default.nix => by-name/pu/puredata/package.nix} (100%)
 rename pkgs/{applications/audio => by-name/pu}/puredata/wrapper.nix (100%)

diff --git a/pkgs/applications/audio/puredata/expose-error.patch b/pkgs/by-name/pu/puredata/expose-error.patch
similarity index 100%
rename from pkgs/applications/audio/puredata/expose-error.patch
rename to pkgs/by-name/pu/puredata/expose-error.patch
diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/by-name/pu/puredata/package.nix
similarity index 100%
rename from pkgs/applications/audio/puredata/default.nix
rename to pkgs/by-name/pu/puredata/package.nix
diff --git a/pkgs/applications/audio/puredata/wrapper.nix b/pkgs/by-name/pu/puredata/wrapper.nix
similarity index 100%
rename from pkgs/applications/audio/puredata/wrapper.nix
rename to pkgs/by-name/pu/puredata/wrapper.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f219668bf496..2431e91887a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12138,9 +12138,8 @@ with pkgs;
 
   pulseview = libsForQt5.callPackage ../applications/science/electronics/pulseview { };
 
-  puredata = callPackage ../applications/audio/puredata { };
   puredata-with-plugins =
-    plugins: callPackage ../applications/audio/puredata/wrapper.nix { inherit plugins; };
+    plugins: callPackage ../by-name/pu/puredata/wrapper.nix { inherit plugins; };
 
   pure-maps = libsForQt5.callPackage ../applications/misc/pure-maps { };
 

From 343db01d3188f6e0de3c822033fa25c8e7e34696 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 17:37:56 -0700
Subject: [PATCH 28/32] ladspa{H,-sdk}: modernize, move to by-name/

---
 .../default.nix => by-name/la/ladspa-sdk/package.nix}  | 10 +++++-----
 .../ladspah.nix => by-name/la/ladspaH/package.nix}     |  6 +++---
 pkgs/top-level/all-packages.nix                        |  4 ----
 3 files changed, 8 insertions(+), 12 deletions(-)
 rename pkgs/{applications/audio/ladspa-sdk/default.nix => by-name/la/ladspa-sdk/package.nix} (82%)
 rename pkgs/{applications/audio/ladspa-sdk/ladspah.nix => by-name/la/ladspaH/package.nix} (84%)

diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/by-name/la/ladspa-sdk/package.nix
similarity index 82%
rename from pkgs/applications/audio/ladspa-sdk/default.nix
rename to pkgs/by-name/la/ladspa-sdk/package.nix
index 0103db6a7422..6f154ea224d8 100644
--- a/pkgs/applications/audio/ladspa-sdk/default.nix
+++ b/pkgs/by-name/la/ladspa-sdk/package.nix
@@ -4,22 +4,22 @@
   fetchurl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ladspa-sdk";
   version = "1.15";
   src = fetchurl {
-    url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz";
+    url = "https://www.ladspa.org/download/ladspa_sdk_${finalAttrs.version}.tgz";
     sha256 = "1vgx54cgsnc3ncl9qbgjbmq12c444xjafjkgr348h36j16draaa2";
   };
 
-  sourceRoot = "ladspa_sdk_${version}/src";
+  sourceRoot = "ladspa_sdk_${finalAttrs.version}/src";
 
   strictDeps = true;
 
   patchPhase = ''
     sed -i 's@/usr/@$(out)/@g'  Makefile
     substituteInPlace Makefile \
-      --replace /tmp/test.wav $NIX_BUILD_TOP/${sourceRoot}/test.wav
+      --replace /tmp/test.wav $NIX_BUILD_TOP/${finalAttrs.sourceRoot}/test.wav
   '';
 
   makeFlags = [
@@ -47,4 +47,4 @@ stdenv.mkDerivation rec {
     maintainers = [ lib.maintainers.magnetophon ];
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/applications/audio/ladspa-sdk/ladspah.nix b/pkgs/by-name/la/ladspaH/package.nix
similarity index 84%
rename from pkgs/applications/audio/ladspa-sdk/ladspah.nix
rename to pkgs/by-name/la/ladspaH/package.nix
index fae714eb19ae..7c2515002b1c 100644
--- a/pkgs/applications/audio/ladspa-sdk/ladspah.nix
+++ b/pkgs/by-name/la/ladspaH/package.nix
@@ -3,11 +3,11 @@
   stdenv,
   fetchurl,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ladspa.h";
   version = "1.15";
   src = fetchurl {
-    url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz";
+    url = "https://www.ladspa.org/download/ladspa_sdk_${finalAttrs.version}.tgz";
     sha256 = "1vgx54cgsnc3ncl9qbgjbmq12c444xjafjkgr348h36j16draaa2";
   };
 
@@ -27,4 +27,4 @@ stdenv.mkDerivation rec {
     maintainers = [ lib.maintainers.magnetophon ];
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2431e91887a0..45b2ee319010 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11647,14 +11647,10 @@ with pkgs;
 
   kvirc = libsForQt5.callPackage ../applications/networking/irc/kvirc { };
 
-  ladspaH = callPackage ../applications/audio/ladspa-sdk/ladspah.nix { };
-
   ladspaPlugins = callPackage ../applications/audio/ladspa-plugins {
     fftw = fftwSinglePrec;
   };
 
-  ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { };
-
   lemonbar = callPackage ../applications/window-managers/lemonbar { };
 
   lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { };

From 5376c4415b7bc074deee332dc921160f73b8be72 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 17:57:44 -0700
Subject: [PATCH 29/32] espeak-ng: move to by-name/

---
 pkgs/{applications/audio => by-name/es}/espeak-ng/mbrola.patch | 0
 .../espeak-ng/default.nix => by-name/es/espeak-ng/package.nix} | 0
 pkgs/top-level/all-packages.nix                                | 3 +--
 3 files changed, 1 insertion(+), 2 deletions(-)
 rename pkgs/{applications/audio => by-name/es}/espeak-ng/mbrola.patch (100%)
 rename pkgs/{applications/audio/espeak-ng/default.nix => by-name/es/espeak-ng/package.nix} (100%)

diff --git a/pkgs/applications/audio/espeak-ng/mbrola.patch b/pkgs/by-name/es/espeak-ng/mbrola.patch
similarity index 100%
rename from pkgs/applications/audio/espeak-ng/mbrola.patch
rename to pkgs/by-name/es/espeak-ng/mbrola.patch
diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/by-name/es/espeak-ng/package.nix
similarity index 100%
rename from pkgs/applications/audio/espeak-ng/default.nix
rename to pkgs/by-name/es/espeak-ng/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45b2ee319010..681e5213b1fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10997,8 +10997,7 @@ with pkgs;
 
   espeak-classic = callPackage ../applications/audio/espeak { };
 
-  espeak-ng = callPackage ../applications/audio/espeak-ng { };
-  espeak = res.espeak-ng;
+  espeak = espeak-ng;
 
   espeakedit = callPackage ../applications/audio/espeak/edit.nix { };
 

From f4be23dfcc236585a1ee1b8824a81042c7aa9047 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 18:21:15 -0700
Subject: [PATCH 30/32] pithos: move to by-name/

---
 .../default.nix => by-name/pi/pithos/package.nix}    | 12 ++++++------
 pkgs/top-level/all-packages.nix                      |  4 ----
 2 files changed, 6 insertions(+), 10 deletions(-)
 rename pkgs/{applications/audio/pithos/default.nix => by-name/pi/pithos/package.nix} (85%)

diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/by-name/pi/pithos/package.nix
similarity index 85%
rename from pkgs/applications/audio/pithos/default.nix
rename to pkgs/by-name/pi/pithos/package.nix
index 1cf887ab07cd..e293b5b28ed0 100644
--- a/pkgs/applications/audio/pithos/default.nix
+++ b/pkgs/by-name/pi/pithos/package.nix
@@ -8,7 +8,7 @@
   appstream-glib,
   glib,
   wrapGAppsHook3,
-  pythonPackages,
+  python3Packages,
   gtk3,
   adwaita-icon-theme,
   gobject-introspection,
@@ -17,7 +17,7 @@
   gst_all_1,
 }:
 
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "pithos";
   version = "1.6.2";
 
@@ -61,17 +61,17 @@ pythonPackages.buildPythonApplication rec {
   propagatedBuildInputs = [
     adwaita-icon-theme
   ]
-  ++ (with pythonPackages; [
+  ++ (with python3Packages; [
     pygobject3
     pylast
   ]);
 
-  meta = with lib; {
+  meta = {
     broken = stdenv.hostPlatform.isDarwin;
     description = "Pandora Internet Radio player for GNOME";
     mainProgram = "pithos";
     homepage = "https://pithos.github.io/";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ obadz ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ obadz ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 681e5213b1fc..c253431db594 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12100,10 +12100,6 @@ with pkgs;
 
   inherit (pidginPackages) pidgin;
 
-  pithos = callPackage ../applications/audio/pithos {
-    pythonPackages = python3Packages;
-  };
-
   pineapple-pictures = qt6Packages.callPackage ../applications/graphics/pineapple-pictures { };
 
   plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { };

From 153be6ef09d94cfbea09d3ed3d5a3cb313e6bf24 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 20:15:51 -0700
Subject: [PATCH 31/32] linvstmanager: move to by-name/

---
 .../li/linvstmanager/package.nix}             | 21 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 10 insertions(+), 13 deletions(-)
 rename pkgs/{applications/audio/linvstmanager/default.nix => by-name/li/linvstmanager/package.nix} (71%)

diff --git a/pkgs/applications/audio/linvstmanager/default.nix b/pkgs/by-name/li/linvstmanager/package.nix
similarity index 71%
rename from pkgs/applications/audio/linvstmanager/default.nix
rename to pkgs/by-name/li/linvstmanager/package.nix
index 6da4c7fcc626..5358d1d975d7 100644
--- a/pkgs/applications/audio/linvstmanager/default.nix
+++ b/pkgs/by-name/li/linvstmanager/package.nix
@@ -3,28 +3,27 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  qtbase,
-  wrapQtAppsHook,
+  qt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "linvstmanager";
   version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "Goli4thus";
     repo = "linvstmanager";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-K6eugimMy/MZgHYkg+zfF8DDqUuqqoeymxHtcFGu2Uk=";
   };
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt5.qtbase
   ];
 
   postPatch = ''
@@ -32,12 +31,12 @@ stdenv.mkDerivation rec {
       --replace-fail "cmake_minimum_required(VERSION 3.0.0)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Graphical companion application for various bridges like LinVst, etc";
     mainProgram = "linvstmanager";
     homepage = "https://github.com/Goli4thus/linvstmanager";
-    license = with licenses; [ gpl3 ];
-    platforms = platforms.linux;
-    maintainers = [ maintainers.GabrielDougherty ];
+    license = with lib.licenses; [ gpl3 ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ GabrielDougherty ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c253431db594..38daf75b0be8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11271,8 +11271,6 @@ with pkgs;
 
   linssid = libsForQt5.callPackage ../applications/networking/linssid { };
 
-  linvstmanager = qt5.callPackage ../applications/audio/linvstmanager { };
-
   deadd-notification-center = haskell.lib.compose.justStaticExecutables (
     haskellPackages.callPackage ../applications/misc/deadd-notification-center { }
   );

From b420ad063c7dd7781c1baa593b69160626c20c3a Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 20:16:33 -0700
Subject: [PATCH 32/32] nootka: move to by-name/

---
 .../no/nootka/package.nix}                    | 35 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 15 insertions(+), 22 deletions(-)
 rename pkgs/{applications/audio/nootka/default.nix => by-name/no/nootka/package.nix} (59%)

diff --git a/pkgs/applications/audio/nootka/default.nix b/pkgs/by-name/no/nootka/package.nix
similarity index 59%
rename from pkgs/applications/audio/nootka/default.nix
rename to pkgs/by-name/no/nootka/package.nix
index 88a5ed0c4301..7640384181eb 100644
--- a/pkgs/applications/audio/nootka/default.nix
+++ b/pkgs/by-name/no/nootka/package.nix
@@ -9,26 +9,21 @@
   libpulseaudio,
   libvorbis,
   soundtouch,
-  qtbase,
-  qtdeclarative,
-  qtgraphicaleffects,
-  qtquickcontrols2,
-  qttools,
-  wrapQtAppsHook,
+  qt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "nootka";
   version = "2.0.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/nootka/${pname}-${version}-source.tar.bz2";
-    sha256 = "sha256-ZHdyLZ3+TCpQ77tcNuDlN2124qLDZu9DdH5x7RI1HIs=";
+    url = "mirror://sourceforge/nootka/nootka-${finalAttrs.version}-source.tar.bz2";
+    hash = "sha256-ZHdyLZ3+TCpQ77tcNuDlN2124qLDZu9DdH5x7RI1HIs=";
   };
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
   buildInputs = [
     alsa-lib
@@ -37,11 +32,11 @@ stdenv.mkDerivation rec {
     libpulseaudio
     libvorbis
     soundtouch
-    qtbase
-    qtdeclarative
-    qtgraphicaleffects
-    qtquickcontrols2
-    qttools
+    qt5.qtbase
+    qt5.qtdeclarative
+    qt5.qtgraphicaleffects
+    qt5.qtquickcontrols2
+    qt5.qttools
   ];
 
   cmakeFlags = [
@@ -50,15 +45,15 @@ stdenv.mkDerivation rec {
     "-DENABLE_PULSEAUDIO=ON"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Application for practicing playing musical scores and ear training";
     mainProgram = "nootka";
     homepage = "https://nootka.sourceforge.io/";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       mmlb
       orivej
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38daf75b0be8..845b384b32a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11904,8 +11904,6 @@ with pkgs;
 
   ninja_1_11 = callPackage ../by-name/ni/ninja/package.nix { ninjaRelease = "1.11"; };
 
-  nootka = qt5.callPackage ../applications/audio/nootka { };
-
   opcua-client-gui = libsForQt5.callPackage ../misc/opcua-client-gui { };
 
   ostinato = libsForQt5.callPackage ../applications/networking/ostinato {