Use the "assertions" option instead of mkAssert

2 files changed, 20 insertions, 14 deletions

diff --git a/nixos/modules/services/databases/4store-endpoint.nix b/nixos/modules/services/databases/4store-endpoint.nix
index 7b03b4d8f1dc..7872ea2dc6a3 100644
--- a/nixos/modules/services/databases/4store-endpoint.nix
+++ b/nixos/modules/services/databases/4store-endpoint.nix
@@ -24,12 +24,12 @@ with pkgs.lib;
       };
 
       listenAddress = mkOption {
-	default = null;
+        default = null;
         description = "IP address to listen on.";
       };
 
       port = mkOption {
-	default = 8080;
+        default = 8080;
         description = "port to listen on.";
       };
 
@@ -45,9 +45,12 @@ with pkgs.lib;
 
   ###### implementation
 
-  config = mkIf cfg.enable (
-    mkAssert (cfg.enable -> cfg.database != "")
-      "Must specify database name" {
+  config = mkIf cfg.enable {
+
+    assertions = singleton
+      { assertion = cfg.enable -> cfg.database != "";
+        message = "Must specify 4Store database name";
+      };
 
     users.extraUsers = singleton
       { name = endpointUser;
@@ -63,10 +66,10 @@ with pkgs.lib;
       startOn = "filesystem";
 
       exec = ''
-	${run} '${pkgs.rdf4store}/bin/4s-httpd -D ${cfg.options} ${if cfg.listenAddress!=null then "-H ${cfg.listenAddress}" else "" } -p ${toString cfg.port} ${cfg.database}'
+        ${run} '${pkgs.rdf4store}/bin/4s-httpd -D ${cfg.options} ${if cfg.listenAddress!=null then "-H ${cfg.listenAddress}" else "" } -p ${toString cfg.port} ${cfg.database}'
       '';
     };
 
-  });
+  };
 
 }
diff --git a/nixos/modules/services/databases/4store.nix b/nixos/modules/services/databases/4store.nix
index 14990e92ea30..412d14b050cb 100644
--- a/nixos/modules/services/databases/4store.nix
+++ b/nixos/modules/services/databases/4store.nix
@@ -36,9 +36,12 @@ with pkgs.lib;
 
   ###### implementation
 
-  config = mkIf cfg.enable (
-    mkAssert (cfg.enable -> cfg.database != "")
-      "Must specify database name" {
+  config = mkIf cfg.enable {
+
+    assertions = singleton
+      { assertion = cfg.enable -> cfg.database != "";
+        message = "Must specify 4Store database name.";
+      };
 
     users.extraUsers = singleton
       { name = fourStoreUser;
@@ -56,16 +59,16 @@ with pkgs.lib;
       preStart = ''
         mkdir -p ${stateDir}/
         chown ${fourStoreUser} ${stateDir}
-	if ! test -e "${stateDir}/${cfg.database}"; then
-	  ${run} -c '${pkgs.rdf4store}/bin/4s-backend-setup ${cfg.database}'
+        if ! test -e "${stateDir}/${cfg.database}"; then
+          ${run} -c '${pkgs.rdf4store}/bin/4s-backend-setup ${cfg.database}'
         fi
       '';
 
       exec = ''
-	${run} -c '${pkgs.rdf4store}/bin/4s-backend -D ${cfg.options} ${cfg.database}'
+        ${run} -c '${pkgs.rdf4store}/bin/4s-backend -D ${cfg.options} ${cfg.database}'
       '';
     };
 
-  });
+  };
 
 }