Modularize tests, use pkgs.path

build.sh

@@ -78,8 +78,7 @@ update() {
 
   update
 
-  echo 'Building all system configurations.'
-  nix build -f machines.nix all --show-trace
+  nixops deploy -d personal --check -j 8 --cores 16 -I "nixpkgs=$NIXPKGS" --build-only
 
   echo 'Spreading secrets.'
   for machine in secrets/shared/*; do

modules/basics.nix

@@ -14,7 +14,7 @@
 
   # Nix propagation
   environment.etc = {
-    nix-system-pkgs.source = /home/svein/dev/nix/system;
+    nix-system-pkgs.source = pkgs.path;
     nixos.source = builtins.filterSource
       (path: type:
       baseNameOf path != "secrets"

modules/default.nix

@@ -4,5 +4,6 @@
   imports = [
     ./basics.nix
     ./zfs.nix
+    ./tests.nix
   ];
 }

modules/tests.nix

@@ -0,0 +1,24 @@
+{ config, pkgs, ... }:
+
+let
+  test = file: (import (pkgs.path + "/nixos/tests/${file}.nix") {
+    inherit config;
+  });
+
+  xmonad = test "xmonad";
+
+  tests = pkgs.runCommand "proof-of-tests" {
+    tests = [ xmonad ];
+  } ''
+    mkdir -p $out/share/doc/proof-of-tests
+    i=1
+    for test in $tests; do
+      ln -s $test $out/share/doc/proof-of-tests/$i
+      i=$(($i + 1))
+    done
+    '';
+in {
+  environment.systemPackages = [
+    tests
+  ];
+}