Revert "Module-builtin assertions, disabling assertions and submodule assertions"

2 files changed, 10 insertions, 15 deletions

diff --git a/nixos/modules/misc/assertions.nix b/nixos/modules/misc/assertions.nix
index d7cdb32491d..550b3ac97f6 100644
--- a/nixos/modules/misc/assertions.nix
+++ b/nixos/modules/misc/assertions.nix
@@ -1,4 +1,4 @@
-{ lib, config, ... }:
+{ lib, ... }:
 
 with lib;
 
@@ -30,18 +30,5 @@ with lib;
     };
 
   };
-
-  config._module.checks = lib.listToAttrs (lib.imap1 (n: value:
-    let
-      name = "_${toString n}";
-      isWarning = lib.isString value;
-      result = {
-        check = if isWarning then false else value.assertion;
-        type = if isWarning then "warning" else "error";
-        message = if isWarning then value else value.message;
-      };
-    in nameValuePair name result
-  ) (config.assertions ++ config.warnings));
-
   # impl of assertions is in <nixpkgs/nixos/modules/system/activation/top-level.nix>
 }
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 17b62ad9569..03d7e749323 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -117,10 +117,18 @@ let
     perl = "${pkgs.perl}/bin/perl " + (concatMapStringsSep " " (lib: "-I${lib}/${pkgs.perl.libPrefix}") (with pkgs.perlPackages; [ FileSlurp NetDBus XMLParser XMLTwig ]));
   };
 
+  # Handle assertions and warnings
+
+  failedAssertions = map (x: x.message) (filter (x: !x.assertion) config.assertions);
+
+  baseSystemAssertWarn = if failedAssertions != []
+    then throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failedAssertions)}"
+    else showWarnings config.warnings baseSystem;
+
   # Replace runtime dependencies
   system = fold ({ oldDependency, newDependency }: drv:
       pkgs.replaceDependency { inherit oldDependency newDependency drv; }
-    ) baseSystem config.system.replaceRuntimeDependencies;
+    ) baseSystemAssertWarn config.system.replaceRuntimeDependencies;
 
 in