diff --git a/flake.nix b/flake.nix index b4de705..1105b97 100644 --- a/flake.nix +++ b/flake.nix @@ -231,7 +231,7 @@ }; flake8-artiq = daxpkgs.packages.x86_64-linux.flake8-artiq; dax = daxpkgs.packages.x86_64-linux.dax.overridePythonAttrs (oa: { - nativeBuildInputs = (oa.nativeBuildInputs or []) ++ [ pkgs.qt5.wrapQtAppsHook ]; + nativeBuildInputs = (oa.nativeBuildInputs or []) ++ [ pkgs.qt6.wrapQtAppsHook ]; doCheck = false; }); trap-dac-utils = daxpkgs.packages.x86_64-linux.trap-dac-utils; @@ -243,10 +243,10 @@ rev = "0f0196b6941b0c44a33c85d8c02047ca65466463"; sha256 = "0mx6yjvprhdnkdigwns8mg6v5daqxpgbv7mf63fa76i1iv2wvak4"; }; - nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ]; + nativeBuildInputs = [ pkgs.qt6.wrapQtAppsHook ]; dontWrapQtApps = true; propagatedBuildInputs = [ artiqpkgs.packages.x86_64-linux.artiq ] - ++ (with pkgs.python3Packages; [ numpy pyqt5 pyqtgraph ]); + ++ (with pkgs.python3Packages; [ numpy pyqt6 pyqtgraph ]); doCheck = false; }; linien-client = pkgs.python3Packages.buildPythonPackage rec { diff --git a/msys2/artiq_dependencies.txt b/msys2/artiq_dependencies.txt index 02b32db..6a07f9d 100644 --- a/msys2/artiq_dependencies.txt +++ b/msys2/artiq_dependencies.txt @@ -1,7 +1,7 @@ mingw-w64-clang-x86_64-python3.11 mingw-w64-clang-x86_64-python-h5py -mingw-w64-clang-x86_64-python-pyqt5 -mingw-w64-clang-x86_64-qt5-svg +mingw-w64-clang-x86_64-python-pyqt6 +mingw-w64-clang-x86_64-qt6-svg mingw-w64-clang-x86_64-python-qasync mingw-w64-clang-x86_64-python-pyqtgraph mingw-w64-clang-x86_64-python-numpy