Revert "Move tests into a separate sub flake (#272)"

This reverts commit bb981ae.

Author: zimbatm

examples/flake.lock

@@ -4,10 +4,7 @@
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
   outputs =
-    {
-      self,
-      nixpkgs,
-    }:
+    { self, nixpkgs }:
     let
       systems = [
         "aarch64-linux"
@@ -22,6 +19,17 @@
             pkgs = nixpkgs.legacyPackages.${system};
           }
         );
+      nix-vm-test-lib =
+        let
+          rev = "e34870b8dd2c2d203c05b4f931b8c33eaaf43b81";
+          sha256 = "sha256:1qp1fq96kv9i1nj20m25057pfcs1b1c9bj4502xy7gnw8caqr30d";
+        in
+        "${
+          builtins.fetchTarball {
+            url = "https://github.com/numtide/nix-vm-test/archive/${rev}.tar.gz";
+            inherit sha256;
+          }
+        }/lib.nix";
     in
     {
       lib = import ./nix/lib.nix { inherit nixpkgs; };
@@ -39,6 +47,11 @@
         };
       };
 
+      # Only useful for quick tests
+      systemConfigs.default = self.lib.makeSystemConfig {
+        modules = [ ./examples/example.nix ];
+      };
+
       formatter = eachSystem ({ pkgs, ... }: pkgs.treefmt);
 
       devShells = eachSystem (
@@ -48,11 +61,29 @@
         }
       );
 
-      checks = eachSystem (
-        { system, ... }:
-        {
-          system-manager = self.packages.${system}.default;
-        }
+      checks = (
+        nixpkgs.lib.recursiveUpdate
+          (eachSystem (
+            { system, ... }:
+            {
+              system-manager = self.packages.${system}.default;
+            }
+          ))
+          {
+            x86_64-linux =
+              let
+                system = "x86_64-linux";
+              in
+              (import ./test/nix/modules {
+                inherit system;
+                inherit (nixpkgs) lib;
+                nix-vm-test = import nix-vm-test-lib {
+                  inherit nixpkgs;
+                  inherit system;
+                };
+                system-manager = self;
+              });
+          }
       );
     };
 }

examples/flake.nix

@@ -3,7 +3,6 @@
   system-manager,
   system,
   nix-vm-test,
-  inputs,
 }:
 
 let
@@ -36,7 +35,6 @@ let
                   }
                 )
               ];
-              extraSpecialArgs = { inherit inputs; };
             }
           );
           inherit (toplevel.config) hostPkgs;
@@ -150,19 +148,16 @@ let
         }
       )
     ];
-    extraSpecialArgs = { inherit inputs; };
   };
 
 in
 
 forEachUbuntuImage "example" {
   modules = [
     (testModule "old")
-    ../../../example.nix
-  ];
-  extraPathsToRegister = [
-    newConfig
+    ../../../examples/example.nix
   ];
+  extraPathsToRegister = [ newConfig ];
   testScriptFunction =
     { toplevel, hostPkgs, ... }:
     #python
@@ -256,7 +251,7 @@ forEachUbuntuImage "example" {
   forEachUbuntuImage "prepopulate" {
     modules = [
       (testModule "old")
-      ../../../example.nix
+      ../../../examples/example.nix
     ];
     extraPathsToRegister = [ newConfig ];
     testScriptFunction =
@@ -314,7 +309,7 @@ forEachUbuntuImage "example" {
   forEachUbuntuImage "system-path" {
     modules = [
       (testModule "old")
-      ../../../example.nix
+      ../../../examples/example.nix
     ];
     extraPathsToRegister = [ newConfig ];
     testScriptFunction =