From 6a2715dcb682c6886fbdd9673679446988eef214 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 23 Jul 2017 19:07:04 +0200
Subject: [PATCH] activation-checks: remove set +e

---
 modules/system/activation-checks.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/system/activation-checks.nix b/modules/system/activation-checks.nix
index dc8e51ac..792eda8a 100644
--- a/modules/system/activation-checks.nix
+++ b/modules/system/activation-checks.nix
@@ -5,7 +5,7 @@ with lib;
 let
   darwinChanges = ''
     if test -e /run/current-system/darwin-changes; then
-      darwinChanges=$(grep -v -f /run/current-system/darwin-changes $systemConfig/darwin-changes 2> /dev/null)
+      darwinChanges=$(grep -v -f /run/current-system/darwin-changes $systemConfig/darwin-changes 2> /dev/null) || true
       if test -n "$darwinChanges"; then
         echo >&2
         echo "CHANGELOG" >&2
@@ -17,7 +17,7 @@ let
   '';
 
   buildUsers = optionalString config.services.nix-daemon.enable ''
-    buildUser=$(dscl . -read /Groups/nixbld GroupMembership 2>&1 | awk '/^GroupMembership: / {print $2}')
+    buildUser=$(dscl . -read /Groups/nixbld GroupMembership 2>&1 | awk '/^GroupMembership: / {print $2}') || true
     if [ -z $buildUser ]; then
         echo "error: Using the nix-daemon requires build users, aborting activation" >&2
         echo "Create the build users or disable the daemon:" >&2
@@ -79,8 +79,6 @@ in
   config = {
 
     system.activationScripts.checks.text = ''
-      set +e
-
       ${darwinChanges}
       ${buildUsers}
       ${nixPath}
@@ -89,8 +87,6 @@ in
         echo "ok" >&2
         exit 0
       fi
-
-      set -e
     '';
 
   };