From 1052ce3b41557549f166f088c5b672b560c1ede9 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 28 Feb 2016 13:41:24 +0100
Subject: profiles/tests: Update upstream tests.

In NixOS/nixpkgs@d4636fa, the nixosPinVersion got removed, so we need to
avoid evaluating it.

Some other tests were added in the meantime, namely:

  * PostgreSQL (NixOS/nixpkgs@109ba4c)
  * Grsecurity (NixOS/nixpkgs@dd18447)
  * initrd-network (NixOS/nixpkgs@cc925d0)
  * Mathics (NixOS/nixpkgs@fe8498f)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/profiles/tests.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/modules/profiles/tests.nix b/modules/profiles/tests.nix
index 04019b3d..599093f3 100644
--- a/modules/profiles/tests.nix
+++ b/modules/profiles/tests.nix
@@ -51,9 +51,15 @@ let
     { check = config.services.xserver.displayManager.gdm.enable;
       path  = ["nixos" "gnome3-gdm"];
     }
+    { check = config.boot.kernelPackages.kernel.features.grsecurity or false;
+      path  = ["nixos" "grsecurity"];
+    }
     { check = config.services.xserver.windowManager.i3.enable;
       path  = ["nixos" "i3wm"];
     }
+    { check = config.boot.initrd.network.enable;
+      path  = ["nixos" "initrdNetwork"];
+    }
     { check = elem "btrfs" config.boot.supportedFilesystems;
       paths = [
         ["nixos" "installer" "btrfsSimple"]
@@ -113,6 +119,9 @@ let
     { check = true;
       path  = ["nixos" "login"];
     }
+    { check = config.services.mathics.enable;
+      path  = ["nixos" "mathics"];
+    }
     { check = true;
       path  = ["nixos" "misc"];
     }
@@ -177,9 +186,6 @@ let
         ["nixos" "nfs4"]
       ];
     }
-    { check = true;
-      path  = ["nixos" "nixosPinVersion"];
-    }
     { check = config.services.nsd.enable;
       path  = ["nixos" "nsd"];
     }
@@ -192,6 +198,9 @@ let
     { check = config.services.peerflix.enable;
       path  = ["nixos" "peerflix"];
     }
+    { check = config.services.postgresql.enable;
+      path  = ["nixos" "postgresql"];
+    }
     { check = config.services.printing.enable;
       path  = ["nixos" "printing"];
     }
-- 
cgit 1.4.1