From 64eb60a1ab39141fc4035bc2acb62589367226bf Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Sun, 1 Sep 2024 12:52:20 -0400 Subject: [PATCH] meta: Inline tests lib The tests lib wasn't doing that much anyway and Nix flake checks are just derivations that build successfully. --- lib/test.nix | 19 ------------------- tests/neovim.nix | 17 +++++++++++++---- 2 files changed, 13 insertions(+), 23 deletions(-) delete mode 100644 lib/test.nix diff --git a/lib/test.nix b/lib/test.nix deleted file mode 100644 index 85961b57..00000000 --- a/lib/test.nix +++ /dev/null @@ -1,19 +0,0 @@ -test: - -{ self, pkgs }: - -let - inherit (pkgs.lib) mkDefault; - - nixos-lib = import (pkgs.path + "/nixos/lib") { }; -in -(nixos-lib.runTest { - imports = [ test ]; - - hostPkgs = pkgs; - defaults.documentation.enable = mkDefault false; - - node.specialArgs = { - nix-config = self; - }; -}).config.result diff --git a/tests/neovim.nix b/tests/neovim.nix index 57ba2fe7..03ffb7eb 100644 --- a/tests/neovim.nix +++ b/tests/neovim.nix @@ -1,13 +1,22 @@ +{ self, pkgs }: + let - inherit (builtins) attrValues; + nixos-lib = import (pkgs.path + "/nixos/lib") { }; in -(import ../lib/test.nix) { +(nixos-lib.runTest { name = "neovim"; + hostPkgs = pkgs; + defaults.documentation.enable = pkgs.lib.mkDefault false; + + node.specialArgs = { + nix-config = self; + }; + nodes.machine = { nix-config, ... }: { - imports = attrValues { + imports = builtins.attrValues { inherit (nix-config.nixosModules) desktop system shell; customConfig = { @@ -51,4 +60,4 @@ in assert "Hello world" in text ''; -} +}).config.result