From 4b1a9dd00b508a3ea2273db916a600689d15f7f6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Oct 2013 01:14:16 +0100
Subject: [PATCH] Remove uses of mkFixStrictness

mkFixStrictness is no longer needed, woohoo!
---
 lib/options.nix                                         | 1 +
 nixos/modules/services/x11/display-managers/kdm.nix     | 2 +-
 nixos/modules/services/x11/display-managers/lightdm.nix | 2 +-
 nixos/modules/system/boot/loader/grub/memtest.nix       | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/options.nix b/lib/options.nix
index 0fa702a616c6..0aed3619a749 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -6,6 +6,7 @@ with import ./trivial.nix;
 with import ./lists.nix;
 with import ./misc.nix;
 with import ./attrsets.nix;
+with import ./strings.nix;
 
 rec {
 
diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix
index c03f71164541..2e84adcb4cef 100644
--- a/nixos/modules/services/x11/display-managers/kdm.nix
+++ b/nixos/modules/services/x11/display-managers/kdm.nix
@@ -128,7 +128,7 @@ in
     services.xserver.displayManager.slim.enable = false;
 
     services.xserver.displayManager.job =
-      { execCmd = mkFixStrictness
+      { execCmd =
           ''
             mkdir -m 0755 -p /var/lib/kdm
             chown kdm /var/lib/kdm
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index f4fb5ee003a9..e4125891e6cb 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -96,7 +96,7 @@ in
       logsXsession = true;
 
       # lightdm relaunches itself via just `lightdm`, so needs to be on the PATH
-      execCmd = mkFixStrictness ''
+      execCmd = ''
         export PATH=${lightdm}/sbin:$PATH
         ${lightdm}/sbin/lightdm --log-dir=/var/log --run-dir=/run --config=${lightdmConf}
       '';
diff --git a/nixos/modules/system/boot/loader/grub/memtest.nix b/nixos/modules/system/boot/loader/grub/memtest.nix
index a0726c01e204..80c1a160cfde 100644
--- a/nixos/modules/system/boot/loader/grub/memtest.nix
+++ b/nixos/modules/system/boot/loader/grub/memtest.nix
@@ -23,7 +23,7 @@ in
 
   config = mkIf config.boot.loader.grub.memtest86 {
 
-    boot.loader.grub.extraEntries = mkFixStrictness (
+    boot.loader.grub.extraEntries =
       if config.boot.loader.grub.version == 2 then
         ''
           menuentry "Memtest86+" {
@@ -31,7 +31,7 @@ in
           }
         ''
       else
-        throw "Memtest86+ is not supported with GRUB 1.");
+        throw "Memtest86+ is not supported with GRUB 1.";
 
     boot.loader.grub.extraFiles."memtest.bin" = "${memtest86}/memtest.bin";