From c5423a5587e9dac3453be777ac08170f47ae26af Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Wed, 1 Jul 2026 16:55:05 -0700 Subject: [PATCH 1/2] python3Packages.{pyside6,shiboken,shiboken-generator}: 6.11.0 -> 6.11.1 --- pkgs/development/python-modules/pyside6/default.nix | 5 ----- .../python-modules/pyside6/fix-paths.patch | 13 ------------- .../python-modules/shiboken6-generator/default.nix | 4 ++-- 3 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 pkgs/development/python-modules/pyside6/fix-paths.patch diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix index f8165e7e8bc0..402400afaca0 100644 --- a/pkgs/development/python-modules/pyside6/default.nix +++ b/pkgs/development/python-modules/pyside6/default.nix @@ -10,7 +10,6 @@ shiboken6, llvmPackages, symlinkJoin, - fetchpatch, }: let packages = with python.pkgs.qt6; [ @@ -59,10 +58,6 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/sources/pyside6"; - patches = [ - ./fix-paths.patch - ]; - # Qt Designer plugin moved to a separate output to reduce closure size # for downstream things outputs = [ diff --git a/pkgs/development/python-modules/pyside6/fix-paths.patch b/pkgs/development/python-modules/pyside6/fix-paths.patch deleted file mode 100644 index f064dbc046b5..000000000000 --- a/pkgs/development/python-modules/pyside6/fix-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/libpyside/CMakeLists.txt -+++ b/libpyside/CMakeLists.txt -@@ -162,8 +162,8 @@ configure_package_config_file( - - # Install-tree / wheel configuration - set(PYSIDE_PYTHONPATH "") --set(PYSIDE_TYPESYSTEMS "typesystems") --set(PYSIDE_GLUE "glue") -+set(PYSIDE_TYPESYSTEMS "share/PySide6${pyside6_SUFFIX}/typesystems") -+set(PYSIDE_GLUE "share/PySide6${pyside6_SUFFIX}/glue") - set(PYSIDE_SOVERSION "${pyside6_library_so_version}") - - configure_package_config_file( diff --git a/pkgs/development/python-modules/shiboken6-generator/default.nix b/pkgs/development/python-modules/shiboken6-generator/default.nix index 680a952cdcfa..efb0e527ae14 100644 --- a/pkgs/development/python-modules/shiboken6-generator/default.nix +++ b/pkgs/development/python-modules/shiboken6-generator/default.nix @@ -12,12 +12,12 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "shiboken6-generator"; - version = "6.11.0"; + version = "6.11.1"; src = fetchgit { url = "https://code.qt.io/pyside/pyside-setup.git"; tag = "v${finalAttrs.version}"; - hash = "sha256-UbvH+wNiXjfMhaRUODx3p2cJmAz/dJ5kjPSprGKwsYg="; + hash = "sha256-m1vBGIUOgjx+0/MkiCASP6HaX5YM2B/txnbww7dKjCk="; }; patches = [ From 5178946d548b0247d75d9e65a956f3a8f8bd3e34 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Wed, 1 Jul 2026 16:55:50 -0700 Subject: [PATCH 2/2] python3Packages.pyside6-qtads: 4.5.0 -> 5.0.0 --- .../python-modules/pyside6-qtads/default.nix | 10 ++++----- .../pyside6-qtads/find-nix-deps.patch | 22 ++++++++++--------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/pyside6-qtads/default.nix b/pkgs/development/python-modules/pyside6-qtads/default.nix index 41abea11a295..224cb933d1c8 100644 --- a/pkgs/development/python-modules/pyside6-qtads/default.nix +++ b/pkgs/development/python-modules/pyside6-qtads/default.nix @@ -8,19 +8,19 @@ qt6, setuptools, setuptools-scm, - shiboken6, + shiboken6-generator, }: buildPythonPackage rec { pname = "pyside6-qtads"; - version = "4.5.0"; + version = "5.0.0"; pyproject = true; src = fetchFromGitHub { owner = "mborgerson"; repo = "pyside6_qtads"; tag = "v${version}"; - hash = "sha256-rAkv6dFyS4Nw3FDLwZ1zp0EU4BhD/xrhNgUiIIktJ8s="; + hash = "sha256-pSgDdfOuEnluiKKnCJjxVZbQwZld4tr7G2S8ZZXJkvo="; fetchSubmodules = true; }; @@ -29,7 +29,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace-fail @shiboken6@ ${shiboken6} \ + --replace-fail @shiboken6@ ${shiboken6-generator} \ --replace-fail @pyside6@ ${pyside6} # can't use pythonRelaxDepsHook because it runs postBuild but the dependency check @@ -56,7 +56,7 @@ buildPythonPackage rec { dependencies = [ pyside6 - shiboken6 + shiboken6-generator ]; nativeBuildInputs = [ pythonRelaxDepsHook ]; diff --git a/pkgs/development/python-modules/pyside6-qtads/find-nix-deps.patch b/pkgs/development/python-modules/pyside6-qtads/find-nix-deps.patch index 5ec2f5ab8259..d6ae7e61d63d 100644 --- a/pkgs/development/python-modules/pyside6-qtads/find-nix-deps.patch +++ b/pkgs/development/python-modules/pyside6-qtads/find-nix-deps.patch @@ -1,38 +1,40 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0c0568a..f12d50e 100644 +index 84a6527..9483c70 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -105,15 +105,17 @@ macro(pyside_config option output_var) +@@ -106,17 +106,17 @@ macro(pyside_config option output_var) endmacro() - # Query for the shiboken generator path, Python path, include paths and linker flags. + # Query for the shiboken6-generator path, PySide6 path, Python path, include paths and linker flags. +find_package(Shiboken6 REQUIRED) +find_package(PySide6 REQUIRED) pyside_config(--shiboken-module-path shiboken_module_path) -pyside_config(--shiboken-generator-path shiboken_generator_path) -pyside_config(--pyside-path pyside_path) --pyside_config(--pyside-include-path pyside_include_dir 1) +- +set(shiboken_generator_path "" CACHE PATH "Path where shiboken6 executable can be found") +set(pyside_path "" CACHE PATH "pyside share path, where typesystems dir can be found") +get_target_property(pyside_include_dir PySide6::pyside6 INTERFACE_INCLUDE_DIRECTORIES) pyside_config(--python-include-path python_include_dir) --pyside_config(--shiboken-generator-include-path shiboken_include_dir 1) --pyside_config(--shiboken-module-shared-libraries-cmake shiboken_shared_libraries 0) +-pyside_config(--shiboken-include-path shiboken_include_dir 1) +-pyside_config(--pyside-include-path pyside_include_dir 1) +- +get_target_property(shiboken_include_dir Shiboken6::libshiboken INTERFACE_INCLUDE_DIRECTORIES) +get_target_property(shiboken_shared_libraries Shiboken6::libshiboken IMPORTED_LOCATION_RELEASE) pyside_config(--python-link-flags-cmake python_linking_data 0) +-pyside_config(--shiboken-module-shared-libraries-cmake shiboken_module_shared_libraries 0) -pyside_config(--pyside-shared-libraries-cmake pyside_shared_libraries 0) +get_target_property(pyside_shared_libraries PySide6::pyside6 IMPORTED_LOCATION_RELEASE) - set(shiboken_path "${shiboken_generator_path}/shiboken6${CMAKE_EXECUTABLE_SUFFIX}") - if(NOT EXISTS ${shiboken_path}) + # Print the computed variables + message(STATUS "Shiboken module path: ${shiboken_module_path}") diff --git a/setup.py b/setup.py -index 802821b..f522818 100644 +index 84cda9c..05139d1 100644 --- a/setup.py +++ b/setup.py @@ -88,7 +88,9 @@ setuptools.setup( "-DBUILD_STATIC:BOOL=ON", - "-DADS_VERSION=4.3.0", + "-DADS_VERSION=5.0.0", f"-DPython3_ROOT_DIR={Path(sys.prefix)}", - f"-DPython_EXECUTABLE={Path(sys.executable)}" + f"-DPython_EXECUTABLE={Path(sys.executable)}",