diff --git a/pkgs/development/libraries/pyotherside/default.nix b/pkgs/development/libraries/pyotherside/default.nix index 481093cbe188..c9f1412b0457 100644 --- a/pkgs/development/libraries/pyotherside/default.nix +++ b/pkgs/development/libraries/pyotherside/default.nix @@ -5,11 +5,15 @@ python3, qmake, qtbase, - qtquickcontrols, + qtdeclarative, + qtquickcontrols ? null, # Qt6: merged into qtdeclarative qtsvg, ncurses, }: +let + withQt6 = lib.strings.versionAtLeast qtbase.version "6"; +in stdenv.mkDerivation rec { pname = "pyotherside"; version = "1.6.2"; @@ -25,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ python3 qtbase - qtquickcontrols + (if withQt6 then qtdeclarative else qtquickcontrols) qtsvg ncurses ]; @@ -36,7 +40,7 @@ stdenv.mkDerivation rec { installTargets = [ "sub-src-install_subtargets" ]; meta = { - description = "Asynchronous Python 3 Bindings for Qt 5"; + description = "Asynchronous Python 3 Bindings for Qt ${lib.versions.major qtbase.version}"; homepage = "https://thp.io/2011/pyotherside/"; license = lib.licenses.isc; maintainers = [ lib.maintainers.mic92 ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a093826a3754..7c03c05c46ae 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1738,7 +1738,7 @@ mapAliases { pyCA = warnAlias "'pyCA' was renamed to 'pyca'" pyca; # Added 2026-02-12 pyload-ng = throw "'pyload-ng' has been removed due to vulnerabilities and being unmaintained"; # Added 2026-03-21 pyo3-pack = throw "'pyo3-pack' has been renamed to/replaced by 'maturin'"; # Converted to throw 2025-10-27 - pyotherside = warnAlias "'pyotherside' has been renamed to 'libsForQt5.pyotherside'."; # Added 2026-03-27 + pyotherside = warnAlias "'pyotherside' has been renamed to 'libsForQt5.pyotherside'. A Qt6 build is available at 'qt6Packages.pyotherside'."; # Added 2026-03-27 pypolicyd-spf = throw "'pypolicyd-spf' has been renamed to/replaced by 'spf-engine'"; # Converted to throw 2025-10-27 python3Full = throw "python3Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30 python311Full = throw "python311Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30 diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index cc1b5fec45b7..d17adae73183 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -92,6 +92,8 @@ makeScopeWithSplicing' { maplibre-native-qt = callPackage ../development/libraries/maplibre-native-qt { }; + pyotherside = callPackage ../development/libraries/pyotherside { }; + qca = callPackage ../development/libraries/qca { inherit (qt6) qtbase qt5compat; };