From 7ce3d1a625b04733b4b7be24ee93af83887bdb3b Mon Sep 17 00:00:00 2001 From: Kylie McClain Date: Fri, 2 Jan 2026 23:38:15 -0500 Subject: [PATCH 1/4] radiotray-ng: move to by-name --- .../audio => by-name/ra}/radiotray-ng/no-dl-googletest.patch | 0 .../default.nix => by-name/ra/radiotray-ng/package.nix} | 4 ++-- .../audio => by-name/ra}/radiotray-ng/tests-c++17.patch | 0 pkgs/top-level/all-packages.nix | 4 ---- 4 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{applications/audio => by-name/ra}/radiotray-ng/no-dl-googletest.patch (100%) rename pkgs/{applications/audio/radiotray-ng/default.nix => by-name/ra/radiotray-ng/package.nix} (99%) rename pkgs/{applications/audio => by-name/ra}/radiotray-ng/tests-c++17.patch (100%) diff --git a/pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch b/pkgs/by-name/ra/radiotray-ng/no-dl-googletest.patch similarity index 100% rename from pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch rename to pkgs/by-name/ra/radiotray-ng/no-dl-googletest.patch diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/by-name/ra/radiotray-ng/package.nix similarity index 99% rename from pkgs/applications/audio/radiotray-ng/default.nix rename to pkgs/by-name/ra/radiotray-ng/package.nix index 001a1024933b..75eed14164ff 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/by-name/ra/radiotray-ng/package.nix @@ -18,7 +18,7 @@ libappindicator-gtk3, libnotify, libxdg_basedir, - wxGTK, + wxGTK32, # GStreamer glib-networking, gst_all_1, @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { libnotify libxdg_basedir lsb-release - wxGTK + wxGTK32 # for https gstreamer / libsoup glib-networking ] diff --git a/pkgs/applications/audio/radiotray-ng/tests-c++17.patch b/pkgs/by-name/ra/radiotray-ng/tests-c++17.patch similarity index 100% rename from pkgs/applications/audio/radiotray-ng/tests-c++17.patch rename to pkgs/by-name/ra/radiotray-ng/tests-c++17.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19b97af60743..8872d07eed22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11683,10 +11683,6 @@ with pkgs; fltk = fltk13; }; - radiotray-ng = callPackage ../applications/audio/radiotray-ng { - wxGTK = wxGTK32; - }; - rawtherapee = callPackage ../applications/graphics/rawtherapee { fftw = fftwSinglePrec; }; From 7da9c8987d342bb67a512c556ec2b048772c532e Mon Sep 17 00:00:00 2001 From: Kylie McClain Date: Fri, 2 Jan 2026 23:41:05 -0500 Subject: [PATCH 2/4] radiotray-ng: use finalAttrs style --- pkgs/by-name/ra/radiotray-ng/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ra/radiotray-ng/package.nix b/pkgs/by-name/ra/radiotray-ng/package.nix index 75eed14164ff..502dc55b0c2e 100644 --- a/pkgs/by-name/ra/radiotray-ng/package.nix +++ b/pkgs/by-name/ra/radiotray-ng/package.nix @@ -48,14 +48,14 @@ let lxml ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "radiotray-ng"; version = "0.2.9"; src = fetchFromGitHub { owner = "ebruck"; repo = "radiotray-ng"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-rRD/IfVnOxowr2mO2BB2hcHK5ByZSmTbcgYdULogYUs="; }; @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DBUILD_TESTS=${if doCheck then "ON" else "OFF"}" + (lib.cmakeBool "BUILD_TESTS" finalAttrs.doCheck) ]; # 'wxFont::wxFont(int, int, int, int, bool, const wxString&, wxFontEncoding)' is deprecated @@ -125,4 +125,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) From 92c4ae0761c955ea401fbb54c7b8f214ac4bac1d Mon Sep 17 00:00:00 2001 From: Kylie McClain Date: Fri, 2 Jan 2026 23:41:50 -0500 Subject: [PATCH 3/4] radiotray-ng: 0.2.9 -> 0.2.10.1 --- pkgs/by-name/ra/radiotray-ng/package.nix | 4 ++-- pkgs/by-name/ra/radiotray-ng/tests-c++17.patch | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/ra/radiotray-ng/package.nix b/pkgs/by-name/ra/radiotray-ng/package.nix index 502dc55b0c2e..a41aa5ef4906 100644 --- a/pkgs/by-name/ra/radiotray-ng/package.nix +++ b/pkgs/by-name/ra/radiotray-ng/package.nix @@ -50,13 +50,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "radiotray-ng"; - version = "0.2.9"; + version = "0.2.10.1"; src = fetchFromGitHub { owner = "ebruck"; repo = "radiotray-ng"; tag = "v${finalAttrs.version}"; - hash = "sha256-rRD/IfVnOxowr2mO2BB2hcHK5ByZSmTbcgYdULogYUs="; + hash = "sha256-GYSacYKS0az5sqPqZhnuTZOT9NSzW+P9o5r5p0RhTtI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ra/radiotray-ng/tests-c++17.patch b/pkgs/by-name/ra/radiotray-ng/tests-c++17.patch index 750c12f6d211..234de3ff40f7 100644 --- a/pkgs/by-name/ra/radiotray-ng/tests-c++17.patch +++ b/pkgs/by-name/ra/radiotray-ng/tests-c++17.patch @@ -10,16 +10,3 @@ index 58ab5c2..4f56a25 100644 function(add_gmock_test target) add_executable(${target} ${ARGN}) target_link_libraries(${target} config playlist bookmarks event_bus ${GMOCK_BOTH_LIBRARIES} ${XDG_BASEDIR_LIBRARIES} ${Boost_LIBRARIES} ${CURL_LIBRARIES} ${JSONCPP_LIBRARIES} pthread) -diff --git a/tests/bookmarks_test.cpp b/tests/bookmarks_test.cpp -index 2d72356..97f898a 100644 ---- a/tests/bookmarks_test.cpp -+++ b/tests/bookmarks_test.cpp -@@ -215,7 +215,7 @@ TEST(Bookmarks, test_that_stations_are_added_and_removed_from_a_group_and_moved) - ASSERT_FALSE(bm[0].stations[0].notifications); - - // vector only throws when using at() -- EXPECT_THROW(bm[0].stations.at(100), std::out_of_range); -+ EXPECT_THROW(static_cast(bm[0].stations.at(100)), std::out_of_range); - EXPECT_THROW(bm[1], std::out_of_range); - } - From 957dad692a9a88fa83ccbe941fafbd68e8af50e7 Mon Sep 17 00:00:00 2001 From: Kylie McClain Date: Fri, 2 Jan 2026 23:41:56 -0500 Subject: [PATCH 4/4] radiotray-ng: adopt as maintainer --- pkgs/by-name/ra/radiotray-ng/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ra/radiotray-ng/package.nix b/pkgs/by-name/ra/radiotray-ng/package.nix index a41aa5ef4906..f844a04d46c3 100644 --- a/pkgs/by-name/ra/radiotray-ng/package.nix +++ b/pkgs/by-name/ra/radiotray-ng/package.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Internet radio player for linux"; homepage = "https://github.com/ebruck/radiotray-ng"; license = lib.licenses.gpl3; - maintainers = [ ]; + maintainers = [ lib.maintainers.somasis ]; platforms = lib.platforms.linux; }; })