From 870d10b5256a258dfb234fde9f8b45ee93721a7c Mon Sep 17 00:00:00 2001 From: atse Date: Fri, 21 Jun 2024 10:23:23 +0800 Subject: [PATCH] Use qtextras --- flake.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 9056fa9..9af4502 100644 --- a/flake.nix +++ b/flake.nix @@ -79,6 +79,18 @@ propagatedBuildInputs = with pkgs.python3Packages; [ numpy pyqt6 ]; }; + qtextras = pkgs.python3Packages.buildPythonPackage rec { + pname = "qtextras"; + version = "0.6.8"; + format = "pyproject"; + src = pkgs.fetchPypi { + inherit pname version; + hash = "sha256-d1ZotSlOI4surUy0H0N4xHoq94IRQvMHunwRH1uubFg="; + }; + buildInputs = [ pkgs.python3Packages.hatchling ]; + propagatedBuildInputs = with pkgs.python3Packages; [ numpy pyqtgraph ruamel-yaml ]; + }; + pglive = pkgs.python3Packages.buildPythonPackage rec { pname = "pglive"; version = "0.7.2"; @@ -98,7 +110,7 @@ src = "${self}/pytec"; nativeBuildInputs = [ pkgs.qt6.wrapQtAppsHook ]; - propagatedBuildInputs = [ pkgs.qt6.qtbase ] ++ (with pkgs.python3Packages; [ pyqtgraph pyqt6 qasync pglive ]); + propagatedBuildInputs = [ pkgs.qt6.qtbase ] ++ (with pkgs.python3Packages; [ pyqtgraph pyqt6 qasync pglive qtextras ]); dontWrapQtApps = true; postFixup = '' @@ -124,7 +136,7 @@ buildInputs = with pkgs; [ rust openocd dfu-util ] ++ (with python3Packages; [ - numpy matplotlib pyqtgraph setuptools pyqt6 qasync pglive + numpy matplotlib pyqtgraph setuptools pyqt6 qasync pglive qtextras ]); }; defaultPackage.x86_64-linux = thermostat;