diff --git a/pkgs/by-name/cs/csound-qt/package.nix b/pkgs/by-name/cs/csound-qt/package.nix index 1ef8907eaf19..e3fbdb5f0492 100644 --- a/pkgs/by-name/cs/csound-qt/package.nix +++ b/pkgs/by-name/cs/csound-qt/package.nix @@ -5,34 +5,35 @@ desktop-file-utils, fetchFromGitHub, python3, - python-qt, rtmidi, - libsForQt5, + qt6, + alsa-lib, }: stdenv.mkDerivation (finalAttrs: { pname = "csound-qt"; - version = "1.1.3"; + version = "7.0.0-beta1"; src = fetchFromGitHub { owner = "CsoundQt"; repo = "CsoundQt"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZdQwWRAr6AKLmZ/L0lSxIlvWRLoZIKinn7BAQiR+luk="; + hash = "sha256-R/rGbLVJBjMimne3yDoPJKwrXyRqhfepV3g0Uaj/dbY="; }; patches = [ ./rtmidipath.patch ]; - nativeBuildInputs = with libsForQt5; [ + nativeBuildInputs = with qt6; [ qmake qtwebengine - qtxmlpatterns + qtdeclarative wrapQtAppsHook ]; buildInputs = [ + alsa-lib csound desktop-file-utils rtmidi @@ -41,15 +42,11 @@ stdenv.mkDerivation (finalAttrs: { qmakeFlags = [ "qcs.pro" "CONFIG+=rtmidi" - "CONFIG+=pythonqt" "CONFIG+=record_support" "CONFIG+=html_webengine" "CSOUND_INCLUDE_DIR=${csound}/include/csound" "CSOUND_LIBRARY_DIR=${csound}/lib" "RTMIDI_DIR=${rtmidi.src}" - "PYTHONQT_SRC_DIR=${python-qt.src}" - "PYTHONQT_LIB_DIR=${python-qt}/lib" - "LIBS+=-L${python-qt}/lib" "INSTALL_DIR=${placeholder "out"}" "SHARE_DIR=${placeholder "out"}/share" "PYTHON_DIR=${python3}" diff --git a/pkgs/by-name/cs/csound/package.nix b/pkgs/by-name/cs/csound/package.nix index 95d836daba40..a129fdcdcb1b 100644 --- a/pkgs/by-name/cs/csound/package.nix +++ b/pkgs/by-name/cs/csound/package.nix @@ -24,27 +24,19 @@ fltk ? null, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "csound"; - version = "6.18.1-unstable-2024-07-02"; + version = "7.0.0-beta.10"; hardeningDisable = [ "format" ]; src = fetchFromGitHub { owner = "csound"; repo = "csound"; - rev = "2536da284dd70ec7272040cb0763f70ae57123c4"; - sha256 = "sha256-NDYltwmjBsX1DWCjy8/4cXMSl3/mK+HaQHSKUmRR9TI="; + tag = finalAttrs.version; + hash = "sha256-l3dSVt5rgyj98ZCZltqKAJx/0Afl4R03flLXBcivtwg="; }; - patches = [ - # Fix typo that breaks build - (fetchpatch { - url = "https://github.com/csound/csound/commit/bb9bafcfa17a87d3733eda1e25a812fd0be08ac6.diff"; - hash = "sha256-0M047uALPAoyQP0LbfBAybb2DWQ2/6QwZXxUjs1O1fE="; - }) - ]; - cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp @@ -96,4 +88,4 @@ stdenv.mkDerivation { platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/by-name/ge/gepetto-viewer/package.nix b/pkgs/by-name/ge/gepetto-viewer/package.nix index ed7eb146f06f..b664c78c236c 100644 --- a/pkgs/by-name/ge/gepetto-viewer/package.nix +++ b/pkgs/by-name/ge/gepetto-viewer/package.nix @@ -43,7 +43,6 @@ let buildInputs = [ python3Packages.boost - python3Packages.python-qt libsForQt5.qtbase ]; @@ -121,6 +120,7 @@ let maintainers = [ lib.maintainers.nim65s ]; mainProgram = "gepetto-gui"; platforms = lib.platforms.unix; + broken = true; # TODO @nim65s }; }); in diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix deleted file mode 100644 index 7b70c94c1872..000000000000 --- a/pkgs/development/libraries/python-qt/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - python3, - qmake, - qtwebengine, - qtxmlpatterns, - qttools, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "python-qt"; - version = "3.6.1"; - - src = fetchFromGitHub { - owner = "MeVisLab"; - repo = "pythonqt"; - rev = "v${finalAttrs.version}"; - hash = "sha256-OYFQtDGq+d32RQ0vChRKH//O9QgQPLMd1he8X3zCi+U="; - }; - - nativeBuildInputs = [ - qmake - qttools - qtxmlpatterns - qtwebengine - ]; - - buildInputs = [ python3 ]; - - qmakeFlags = [ - "PYTHON_DIR=${python3}" - "PYTHON_VERSION=3.${python3.sourceVersion.minor}" - ]; - - dontWrapQtApps = true; - - installPhase = '' - mkdir -p $out/include/PythonQt - cp -r ./lib $out - cp -r ./src/* $out/include/PythonQt - cp -r ./build $out/include/PythonQt - cp -r ./extensions $out/include/PythonQt - ''; - - preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' - install_name_tool -id \ - $out/lib/libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.dylib \ - $out/lib/libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.dylib - install_name_tool -change \ - libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.3.dylib \ - $out/lib/libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.3.dylib \ - -id \ - $out/lib/libPythonQt_QtAll-Qt5-Python3.${python3.sourceVersion.minor}.dylib \ - $out/lib/libPythonQt_QtAll-Qt5-Python3.${python3.sourceVersion.minor}.dylib - ''; - - meta = { - description = "PythonQt is a dynamic Python binding for the Qt framework. It offers an easy way to embed the Python scripting language into your C++ Qt applications"; - homepage = "https://pythonqt.sourceforge.net/"; - license = lib.licenses.lgpl21; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ hlolli ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e2e2d54edcce..4d2f6702247c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1419,6 +1419,7 @@ mapAliases { python313Full = throw "python313Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30 python314Full = throw "python314Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30 python = throw "`python` previously pointed to Python 2; use `python3` or `python2` if necessary"; # Converted to throw 2025-10-27 + python-qt = throw "python-qt has been removed, because hard to maintain and not required by anything"; # Added 2025-01-14 pythonFull = throw "'pythonFull' previously pointed to Python 2; use `python3` or `python2Full` if necessary"; # Converted to throw 2025-10-27 pythonPackages = throw "`pythonPackages` previously pointed to Python 2; use `python3Packages` or `python2.pkgs` if necessary"; # Converted to throw 2025-10-27 q2pro = throw "'q2pro' has been removed as upstream repository was deleted and no direct active forks were available."; # Added 2025-12-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76944f251567..09ffb58d50f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8005,8 +8005,6 @@ with pkgs; pth = if stdenv.hostPlatform.isMusl then npth else gnupth; - python-qt = libsForQt5.callPackage ../development/libraries/python-qt { }; - pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside { }; qbs = libsForQt5.callPackage ../development/tools/build-managers/qbs { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 55eb3d572c60..f633a7ecc96b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -392,6 +392,7 @@ mapAliases { python-jsonrpc-server = throw "python-jsonrpc-server has been removed because it was no longer used by anything"; # added 2025-11-11 python-Levenshtein = throw "'python-Levenshtein' has been renamed to/replaced by 'levenshtein'"; # Converted to throw 2025-10-29 python-lz4 = throw "'python-lz4' has been renamed to/replaced by 'lz4'"; # Converted to throw 2025-10-29 + python-qt = throw "python-qt has been removed, because hard to maintain and not required by anything"; # Added 2025-01-14 python-simple-hipchat = throw "'python-simple-hipchat' has been removed because it was broken and unmaintained"; # added 2025-08-26 python-subunit = throw "'python-subunit' has been renamed to/replaced by 'subunit'"; # Converted to throw 2025-10-29 python-u2flib-server = throw "'python-u2flib-server' has been removed, since it was broken and archived upstream"; # added 2025-11-08 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a4895fcee920..e294fadf4444 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15535,8 +15535,6 @@ self: super: with self; { python-ptrace = callPackage ../development/python-modules/python-ptrace { }; - python-qt = toPythonModule (pkgs.python-qt.override { python3 = self.python; }); - python-rabbitair = callPackage ../development/python-modules/python-rabbitair { }; python-rapidjson = callPackage ../development/python-modules/python-rapidjson { };