From 984f06239f0fed969a25be903cf35be4d788dd1d Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Thu, 14 Jul 2022 05:27:38 +0100 Subject: [PATCH] nix: remove forAllSystems from nixosModule This causes lnbits.nixosModules.default to exist, rather than lnbits.nixosModules.aarch64-linux.default. The latter was a mistake. --- flake.nix | 4 ++-- nix/tests/nixos-module/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 77522866..af25ba5c 100644 --- a/flake.nix +++ b/flake.nix @@ -32,12 +32,12 @@ python = pkgs.python39; }; }); - nixosModules = forAllSystems (system: pkgs: { + nixosModules = { default = { pkgs, lib, config, ... }: { imports = [ "${./nix/modules/${projectName}-service.nix}" ]; nixpkgs.overlays = [ self.overlays.default ]; }; - }); + }; checks = forAllSystems (system: pkgs: let vmTests = import ./nix/tests { diff --git a/nix/tests/nixos-module/default.nix b/nix/tests/nixos-module/default.nix index 5649ae59..86857912 100644 --- a/nix/tests/nixos-module/default.nix +++ b/nix/tests/nixos-module/default.nix @@ -5,7 +5,7 @@ makeTest { environment.systemPackages = [ pkgs.curl ]; }; lnbits = { ... }: { - imports = [ inputs.self.nixosModules.${pkgs.hostPlatform.system}.default ]; + imports = [ inputs.self.nixosModules.default ]; services.lnbits = { enable = true; openFirewall = true;