From df6943d363b3306bec609a2116ddca0576769707 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 18 Oct 2025 19:00:38 -0700
Subject: [PATCH] sonic-lineup: modernize, move to by-name/

---
 .../so}/sonic-lineup/match-vamp.patch          |  0
 .../so/sonic-lineup/package.nix}               | 18 +++++++++---------
 pkgs/top-level/all-packages.nix                |  2 --
 3 files changed, 9 insertions(+), 11 deletions(-)
 rename pkgs/{applications/audio => by-name/so}/sonic-lineup/match-vamp.patch (100%)
 rename pkgs/{applications/audio/sonic-lineup/default.nix => by-name/so/sonic-lineup/package.nix} (84%)

diff --git a/pkgs/applications/audio/sonic-lineup/match-vamp.patch b/pkgs/by-name/so/sonic-lineup/match-vamp.patch
similarity index 100%
rename from pkgs/applications/audio/sonic-lineup/match-vamp.patch
rename to pkgs/by-name/so/sonic-lineup/match-vamp.patch
diff --git a/pkgs/applications/audio/sonic-lineup/default.nix b/pkgs/by-name/so/sonic-lineup/package.nix
similarity index 84%
rename from pkgs/applications/audio/sonic-lineup/default.nix
rename to pkgs/by-name/so/sonic-lineup/package.nix
index 6d41c1cb7abb..4a95a4a89b96 100644
--- a/pkgs/applications/audio/sonic-lineup/default.nix
+++ b/pkgs/by-name/so/sonic-lineup/package.nix
@@ -23,17 +23,17 @@
   serd,
   sord,
   capnproto,
-  wrapQtAppsHook,
   pkg-config,
   libjack2,
+  libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sonic-lineup";
   version = "1.1";
 
   src = fetchurl {
-    url = "https://code.soundsoftware.ac.uk/attachments/download/2765/${pname}-${version}.tar.gz";
+    url = "https://code.soundsoftware.ac.uk/attachments/download/2765/sonic-lineup-${finalAttrs.version}.tar.gz";
     sha256 = "0k45k9fawcm4s5yy05x00pgww7j8m7k2cxcc7g0fn9vqy7vcbq9h";
   };
 
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     capnproto # capnp
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   strictDeps = true;
@@ -86,12 +86,12 @@ stdenv.mkDerivation rec {
     sed -i 's/sub_test_svcore_/#sub_test_svcore_/' sonic-lineup.pro
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Comparative visualisation of related audio recordings";
     mainProgram = "sonic-lineup";
     homepage = "https://www.sonicvisualiser.org/sonic-lineup/";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.vandenoever ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ vandenoever ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7ede4d86314a..b1789e640bd5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12467,8 +12467,6 @@ with pkgs;
 
   socialscan = with python3.pkgs; toPythonApplication socialscan;
 
-  sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { };
-
   sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { };
 
   squeezelite-pulse = callPackage ../by-name/sq/squeezelite/package.nix {