From 82af01c8ea1d4ef951e560f0ebf5f12e3542f0a4 Mon Sep 17 00:00:00 2001 From: agessaman Date: Sun, 9 Nov 2025 12:38:18 -0800 Subject: [PATCH] add hatching to nix build, update test to use the flake-parts structure --- .github/workflows/nix-test.yml | 13 +++++++++---- nix/packages.nix | 4 ++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nix-test.yml b/.github/workflows/nix-test.yml index f75f98b..ad545ff 100644 --- a/.github/workflows/nix-test.yml +++ b/.github/workflows/nix-test.yml @@ -92,9 +92,10 @@ jobs: let pkgs = import {}; lib = pkgs.lib; - module = import ./nix/nixos-module.nix { flake-parts-lib = {}; }; + flakeModule = import ./nix/nixos-module.nix { flake-parts-lib = {}; }; + nixosModule = flakeModule.flake.nixosModules.default; in - lib.isFunction module.flake.nixosModules.default + lib.isFunction nixosModule ' --strict - name: Test module with minimal configuration @@ -103,9 +104,11 @@ jobs: let pkgs = import {}; lib = pkgs.lib; + flakeModule = import ./nix/nixos-module.nix { flake-parts-lib = {}; }; + nixosModule = flakeModule.flake.nixosModules.default; eval = import { modules = [ - ./nix/nixos-module.nix + nixosModule { services.meshcore-packet-capture = { enable = true; @@ -129,9 +132,11 @@ jobs: let pkgs = import {}; lib = pkgs.lib; + flakeModule = import ./nix/nixos-module.nix { flake-parts-lib = {}; }; + nixosModule = flakeModule.flake.nixosModules.default; eval = import { modules = [ - ./nix/nixos-module.nix + nixosModule { services.meshcore-packet-capture = { enable = true; diff --git a/nix/packages.nix b/nix/packages.nix index 014ac70..ec39877 100644 --- a/nix/packages.nix +++ b/nix/packages.nix @@ -13,6 +13,10 @@ sha256 = "sha256-mnr5WqH/uKzONI8lcm1GQCSlnhx6WQyqsAr12gsMKEI="; }; + nativeBuildInputs = with pkgs.python3Packages; [ + hatchling + ]; + propagatedBuildInputs = with pkgs.python3Packages; [ bleak pyserial-asyncio