From 279844bb6eda14e1a295b329b1e53ba295f861ce Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 18 Oct 2025 20:50:11 -0700
Subject: [PATCH] noson: modernize, move to by-name/

---
 .../no/noson/package.nix}                     | 26 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 11 insertions(+), 17 deletions(-)
 rename pkgs/{applications/audio/noson/default.nix => by-name/no/noson/package.nix} (70%)

diff --git a/pkgs/applications/audio/noson/default.nix b/pkgs/by-name/no/noson/package.nix
similarity index 70%
rename from pkgs/applications/audio/noson/default.nix
rename to pkgs/by-name/no/noson/package.nix
index 5524638023c3..40f0228dfd96 100644
--- a/pkgs/applications/audio/noson/default.nix
+++ b/pkgs/by-name/no/noson/package.nix
@@ -5,11 +5,7 @@
   cmake,
   flac,
   libpulseaudio,
-  qtbase,
-  qtgraphicaleffects,
-  qtquickcontrols2,
-  qtwayland,
-  wrapQtAppsHook,
+  libsForQt5,
   makeWrapper,
 }:
 
@@ -20,25 +16,25 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "janbar";
     repo = "noson-app";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-XJBkPhyDPeyVrcY5Q5W9LtESuVxcbcQ8JoyOzKg+0NU=";
   };
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
     makeWrapper
   ];
 
   buildInputs = [
     flac
     libpulseaudio
-    qtbase
-    qtgraphicaleffects
-    qtquickcontrols2
+    libsForQt5.qtbase
+    libsForQt5.qtgraphicaleffects
+    libsForQt5.qtquickcontrols2
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    qtwayland
+    libsForQt5.qtwayland
   ];
 
   # wrapQtAppsHook doesn't automatically find noson-gui
@@ -49,12 +45,12 @@ stdenv.mkDerivation (finalAttrs: {
     wrapQtApp "$out/lib/noson/noson-gui"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "SONOS controller for Linux (and macOS)";
     homepage = "https://janbar.github.io/noson-app/";
     mainProgram = "noson-app";
-    platforms = platforms.linux ++ platforms.darwin;
-    license = [ licenses.gpl3Only ];
-    maintainers = with maintainers; [ callahad ];
+    platforms = with lib.platforms; linux ++ darwin;
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ callahad ];
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b1789e640bd5..c5e06085ea7e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11403,8 +11403,6 @@ with pkgs;
 
   mt32emu-qt = libsForQt5.callPackage ../applications/audio/munt/mt32emu-qt.nix { };
 
-  noson = libsForQt5.callPackage ../applications/audio/noson { };
-
   pass2csv = python3Packages.callPackage ../tools/security/pass2csv { };
 
   pinboard = with python3Packages; toPythonApplication pinboard;