From 3dca85fc28a188fbdb1eb98650b8d9bb3560f2ca Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 7 Feb 2026 12:33:30 +0100 Subject: [PATCH] napari: migrate to qt6 --- pkgs/development/python-modules/napari/default.nix | 11 +++++++---- pkgs/top-level/python-packages.nix | 4 +--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index b2832485eae8..18d79d06ceb0 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -1,6 +1,5 @@ { lib, - mkDerivationWith, buildPythonPackage, fetchFromGitHub, @@ -9,7 +8,7 @@ setuptools-scm, # nativeBuildInputs - wrapQtAppsHook, + qt6, # dependencies app-model, @@ -54,7 +53,7 @@ zarr, }: -mkDerivationWith buildPythonPackage rec { +buildPythonPackage rec { pname = "napari"; version = "0.6.6"; pyproject = true; @@ -76,7 +75,11 @@ mkDerivationWith buildPythonPackage rec { setuptools-scm ]; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ qt6.wrapQtAppsHook ]; + + buildInputs = [ + qt6.qtbase + ]; pythonRelaxDeps = [ "app-model" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 781bc36ba786..1f1927b6caf0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10667,9 +10667,7 @@ self: super: with self; { napalm-ros = callPackage ../development/python-modules/napalm/ros.nix { }; - napari = callPackage ../development/python-modules/napari { - inherit (pkgs.libsForQt5) mkDerivationWith wrapQtAppsHook; - }; + napari = callPackage ../development/python-modules/napari { }; napari-console = callPackage ../development/python-modules/napari-console { };