Unverified Commit 01d75102 authored by Dmitry Kalinkin's avatar Dmitry Kalinkin Committed by GitHub
Browse files

Various: Move to Qt6 (#487941)

parents 10174c22 8e120d12

pkgs/by-name/in/inkcut/package.nix

+5 −4
Original line number Diff line number Diff line 
{

  lib,

  fetchpatch,

  python3,

  fetchFromGitHub,

  qt5,

  cups,

  qt6,

}:



python3.pkgs.buildPythonApplication rec {
@@ -24,7 +23,9 @@ python3.pkgs.buildPythonApplication rec { 
      --replace-fail ", 'lpr', " ", '${cups}/bin/lpr', "

  '';



  nativeBuildInputs = [ qt5.wrapQtAppsHook ];

  nativeBuildInputs = [ qt6.wrapQtAppsHook ];



  buildInputs = [ qt6.qtbase ];



  build-system = with python3.pkgs; [ setuptools ];
@@ -37,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { 
    pyserial

    pycups

    qtconsole

    pyqt5

    pyqt6

  ];



  # QtApplication.instance() does not work during tests?

pkgs/development/python-modules/enamlx/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
  fetchFromGitHub,

  enaml,

  pyqtgraph,

  pyqt5,

  pythonocc-core,

  typing-extensions,

}:
@@ -25,7 +24,6 @@ buildPythonPackage rec { 
    enaml

    # Until https://github.com/inkcut/inkcut/issues/105 perhaps

    pyqtgraph

    pyqt5

    pythonocc-core

    typing-extensions

  ];

pkgs/development/python-modules/magicgui/default.nix

+10 −1
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ 
  napari, # a reverse-dependency, for tests

  psygnal,

  pyside2,

  pyside6,

  pyqt6,

  pyqt5,

  pytestCheckHook,

  superqt,

  typing-extensions,
@@ -33,11 +36,17 @@ buildPythonPackage rec { 
  dependencies = [

    typing-extensions

    superqt

    pyside2

    psygnal

    docstring-parser

  ];



  optional-dependencies = {

    pyside2 = [ pyside2 ];

    pyside6 = [ pyside6 ];

    pyqt6 = [ pyqt6 ];

    pyqt5 = [ pyqt5 ];

  };



  nativeCheckInputs = [ pytestCheckHook ];



  doCheck = false; # Reports "Fatal Python error"

pkgs/development/python-modules/napari/default.nix

+7 −4
Original line number Diff line number Diff line 
{

  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"

pkgs/development/python-modules/qreactor/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
  fetchFromGitHub,

  twisted,

  qtpy,

  pyqt5,

  pyqt6,

}:



buildPythonPackage {
@@ -19,12 +19,14 @@ buildPythonPackage { 
    sha256 = "1nb5iwg0nfz86shw28a2kj5pyhd4jvvxhf73fhnfbl8scgnvjv9h";

  };



  strictDeps = true;



  propagatedBuildInputs = [

    twisted

    qtpy

  ];



  nativeCheckInputs = [ pyqt5 ];

  nativeCheckInputs = [ pyqt6 ];



  pythonImportsCheck = [ "qreactor" ];