diff --git a/pkgs/applications/audio/radiotray-ng/tests-c++17.patch b/pkgs/applications/audio/radiotray-ng/tests-c++17.patch deleted file mode 100644 index 750c12f6d211..000000000000 --- a/pkgs/applications/audio/radiotray-ng/tests-c++17.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 58ab5c2..4f56a25 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -1,5 +1,7 @@ - include(GoogleTest) - -+set(CMAKE_CXX_STANDARD 17) -+ - 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); - } - 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 89% rename from pkgs/applications/audio/radiotray-ng/default.nix rename to pkgs/by-name/ra/radiotray-ng/package.nix index 001a1024933b..f844a04d46c3 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, @@ -48,15 +48,15 @@ let lxml ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "radiotray-ng"; - version = "0.2.9"; + version = "0.2.10.1"; src = fetchFromGitHub { owner = "ebruck"; repo = "radiotray-ng"; - tag = "v${version}"; - hash = "sha256-rRD/IfVnOxowr2mO2BB2hcHK5ByZSmTbcgYdULogYUs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-GYSacYKS0az5sqPqZhnuTZOT9NSzW+P9o5r5p0RhTtI="; }; nativeBuildInputs = [ @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { libnotify libxdg_basedir lsb-release - wxGTK + wxGTK32 # for https gstreamer / libsoup glib-networking ] @@ -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 @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { 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; }; -} +}) diff --git a/pkgs/by-name/ra/radiotray-ng/tests-c++17.patch b/pkgs/by-name/ra/radiotray-ng/tests-c++17.patch new file mode 100644 index 000000000000..234de3ff40f7 --- /dev/null +++ b/pkgs/by-name/ra/radiotray-ng/tests-c++17.patch @@ -0,0 +1,12 @@ +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 58ab5c2..4f56a25 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -1,5 +1,7 @@ + include(GoogleTest) + ++set(CMAKE_CXX_STANDARD 17) ++ + 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/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; };