Merge pull request #66 from NixOS/fix-tests

Fix tests

.travis.yml

@@ -1,2 +1,2 @@
 language: nix
-script: tests/eval.sh
+script: nix-build --dry-run --show-trace

default.nix

@@ -1 +1,46 @@
-{ ... }: {}
+{ ... }:
+
+let
+  shim = {
+    boot.loader.systemd-boot.enable = true;
+
+    fileSystems."/" = {
+      device = "/dev/disk/by-uuid/00000000-0000-0000-0000-000000000000";
+      fsType = "btrfs";
+    };
+
+    nixpkgs.config = {
+      allowBroken = true;
+      allowUnfree = true;
+    };
+  };
+
+  buildProfile = profile: (import <nixpkgs/nixos> {
+    configuration.imports = [ profile shim ];
+  }).system;
+in
+
+{
+  acer-aspire-4810t = buildProfile ./acer/aspire/4810t;
+
+  airis-n990 = buildProfile ./airis/n990;
+
+  apple-macbook-air-4 = buildProfile ./apple/macbook-air/4;
+  apple-macbook-air-6 = buildProfile ./apple/macbook-air/6;
+  apple-macbook-pro-10-1 = buildProfile ./apple/macbook-pro/10-1;
+  apple-macbook-pro-12-1 = buildProfile ./apple/macbook-pro/12-1;
+
+  dell-xps-15-9550 = buildProfile ./dell/xps/15-9550;
+
+  lenovo-thinkpad-t410 = buildProfile ./lenovo/thinkpad/t410;
+  lenovo-thinkpad-t440p = buildProfile ./lenovo/thinkpad/t440p;
+  lenovo-thinkpad-t460s = buildProfile ./lenovo/thinkpad/t460s;
+  lenovo-thinkpad-x140e = buildProfile ./lenovo/thinkpad/x140e;
+  lenovo-thinkpad-x220 = buildProfile ./lenovo/thinkpad/x220;
+  lenovo-thinkpad-x230 = buildProfile ./lenovo/thinkpad/x230;
+  lenovo-thinkpad-x250 = buildProfile ./lenovo/thinkpad/x250;
+
+  microsoft-surface-pro-3 = buildProfile ./microsoft/surface-pro/3;
+
+  pcengines-apu = buildProfile ./pcengines/apu;
+}

tests/eval.nix

@@ -1,15 +0,0 @@
-{
-  imports = [ <nixos-hardware-profile> ];
-
-  boot.loader.systemd-boot.enable = true;
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/00000000-0000-0000-0000-000000000000";
-    fsType = "btrfs";
-  };
-
-  nixpkgs.config = {
-    allowBroken = true;
-    allowUnfree = true;
-  };
-}

tests/eval.sh

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd "$(dirname "$0")/.."
-
-for profile in $(find . -name default.nix); do
-  echo evaluating $profile >&2
-
-  nix-build '<nixpkgs/nixos>' \
-    -I nixos-config=tests/eval.nix \
-    -I nixos-hardware-profile=$profile \
-    -A system \
-    --dry-run \
-    --show-trace
-done