lib.systems.parse: inherit verification functions

lib/systems/parse.nix

@@ -51,9 +51,12 @@ let
   setTypes =
     type:
     if type ? verify then
+      let
+        inherit (type) verify;
+      in
       mapAttrs (
         name: value:
-        assert type.verify value;
+        assert verify value;
         { inherit name; } // value
       )
     else
@@ -103,9 +106,13 @@ rec {
     name = "cpu-type";
     description = "instruction set architecture name and information";
     verify =
+      let
+        verifyBitWidth = types.bitWidth.verify;
+        verifySignificantByte = types.significantByte.verify;
+      in
       v:
-      types.bitWidth.verify v.bits
-      && (if 8 < v.bits then types.significantByte.verify v.significantByte else !(v ? significantByte));
+      verifyBitWidth v.bits
+      && (if 8 < v.bits then verifySignificantByte v.significantByte else !(v ? significantByte));
   };
 
   types.cpuType = enum (attrValues cpuTypes);
@@ -537,7 +544,11 @@ rec {
     name = "open-kernel";
     description = "kernel name and information";
     verify =
-      v: types.execFormat.verify v.execFormat && all types.kernelFamily.verify (attrValues v.families);
+      let
+        verifyExecFormat = types.execFormat.verify;
+        verifyKernelFamily = types.kernelFamily.verify;
+      in
+      v: verifyExecFormat v.execFormat && all verifyKernelFamily (attrValues v.families);
   };
 
   types.kernel = enum (attrValues kernels);
@@ -750,23 +761,29 @@ rec {
     name = "system";
     description = "fully parsed representation of llvm- or nix-style platform tuple";
     verify =
+      let
+        verifyCpu = types.cpuType.verify;
+        verifyVendor = types.vendor.verify;
+        verifyKernel = types.kernel.verify;
+        verifyAbi = types.abi.verify;
+      in
       {
         cpu,
         vendor,
         kernel,
         abi,
       }:
-      types.cpuType.verify cpu
-      && types.vendor.verify vendor
-      && types.kernel.verify kernel
-      && types.abi.verify abi;
+      verifyCpu cpu && verifyVendor vendor && verifyKernel kernel && verifyAbi abi;
   };
 
   isSystem = v: v._type or null == "system";
 
   mkSystem =
+    let
+      inherit (types.parsedPlatform) verify;
+    in
     components:
-    assert types.parsedPlatform.verify components;
+    assert verify components;
     components
     // {
       _type = "system";