From 26780df0657ece9880166b69c74c359facac8c1b Mon Sep 17 00:00:00 2001 From: "Weston Keele (whisky)" Date: Wed, 29 Oct 2025 14:58:43 +0000 Subject: [PATCH] nix: Re-enable and fix basic nix flake check for nix package and module (#3425) Co-authored-by: Weston Keele --- flake.nix | 3 ++- nix/tests/default.nix | 4 ++-- nix/tests/nixos-module/default.nix | 15 ++++++++++----- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index 8f19bcdfa..69ac6c946 100644 --- a/flake.nix +++ b/flake.nix @@ -145,6 +145,7 @@ nixpkgs.overlays = [ self.overlays.${system}.default ]; }; - checks = { }; + checks = + import ./nix/tests { inherit pkgs; flake = self; }; }); } diff --git a/nix/tests/default.nix b/nix/tests/default.nix index 7b8513acf..3abbc7052 100644 --- a/nix/tests/default.nix +++ b/nix/tests/default.nix @@ -1,4 +1,4 @@ -{ pkgs, makeTest, inputs }: +{ pkgs, flake }: { - vmTest = import ./nixos-module { inherit pkgs makeTest inputs; }; + vmTest = import ./nixos-module { inherit pkgs flake; }; } diff --git a/nix/tests/nixos-module/default.nix b/nix/tests/nixos-module/default.nix index d40e35e7d..8f3bf629f 100644 --- a/nix/tests/nixos-module/default.nix +++ b/nix/tests/nixos-module/default.nix @@ -1,16 +1,19 @@ -{ pkgs, makeTest, inputs }: -makeTest { +{ pkgs, flake }: +pkgs.nixosTest { name = "lnbits-nixos-module"; nodes = { client = { config, pkgs, ... }: { environment.systemPackages = [ pkgs.curl ]; }; lnbits = { ... }: { - imports = [ inputs.self.nixosModules.default ]; + imports = [ flake.nixosModules.${pkgs.system}.default ]; services.lnbits = { enable = true; openFirewall = true; host = "0.0.0.0"; + env = { + LNBITS_ADMIN_UI = "false"; + }; }; }; }; @@ -19,8 +22,10 @@ makeTest { lnbits.wait_for_open_port(${toString nodes.lnbits.config.services.lnbits.port}) client.wait_for_unit("multi-user.target") with subtest("Check that the lnbits webserver can be reached."): - assert "LNbits" in client.succeed( - "curl -sSf http:/lnbits:8231/ | grep title" + output = client.succeed( + "curl -sSf http://lnbits:8231/ | grep title | head -n1" ) + + assert "LNbits" in output; ''; }