M-Labs
/
artiq-extrapkg
2
0
Fork 4
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

qt5 -> qt6

This commit is contained in:
Sebastien Bourdeauducq 2024-07-27 22:06:39 +08:00
parent 05d45229af
commit 30d9b5ae54
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.nix
View File

@ -231,7 +231,7 @@
}; };
flake8-artiq = daxpkgs.packages.x86_64-linux.flake8-artiq; flake8-artiq = daxpkgs.packages.x86_64-linux.flake8-artiq;
dax = daxpkgs.packages.x86_64-linux.dax.overridePythonAttrs (oa: { 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; doCheck = false;
}); });
trap-dac-utils = daxpkgs.packages.x86_64-linux.trap-dac-utils; trap-dac-utils = daxpkgs.packages.x86_64-linux.trap-dac-utils;
@ -243,10 +243,10 @@
rev = "0f0196b6941b0c44a33c85d8c02047ca65466463"; rev = "0f0196b6941b0c44a33c85d8c02047ca65466463";
sha256 = "0mx6yjvprhdnkdigwns8mg6v5daqxpgbv7mf63fa76i1iv2wvak4"; sha256 = "0mx6yjvprhdnkdigwns8mg6v5daqxpgbv7mf63fa76i1iv2wvak4";
}; };
nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ]; nativeBuildInputs = [ pkgs.qt6.wrapQtAppsHook ];
dontWrapQtApps = true; dontWrapQtApps = true;
propagatedBuildInputs = [ artiqpkgs.packages.x86_64-linux.artiq ] propagatedBuildInputs = [ artiqpkgs.packages.x86_64-linux.artiq ]
++ (with pkgs.python3Packages; [ numpy pyqt5 pyqtgraph ]); ++ (with pkgs.python3Packages; [ numpy pyqt6 pyqtgraph ]);
doCheck = false; doCheck = false;
}; };
linien-client = pkgs.python3Packages.buildPythonPackage rec { linien-client = pkgs.python3Packages.buildPythonPackage rec {

4
msys2/artiq_dependencies.txt
View File

@ -1,7 +1,7 @@
mingw-w64-clang-x86_64-python3.11 mingw-w64-clang-x86_64-python3.11
mingw-w64-clang-x86_64-python-h5py mingw-w64-clang-x86_64-python-h5py
mingw-w64-clang-x86_64-python-pyqt5 mingw-w64-clang-x86_64-python-pyqt6
mingw-w64-clang-x86_64-qt5-svg mingw-w64-clang-x86_64-qt6-svg
mingw-w64-clang-x86_64-python-qasync mingw-w64-clang-x86_64-python-qasync
mingw-w64-clang-x86_64-python-pyqtgraph mingw-w64-clang-x86_64-python-pyqtgraph
mingw-w64-clang-x86_64-python-numpy mingw-w64-clang-x86_64-python-numpy