diff --git a/flake.nix b/flake.nix index 9af4502..bee5ee4 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,15 @@ { description = "Firmware for the Sinara 8451 Thermostat"; - inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-23.05; - inputs.mozilla-overlay = { url = github:mozilla/nixpkgs-mozilla; flake = false; }; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; + inputs.mozilla-overlay = {url = github:mozilla/nixpkgs-mozilla; flake = false; }; - outputs = { self, nixpkgs, mozilla-overlay }: + outputs = + { + self, + nixpkgs, + mozilla-overlay, + }: let pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ (import mozilla-overlay) ]; }; rustManifest = pkgs.fetchurl { @@ -32,7 +37,7 @@ version = "0.0.0"; src = self; - cargoLock = { + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "stm32-eth-0.2.0" = "sha256-48RpZgagUqgVeKm7GXdk3Oo0v19ScF9Uby0nTFlve2o="; @@ -76,7 +81,10 @@ inherit pname version; hash = "sha256-WBCNhBHHBU4IQdi3ke6F4QH8KWubNZwOAd3jipj/Ks4="; }; - propagatedBuildInputs = with pkgs.python3Packages; [ numpy pyqt6 ]; + propagatedBuildInputs = with pkgs.python3Packages; [ + numpy + pyqt6 + ]; }; qtextras = pkgs.python3Packages.buildPythonPackage rec { @@ -88,7 +96,11 @@ hash = "sha256-d1ZotSlOI4surUy0H0N4xHoq94IRQvMHunwRH1uubFg="; }; buildInputs = [ pkgs.python3Packages.hatchling ]; - propagatedBuildInputs = with pkgs.python3Packages; [ numpy pyqtgraph ruamel-yaml ]; + propagatedBuildInputs = with pkgs.python3Packages; [ + numpy + pyqtgraph + ruamel-yaml + ]; }; pglive = pkgs.python3Packages.buildPythonPackage rec { @@ -100,7 +112,10 @@ hash = "sha256-jqj8X6H1N5mJQ4OrY5ANqRB0YJByqg/bNneEALWmH1A="; }; buildInputs = [ pkgs.python3Packages.poetry-core ]; - propagatedBuildInputs = [ pyqtgraph pkgs.python3Packages.numpy ]; + propagatedBuildInputs = [ + pyqtgraph + pkgs.python3Packages.numpy + ]; }; thermostat_gui = pkgs.python3Packages.buildPythonPackage { @@ -110,14 +125,23 @@ src = "${self}/pytec"; nativeBuildInputs = [ pkgs.qt6.wrapQtAppsHook ]; - propagatedBuildInputs = [ pkgs.qt6.qtbase ] ++ (with pkgs.python3Packages; [ pyqtgraph pyqt6 qasync pglive qtextras ]); + propagatedBuildInputs = + [ pkgs.qt6.qtbase ] + ++ (with pkgs.python3Packages; [ + pyqtgraph + pyqt6 + qasync + pglive + qtextras + ]); dontWrapQtApps = true; postFixup = '' wrapQtApp "$out/bin/tec_qt" ''; }; - in { + in + { packages.x86_64-linux = { inherit thermostat thermostat_gui; }; @@ -133,12 +157,24 @@ devShell.x86_64-linux = pkgs.mkShell { name = "thermostat-dev-shell"; - buildInputs = with pkgs; [ - rust openocd dfu-util - ] ++ (with python3Packages; [ - numpy matplotlib pyqtgraph setuptools pyqt6 qasync pglive qtextras + buildInputs = + with pkgs; + [ + rust + openocd + dfu-util + ] + ++ (with python3Packages; [ + numpy + matplotlib + pyqtgraph + setuptools + pyqt6 + qasync + pglive + qtextras ]); }; defaultPackage.x86_64-linux = thermostat; }; -} \ No newline at end of file +}