diff --git a/pkgs/by-name/po/pothos/cstring.patch b/pkgs/by-name/po/pothos/cstring.patch deleted file mode 100644 index 4e8957c3f122..000000000000 --- a/pkgs/by-name/po/pothos/cstring.patch +++ /dev/null @@ -1,50 +0,0 @@ -Submodule blocks contains modified content -diff --git a/blocks/file/BinaryFileSink.cpp b/blocks/file/BinaryFileSink.cpp -index 31c9a41..0083b0d 100644 ---- a/blocks/file/BinaryFileSink.cpp -+++ b/blocks/file/BinaryFileSink.cpp -@@ -13,6 +13,7 @@ - #endif //_MSC_VER - #include - #include -+#include - - #ifndef O_BINARY - #define O_BINARY 0 -diff --git a/blocks/file/BinaryFileSource.cpp b/blocks/file/BinaryFileSource.cpp -index 0151231..379d383 100644 ---- a/blocks/file/BinaryFileSource.cpp -+++ b/blocks/file/BinaryFileSource.cpp -@@ -13,6 +13,7 @@ - #endif //_MSC_VER - #include - #include -+#include - - #ifndef O_BINARY - #define O_BINARY 0 -diff --git a/blocks/file/TextFileSink.cpp b/blocks/file/TextFileSink.cpp -index b4b2f08..2be66e2 100644 ---- a/blocks/file/TextFileSink.cpp -+++ b/blocks/file/TextFileSink.cpp -@@ -6,6 +6,7 @@ - #include - #include - #include -+#include - - /*********************************************************************** - * |PothosDoc Text File Sink -Submodule soapy contains modified content -diff --git a/soapy/DemoController.cpp b/soapy/DemoController.cpp -index 4ce8ead..9a4e742 100644 ---- a/soapy/DemoController.cpp -+++ b/soapy/DemoController.cpp -@@ -6,6 +6,7 @@ - #include - #include - #include //min/max -+#include - - /*********************************************************************** - * |PothosDoc SDR Demo Controller diff --git a/pkgs/by-name/po/pothos/package.nix b/pkgs/by-name/po/pothos/package.nix deleted file mode 100644 index f4a275e28d32..000000000000 --- a/pkgs/by-name/po/pothos/package.nix +++ /dev/null @@ -1,113 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - cmake, - pkg-config, - doxygen, - pcre, - poco, - libsForQt5, - nlohmann_json, - soapysdr-with-plugins, - portaudio, - alsa-lib, - muparserx, - python3, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "pothos"; - version = "0.7.1"; - - src = fetchFromGitHub { - owner = "pothosware"; - repo = "PothosCore"; - rev = "pothos-${finalAttrs.version}"; - sha256 = "038c3ipvf4sgj0zhm3vcj07ymsva4ds6v89y43f5d3p4n8zc2rsg"; - fetchSubmodules = true; - }; - - patches = [ - # spuce's CMakeLists.txt uses QT5_USE_Modules, which does not seem to work on Nix - ./spuce.patch - # Poco had some breaking API changes in 1.12 - (fetchpatch { - name = "poco-1.12-compat.patch"; - url = "https://github.com/pothosware/PothosCore/commit/092d1209b0fd0aa8a1733706c994fa95e66fd017.patch"; - hash = "sha256-bZXG8kD4+1LgDV8viZrJ/DMjg8UvW7b5keJQDXurfkA="; - }) - # various source files are missing imports of - # https://github.com/pothosware/PothosBlocks/issues/80 - ./cstring.patch - ]; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 2.8.9)" "cmake_minimum_required(VERSION 3.10)" - substituteInPlace spuce/{,spuce}/CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" - - substituteInPlace spuce/qt_{fir,iir,other,window}/CMakeLists.txt \ - --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" - - substituteInPlace {audio,blocks,comms,flow,plotters,python,soapy,widgets}/CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 2.8.9)" "cmake_minimum_required(VERSION 3.10)" - - ''; - - # poco 1.14 requires c++17 - env.NIX_CFLAGS_COMPILE = toString [ "-std=gnu++17" ]; - - nativeBuildInputs = [ - cmake - pkg-config - doxygen - libsForQt5.wrapQtAppsHook - ]; - - buildInputs = [ - pcre - poco - libsForQt5.qtbase - libsForQt5.qtsvg - libsForQt5.qwt6_1 - nlohmann_json - soapysdr-with-plugins - portaudio - alsa-lib - muparserx - python3 - ]; - - postInstall = '' - install -Dm644 $out/share/Pothos/Desktop/pothos-flow.desktop $out/share/applications/pothos-flow.desktop - install -Dm644 $out/share/Pothos/Desktop/pothos-flow-16.png $out/share/icons/hicolor/16x16/apps/pothos-flow.png - install -Dm644 $out/share/Pothos/Desktop/pothos-flow-22.png $out/share/icons/hicolor/22x22/apps/pothos-flow.png - install -Dm644 $out/share/Pothos/Desktop/pothos-flow-32.png $out/share/icons/hicolor/32x32/apps/pothos-flow.png - install -Dm644 $out/share/Pothos/Desktop/pothos-flow-48.png $out/share/icons/hicolor/48x48/apps/pothos-flow.png - install -Dm644 $out/share/Pothos/Desktop/pothos-flow-64.png $out/share/icons/hicolor/64x64/apps/pothos-flow.png - install -Dm644 $out/share/Pothos/Desktop/pothos-flow-128.png $out/share/icons/hicolor/128x128/apps/pothos-flow.png - install -Dm644 $out/share/Pothos/Desktop/pothos-flow.xml $out/share/mime/application/pothos-flow.xml - rm -r $out/share/Pothos/Desktop - ''; - - dontWrapQtApps = true; - preFixup = '' - # PothosUtil does not need to be wrapped - wrapQtApp $out/bin/PothosFlow - wrapQtApp $out/bin/spuce_fir_plot - wrapQtApp $out/bin/spuce_iir_plot - wrapQtApp $out/bin/spuce_other_plot - wrapQtApp $out/bin/spuce_window_plot - ''; - - meta = { - description = "Pothos data-flow framework"; - homepage = "https://github.com/pothosware/PothosCore/wiki"; - license = lib.licenses.boost; - platforms = lib.platforms.linux; - maintainers = [ ]; - }; -}) diff --git a/pkgs/by-name/po/pothos/spuce.patch b/pkgs/by-name/po/pothos/spuce.patch deleted file mode 100644 index ed0377540a8a..000000000000 --- a/pkgs/by-name/po/pothos/spuce.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff --git a/spuce/qt_fir/CMakeLists.txt b/spuce/qt_fir/CMakeLists.txt -index fa2e580..e32113c 100644 ---- a/spuce/qt_fir/CMakeLists.txt -+++ b/spuce/qt_fir/CMakeLists.txt -@@ -6,7 +6,7 @@ Message("Project spuce fir_plot") - set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) - --FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets) -+FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets PrintSupport) - - set(SOURCES - make_filter.cpp -@@ -27,11 +27,7 @@ set_property(TARGET spuce_fir PROPERTY POSITION_INDEPENDENT_CODE TRUE) - set_property(TARGET spuce_fir_plot PROPERTY POSITION_INDEPENDENT_CODE TRUE) - set_property(TARGET spuce_fir_plot PROPERTY CXX_STANDARD 11) - --TARGET_LINK_LIBRARIES(spuce_fir_plot spuce_fir ${QT_LIBRARIES} spuce) --QT5_USE_Modules(spuce_fir_plot Gui) --QT5_USE_Modules(spuce_fir_plot Core) --QT5_USE_Modules(spuce_fir_plot Widgets) --QT5_USE_Modules(spuce_fir_plot PrintSupport) -+TARGET_LINK_LIBRARIES(spuce_fir_plot spuce_fir ${QT_LIBRARIES} spuce Qt::Gui Qt::Core Qt::Widgets Qt::PrintSupport) - - INSTALL(TARGETS spuce_fir_plot DESTINATION bin) - -diff --git a/spuce/qt_iir/CMakeLists.txt b/spuce/qt_iir/CMakeLists.txt -index 4717226..debb5f9 100644 ---- a/spuce/qt_iir/CMakeLists.txt -+++ b/spuce/qt_iir/CMakeLists.txt -@@ -6,7 +6,7 @@ Message("Project spuce iir_plot") - set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) - --FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets) -+FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets PrintSupport) - - set(SOURCES - make_filter.cpp -@@ -27,10 +27,6 @@ set_property(TARGET spuce_iir PROPERTY POSITION_INDEPENDENT_CODE TRUE) - set_property(TARGET spuce_iir_plot PROPERTY CXX_STANDARD 11) - set_property(TARGET spuce_iir_plot PROPERTY POSITION_INDEPENDENT_CODE TRUE) - --TARGET_LINK_LIBRARIES(spuce_iir_plot spuce_iir ${QT_LIBRARIES} spuce) --QT5_USE_Modules(spuce_iir_plot Gui) --QT5_USE_Modules(spuce_iir_plot Core) --QT5_USE_Modules(spuce_iir_plot Widgets) --QT5_USE_Modules(spuce_iir_plot PrintSupport) -+TARGET_LINK_LIBRARIES(spuce_iir_plot spuce_iir ${QT_LIBRARIES} spuce Qt::Gui Qt::Core Qt::Widgets Qt::PrintSupport) - - INSTALL(TARGETS spuce_iir_plot DESTINATION bin) -diff --git a/spuce/qt_other/CMakeLists.txt b/spuce/qt_other/CMakeLists.txt -index 29c270d..e1ed778 100644 ---- a/spuce/qt_other/CMakeLists.txt -+++ b/spuce/qt_other/CMakeLists.txt -@@ -6,7 +6,7 @@ Message("Project spuce window_plot") - set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) - --FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets) -+FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets PrintSupport) - - set(SOURCES make_filter.cpp) - ADD_LIBRARY(spuce_other STATIC ${SOURCES}) -@@ -23,10 +23,6 @@ ADD_EXECUTABLE(spuce_other_plot ${other_plot_SOURCES} ${other_plot_HEADERS_MOC}) - set_property(TARGET spuce_other_plot PROPERTY CXX_STANDARD 11) - set_property(TARGET spuce_other_plot PROPERTY POSITION_INDEPENDENT_CODE TRUE) - --TARGET_LINK_LIBRARIES(spuce_other_plot spuce_other ${QT_LIBRARIES} spuce) --QT5_USE_Modules(spuce_other_plot Gui) --QT5_USE_Modules(spuce_other_plot Core) --QT5_USE_Modules(spuce_other_plot Widgets) --QT5_USE_Modules(spuce_other_plot PrintSupport) -+TARGET_LINK_LIBRARIES(spuce_other_plot spuce_other ${QT_LIBRARIES} spuce Qt::Gui Qt::Core Qt::Widgets Qt::PrintSupport) - - INSTALL(TARGETS spuce_other_plot DESTINATION bin) -diff --git a/spuce/qt_window/CMakeLists.txt b/spuce/qt_window/CMakeLists.txt -index e95c85b..4a77ab8 100644 ---- a/spuce/qt_window/CMakeLists.txt -+++ b/spuce/qt_window/CMakeLists.txt -@@ -6,7 +6,7 @@ Message("Project spuce window_plot") - set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) - --FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets) -+FIND_PACKAGE(Qt5 REQUIRED Gui Core Widgets PrintSupport) - - set(SOURCES make_filter.cpp) - -@@ -25,10 +25,6 @@ set_property(TARGET spuce_window_plot PROPERTY CXX_STANDARD 11) - set_property(TARGET spuce_win PROPERTY POSITION_INDEPENDENT_CODE TRUE) - set_property(TARGET spuce_window_plot PROPERTY POSITION_INDEPENDENT_CODE TRUE) - --TARGET_LINK_LIBRARIES(spuce_window_plot spuce_win ${QT_LIBRARIES} spuce) --QT5_USE_Modules(spuce_window_plot Gui) --QT5_USE_Modules(spuce_window_plot Core) --QT5_USE_Modules(spuce_window_plot Widgets) --QT5_USE_Modules(spuce_window_plot PrintSupport) -+TARGET_LINK_LIBRARIES(spuce_window_plot spuce_win ${QT_LIBRARIES} spuce Qt::Gui Qt::Core Qt::Widgets Qt::PrintSupport) - - INSTALL(TARGETS spuce_window_plot DESTINATION bin) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fdcfe380b116..210854dc921c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1794,6 +1794,7 @@ mapAliases { postgresql_13_jit = throw "postgresql_13_jit has been removed since it reached its EOL upstream"; # Added 2025-11-17 postgresqlJitPackages = throw "'postgresqlJitPackages' has been renamed to/replaced by 'postgresqlPackages'"; # Converted to throw 2025-10-27 pot = throw "'pot' has been removed as it requires libsoup 2.4 which is EOL"; # Added 2025-10-09 + pothos = throw "'pothos' has been removed as it relies on pcre, and is unmaintained upstream"; # Added 2026-06-17 powerdns = throw "'powerdns' has been renamed to/replaced by 'pdns'"; # Converted to throw 2025-10-27 powwow = throw "'powwow' has been removed, since it's unmaintained since 2021 and doesn't build with glibc 2.42"; # Added 2025-09-28 pqos-wrapper = throw "'pqos-wrapper' has been removed, since it's unmaintained since 2022 and archived upstream"; # Added 2026-05-13