feat: inital support for x86_64-linux

foundation/default.nix

@@ -4,11 +4,7 @@
   modules = import ./src;
 
   result = lib.modules.run {
-    modules =
+    modules = (builtins.attrValues modules) ++ [{config.aux.system = system;}];
-      (builtins.attrValues modules)
-      ++ [
-        {config.aux.system = system;}
-      ];
   };
 in
   result.config.exports.resolved.packages

foundation/flake.lock

@@ -3,10 +3,10 @@
     "lib": {
       "locked": {
         "dir": "lib",
-        "dirtyRev": "f24f0876a9103c7adb8120ce9709fb90c73f2a7c-dirty",
+        "dirtyRev": "856b88321e5f19019332f8b60b729095c2260340-dirty",
-        "dirtyShortRev": "f24f087-dirty",
+        "dirtyShortRev": "856b883-dirty",
-        "lastModified": 1718105966,
+        "lastModified": 1718299377,
-        "narHash": "sha256-L68G29+bPmwZSERg3VYXdfont/w+mssmWnrs6tyBijk=",
+        "narHash": "sha256-qsSV+ty3XdEOlxJr5/1ZGheyjDAIu3xWtFxVs1+rDKA=",
         "type": "git",
         "url": "file:../?dir=lib"
       },

foundation/flake.nix

@@ -14,24 +14,18 @@
 
     forEachSystem = lib.attrs.generate [
       "i686-linux"
+      "x86_64-linux"
     ];
   in {
     extras = let
-      result = lib.modules.run {
+      result = lib.modules.run {modules = builtins.attrValues modules;};
-        modules =
-          builtins.attrValues modules;
-      };
     in
       result.config.exports.resolved.extras;
 
     packages = forEachSystem (
       system: let
         result = lib.modules.run {
-          modules =
+          modules = (builtins.attrValues modules) ++ [{config.aux.system = system;}];
-            (builtins.attrValues modules)
-            ++ [
-              {config.aux.system = system;}
-            ];
         };
       in
         result.config.exports.resolved.packages

foundation/src/stages/stage0/architecture/default.nix

@@ -2,7 +2,7 @@
   lib,
   config,
 }: let
-  system = config.aux.system;
+  inherit (config.aux) system;
 
   architecture =
     if system == "x86_64-linux"

foundation/src/stages/stage0/kaem/default.nix

@@ -35,7 +35,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 
@@ -47,7 +50,8 @@ in {
 
   config = {
     aux.foundation.stages.stage0.kaem = {
-      package = lib.modules.overrides.default (builders.raw.build {
+      package = lib.modules.overrides.default (
+        builders.raw.build {
           pname = "kaem";
           version = "1.6.0";
 
@@ -64,7 +68,8 @@ in {
 
           kaemUnwrapped = kaem-unwrapped.package;
           PATH = lib.paths.bin [mescc-tools-extra.package];
-      });
+        }
+      );
     };
   };
 }

foundation/src/stages/stage0/mescc-tools-extra/default.nix

@@ -43,7 +43,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 
@@ -55,7 +58,8 @@ in {
 
   config = {
     aux.foundation.stages.stage0.mescc-tools-extra = {
-      package = lib.modules.overrides.default (builders.raw.build {
+      package = lib.modules.overrides.default (
+        builders.raw.build {
           pname = "mescc-tools-tools";
           version = "1.6.0";
 
@@ -75,7 +79,8 @@ in {
           m2libcOS = "linux";
           m2libcArch = architecture.m2libc;
           mesccTools = mescc-tools.package;
-      });
+        }
+      );
     };
   };
 }

foundation/src/stages/stage0/mescc-tools/default.nix

@@ -129,7 +129,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 
@@ -141,7 +144,8 @@ in {
 
   config = {
     aux.foundation.stages.stage0.mescc-tools = {
-      package = lib.modules.overrides.default (builders.raw.build {
+      package = lib.modules.overrides.default (
+        builders.raw.build {
           pname = "mescc-tools";
           version = "1.6.0";
 
@@ -176,7 +180,8 @@ in {
           cp = getExtraUtil "cp";
           chmod = getExtraUtil "chmod";
           replace = getExtraUtil "replace";
-      });
+        }
+      );
     };
   };
 }

foundation/src/stages/stage0/phases/phase00.nix

@@ -41,7 +41,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 
@@ -66,7 +69,8 @@ in {
 
   config = {
     aux.foundation.stages.stage0.hex0 = {
-      package = lib.modules.overrides.default (builders.raw.build {
+      package = lib.modules.overrides.default (
+        builders.raw.build {
           pname = "hex0";
           version = "1.6.0";
 
@@ -82,7 +86,8 @@ in {
           outputHashMode = "recursive";
           outputHashAlgo = "sha256";
           outputHash = cfg.hash;
-      });
+        }
+      );
 
       hash = lib.modules.overrides.default (
         if system == "x86_64-linux"
@@ -94,12 +99,14 @@ in {
         else null
       );
 
-      executable = lib.modules.overrides.default (import <nix/fetchurl.nix> {
+      executable = lib.modules.overrides.default (
+        import <nix/fetchurl.nix> {
           name = "hex0-seed";
           url = "https://github.com/oriansj/bootstrap-seeds/raw/b1263ff14a17835f4d12539226208c426ced4fba/POSIX/${architecture}/hex0-seed";
           executable = true;
           hash = cfg.hash;
-      });
+        }
+      );
     };
   };
 }

foundation/src/stages/stage0/phases/phase01.nix

@@ -34,7 +34,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 
@@ -46,7 +49,8 @@ in {
 
   config = {
     aux.foundation.stages.stage0.hex1 = {
-      package = lib.modules.overrides.default (builders.raw.build {
+      package = lib.modules.overrides.default (
+        builders.raw.build {
           pname = "hex1";
           version = "1.6.0";
 
@@ -58,7 +62,8 @@ in {
             "${sources.base}/hex1_${architecture.base}.hex0"
             (builtins.placeholder "out")
           ];
-      });
+        }
+      );
     };
   };
 }

foundation/src/stages/stage0/phases/phase02.nix

@@ -35,7 +35,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 
@@ -47,7 +50,8 @@ in {
 
   config = {
     aux.foundation.stages.stage0.hex2-0 = {
-      package = lib.modules.overrides.default (builders.raw.build {
+      package = lib.modules.overrides.default (
+        builders.raw.build {
           pname = "hex2-0";
           version = "1.6.0";
 
@@ -59,7 +63,8 @@ in {
             "${sources.base}/hex2_${architecture.base}.hex1"
             (builtins.placeholder "out")
           ];
-      });
+        }
+      );
     };
   };
 }

foundation/src/stages/stage0/phases/phase03.nix

@@ -36,7 +36,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 
@@ -48,7 +51,8 @@ in {
 
   config = {
     aux.foundation.stages.stage0.catm = {
-      package = lib.modules.overrides.default (builders.raw.build {
+      package = lib.modules.overrides.default (
+        builders.raw.build {
           pname = "catm";
           version = "1.6.0";
 
@@ -69,7 +73,8 @@ in {
               "${sources.base}/catm_${architecture.base}.hex2"
               (builtins.placeholder "out")
             ];
-      });
+        }
+      );
     };
   };
 }

foundation/src/stages/stage0/phases/phase04.nix

@@ -36,7 +36,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 
@@ -48,7 +51,8 @@ in {
 
   config = {
     aux.foundation.stages.stage0.M0 = {
-      package = lib.modules.overrides.default (builders.raw.build {
+      package = lib.modules.overrides.default (
+        builders.raw.build {
           pname = "M0";
           version = "1.6.0";
 
@@ -75,7 +79,8 @@ in {
             M0_hex2-0
             (builtins.placeholder "out")
           ];
-      });
+        }
+      );
     };
   };
 }

foundation/src/stages/stage0/phases/phase05.nix

@@ -37,7 +37,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 
@@ -49,7 +52,8 @@ in {
 
   config = {
     aux.foundation.stages.stage0.cc_arch = {
-      package = lib.modules.overrides.default (builders.raw.build {
+      package = lib.modules.overrides.default (
+        builders.raw.build {
           pname = "cc_arch";
           version = "1.6.0";
 
@@ -89,7 +93,8 @@ in {
             cc_arch1_hex2-0
             (builtins.placeholder "out")
           ];
-      });
+        }
+      );
     };
   };
 }

foundation/src/stages/stage0/phases/phase06.nix

@@ -38,7 +38,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 
@@ -50,7 +53,8 @@ in {
 
   config = {
     aux.foundation.stages.stage0.M2 = {
-      package = lib.modules.overrides.default (builders.raw.build {
+      package = lib.modules.overrides.default (
+        builders.raw.build {
           pname = "M2";
           version = "1.6.0";
 
@@ -140,7 +144,8 @@ in {
             M2_hex2-0'
             (builtins.placeholder "out")
           ];
-      });
+        }
+      );
     };
   };
 }

foundation/src/stages/stage0/phases/phase07.nix

@@ -39,7 +39,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 
@@ -51,7 +54,8 @@ in {
 
   config = {
     aux.foundation.stages.stage0.blood-elf = {
-      package = lib.modules.overrides.default (builders.raw.build {
+      package = lib.modules.overrides.default (
+        builders.raw.build {
           pname = "blood-elf";
           version = "1.6.0";
 
@@ -130,7 +134,8 @@ in {
             blood-elf_hex2-0'
             (builtins.placeholder "out")
           ];
-      });
+        }
+      );
     };
   };
 }

foundation/src/stages/stage0/phases/phase08.nix

@@ -40,7 +40,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 
@@ -52,7 +55,8 @@ in {
 
   config = {
     aux.foundation.stages.stage0.M1-0 = {
-      package = lib.modules.overrides.default (builders.raw.build {
+      package = lib.modules.overrides.default (
+        builders.raw.build {
           pname = "M1-0";
           version = "1.6.0";
 
@@ -155,7 +159,8 @@ in {
             M1-macro-0_hex2-0'
             (builtins.placeholder "out")
           ];
-      });
+        }
+      );
     };
   };
 }

foundation/src/stages/stage0/phases/phase09.nix

@@ -41,7 +41,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 
@@ -53,7 +56,8 @@ in {
 
   config = {
     aux.foundation.stages.stage0.hex2-1 = {
-      package = lib.modules.overrides.default (builders.raw.build {
+      package = lib.modules.overrides.default (
+        builders.raw.build {
           pname = "hex2-1";
           version = "1.6.0";
 
@@ -174,7 +178,8 @@ in {
             hex2_linker_hex2'
             (builtins.placeholder "out")
           ];
-      });
+        }
+      );
     };
   };
 }

foundation/src/stages/stage0/phases/phase10.nix

@@ -42,7 +42,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 
@@ -54,7 +57,8 @@ in {
 
   config = {
     aux.foundation.stages.stage0.M1 = {
-      package = lib.modules.overrides.default (builders.raw.build {
+      package = lib.modules.overrides.default (
+        builders.raw.build {
           pname = "M1";
           version = "1.6.0";
 
@@ -180,7 +184,8 @@ in {
             "-o"
             (builtins.placeholder "out")
           ];
-      });
+        }
+      );
     };
   };
 }

foundation/src/stages/stage0/phases/phase11.nix

@@ -41,7 +41,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 
@@ -53,7 +56,8 @@ in {
 
   config = {
     aux.foundation.stages.stage0.hex2 = {
-      package = lib.modules.overrides.default (builders.raw.build {
+      package = lib.modules.overrides.default (
+        builders.raw.build {
           pname = "hex2";
           version = "1.6.0";
 
@@ -181,7 +185,8 @@ in {
             "-o"
             (builtins.placeholder "out")
           ];
-      });
+        }
+      );
     };
   };
 }

foundation/src/stages/stage0/phases/phase12.nix

@@ -41,7 +41,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 
@@ -53,7 +56,8 @@ in {
 
   config = {
     aux.foundation.stages.stage0.kaem-unwrapped = {
-      package = lib.modules.overrides.default (builders.raw.build {
+      package = lib.modules.overrides.default (
+        builders.raw.build {
           pname = "kaem-unwrapped";
           version = "1.6.0";
 
@@ -183,7 +187,8 @@ in {
             "-o"
             (builtins.placeholder "out")
           ];
-      });
+        }
+      );
     };
   };
 }

foundation/src/stages/stage1/bash/boot.nix

@@ -32,7 +32,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/bash/default.nix

@@ -9,9 +9,7 @@
 
   stage1 = config.aux.foundation.stages.stage1;
 in {
-  includes = [
+  includes = [./boot.nix];
-    ./boot.nix
-  ];
 
   options.aux.foundation.stages.stage1.bash = {
     meta = {
@@ -37,7 +35,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
 
       mainProgram = lib.options.create {

foundation/src/stages/stage1/binutils/default.nix

@@ -33,7 +33,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/bison/default.nix

@@ -33,7 +33,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/bzip2/default.nix

@@ -34,7 +34,10 @@ in {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
         # TODO: Support more platforms.
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/coreutils/default.nix

@@ -9,9 +9,7 @@
 
   stage1 = config.aux.foundation.stages.stage1;
 in {
-  includes = [
+  includes = [./boot.nix];
-    ./boot.nix
-  ];
 
   options.aux.foundation.stages.stage1.coreutils = {
     meta = {
@@ -37,7 +35,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/diffutils/default.nix

@@ -33,7 +33,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/findutils/default.nix

@@ -33,7 +33,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/gawk/default.nix

@@ -9,9 +9,7 @@
 
   stage1 = config.aux.foundation.stages.stage1;
 in {
-  includes = [
+  includes = [./boot.nix];
-    ./boot.nix
-  ];
 
   options.aux.foundation.stages.stage1.gawk = {
     meta = {
@@ -37,7 +35,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
 
       mainProgram = lib.options.create {

foundation/src/stages/stage1/gcc/default.nix

@@ -39,7 +39,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/gnugrep/default.nix

@@ -32,7 +32,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
 
       mainProgram = lib.options.create {

foundation/src/stages/stage1/gnum4/default.nix

@@ -33,7 +33,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/gnumake/default.nix

@@ -9,9 +9,7 @@
 
   stage1 = config.aux.foundation.stages.stage1;
 in {
-  includes = [
+  includes = [./boot.nix];
-    ./boot.nix
-  ];
 
   options.aux.foundation.stages.stage1.gnumake = {
     meta = {
@@ -37,7 +35,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/gnupatch/default.nix

@@ -32,7 +32,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -118,13 +121,8 @@ in {
           ];
 
         objects =
-          builtins.map
+          builtins.map (
-          (
+            value: builtins.replaceStrings [".c"] [".o"] (builtins.baseNameOf value)
-            value:
-              builtins.replaceStrings
-              [".c"]
-              [".o"]
-              (builtins.baseNameOf value)
           )
           sources;
       in
@@ -134,9 +132,7 @@ in {
           meta = cfg.meta;
           src = cfg.src;
 
-          deps.build.host = [
+          deps.build.host = [stage1.tinycc.mes.compiler.package];
-            stage1.tinycc.mes.compiler.package
-          ];
 
           script = ''
             # Unpack

foundation/src/stages/stage1/gnused/default.nix

@@ -9,9 +9,7 @@
 
   stage1 = config.aux.foundation.stages.stage1;
 in {
-  includes = [
+  includes = [./boot.nix];
-    ./boot.nix
-  ];
 
   options.aux.foundation.stages.stage1.gnused = {
     meta = {
@@ -37,7 +35,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
 
       mainProgram = lib.options.create {

foundation/src/stages/stage1/gnutar/default.nix

@@ -38,7 +38,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
 
       mainProgram = lib.options.create {

foundation/src/stages/stage1/gzip/default.nix

@@ -32,7 +32,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/heirloom/default.nix

@@ -10,9 +10,7 @@
   stage1 = config.aux.foundation.stages.stage1;
   stage2 = config.aux.foundation.stages.stage2;
 in {
-  includes = [
+  includes = [./devtools.nix];
-    ./devtools.nix
-  ];
 
   options.aux.foundation.stages.stage1.heirloom = {
     meta = {
@@ -48,7 +46,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/heirloom/devtools.nix

@@ -54,7 +54,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
   };

foundation/src/stages/stage1/linux-headers/default.nix

@@ -27,7 +27,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/ln-boot/default.nix

@@ -33,7 +33,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/mes/compiler.nix

@@ -34,7 +34,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -79,11 +82,9 @@ in {
 
         sources = import ./sources.nix;
 
-        files =
+        files = lib.strings.concatMapSep " " (getSourcePath ".o") (
-          lib.strings.concatMapSep
+          builtins.map compile sources.x86.linux.mescc.mes
-          " "
+        );
-          (getSourcePath ".o")
-          (builtins.map compile sources.x86.linux.mescc.mes);
       in
         builders.kaem.build {
           name = "mes-${stage1.mes.version}";

foundation/src/stages/stage1/mes/libc.nix

@@ -32,7 +32,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -57,9 +60,7 @@ in {
 
           meta = cfg.meta;
 
-          deps.build.host = [
+          deps.build.host = [stage1.ln-boot.package];
-            stage1.ln-boot.package
-          ];
 
           script = ''
             cd ${stage1.mes.libs.prefix}

foundation/src/stages/stage1/mes/libs.nix

@@ -34,7 +34,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 
@@ -199,11 +202,13 @@ in {
         libc-mini = createLib "libc-mini" sources.x86.linux.mescc.libc_mini;
         libmescc = createLib "libmescc" sources.x86.linux.mescc.libmescc;
         libc = createLib "libc" sources.x86.linux.mescc.libc;
-        libc_tcc = createLib "libc+tcc" (sources.x86.linux.mescc.libc_tcc
+        libc_tcc = createLib "libc+tcc" (
+          sources.x86.linux.mescc.libc_tcc
           ++ [
             # We need `symlink` support for `ln-boot` to work.
             "lib/linux/symlink.c"
-          ]);
+          ]
+        );
       in
         builders.kaem.build {
           name = "mes-m2-libs-${stage1.mes.version}";

foundation/src/stages/stage1/musl/boot.nix

@@ -131,7 +131,6 @@ in {
             # Install
             make install
             cp ${stage1.tinycc.mes.libs.package}/lib/libtcc1.a $out/lib
-
           '';
         };
     };

foundation/src/stages/stage1/musl/default.nix

@@ -9,9 +9,7 @@
 
   stage1 = config.aux.foundation.stages.stage1;
 in {
-  includes = [
+  includes = [./boot.nix];
-    ./boot.nix
-  ];
 
   options.aux.foundation.stages.stage1.musl = {
     meta = {
@@ -38,7 +36,10 @@ in {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
         # TODO: Support more platforms.
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86-64_linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/nyacc/default.nix

@@ -35,7 +35,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/python/default.nix

@@ -33,7 +33,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "i686-linux"
+          "x86_64-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/tinycc/default.nix

@@ -38,7 +38,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/xz/default.nix

@@ -36,7 +36,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 

foundation/src/stages/stage1/zlib/default.nix

@@ -33,7 +33,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 

foundation/src/stages/stage2/bash/default.nix

@@ -33,7 +33,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
 
       mainProgram = lib.options.create {

foundation/src/stages/stage2/binutils/default.nix

@@ -33,7 +33,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 

foundation/src/stages/stage2/busybox/default.nix

@@ -34,7 +34,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 
@@ -64,9 +67,7 @@ in {
       };
 
       package = let
-        patches = [
+        patches = [./patches/busybox-in-store.patch];
-          ./patches/busybox-in-store.patch
-        ];
 
         busyboxConfig = [
           "CC=musl-gcc"

foundation/src/stages/stage2/bzip2/default.nix

@@ -34,7 +34,10 @@ in {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
         # TODO: Support more platforms.
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 

foundation/src/stages/stage2/coreutils/default.nix

@@ -33,7 +33,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 

foundation/src/stages/stage2/diffutils/default.nix

@@ -33,7 +33,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 

foundation/src/stages/stage2/findutils/default.nix

@@ -33,7 +33,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 

foundation/src/stages/stage2/gawk/default.nix

@@ -33,7 +33,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
 
       mainProgram = lib.options.create {

foundation/src/stages/stage2/gcc/default.nix

@@ -33,7 +33,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 

foundation/src/stages/stage2/glibc/default.nix

@@ -34,7 +34,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 

foundation/src/stages/stage2/gnugrep/default.nix

@@ -33,7 +33,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
 
       mainProgram = lib.options.create {

foundation/src/stages/stage2/gnumake/default.nix

@@ -34,7 +34,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 

foundation/src/stages/stage2/gnupatch/default.nix

@@ -33,7 +33,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 

foundation/src/stages/stage2/gnused/default.nix

@@ -33,7 +33,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
 
       mainProgram = lib.options.create {

foundation/src/stages/stage2/gnutar/default.nix

@@ -33,7 +33,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
 
       mainProgram = lib.options.create {

foundation/src/stages/stage2/gzip/default.nix

@@ -33,7 +33,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 

foundation/src/stages/stage2/patchelf/default.nix

@@ -34,7 +34,10 @@ in {
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = ["i686-linux"];
+        default.value = [
+          "x86_64-linux"
+          "i686-linux"
+        ];
       };
     };
 

foundation/src/system/default.nix

@@ -2,7 +2,7 @@
   options.aux = {
     system = lib.options.create {
       type = lib.types.string;
-      default.value = "i686-linux";
+      default.value = "x86_64-linux";
       description = ''
         The system to build packages for. This value can be provided as either
         `config.aux.system` or by setting the `system` argument for modules.

lib/src/modules/default.nix

@@ -187,7 +187,7 @@ lib: {
         in
           withFreeform (withMeta base);
       }
-      else builtins.throw "Module `${key}` has unsupported attribute(s): ${invalidKeys}";
+      else builtins.throw "Module `${key}` (${file}) has unsupported attribute(s): ${invalidKeys}";
 
     ## Convert a module that is either a function or an attribute set into
     ## a resolved attribute set. If the module was a function then it will
@@ -428,7 +428,7 @@ lib: {
                   matched = lib.options.run location option definitions';
                   unmatched = [];
                 }
-                else builtins.throw "The option `${lib.options.getIdentifier location}` in module `${(builtins.head optionDeclarations).__file__}` does not support nested options."
+                else builtins.throw "The option `${lib.options.getIdentifier location}` in module `${(builtins.head optionDeclarations).__file__}` would be a parent of the following options, but its type `${(builtins.head optionDeclarations).options.type.description or "<no description>"}` does not support nested options."
               else process location declarations definitions
           )
           declarationsByName;
@@ -611,7 +611,7 @@ lib: {
         collected =
           collect
           (args.path or "")
-          (modules ++ [internal])
+          ([internal] ++ modules)
           (
             {
               inherit options config;
@@ -625,7 +625,8 @@ lib: {
             // args
           );
       in
-        lib.modules.combine prefix (lib.lists.reverse collected);
+        lib.modules.combine
+        prefix (lib.lists.reverse collected);
 
       options = merged.matched;
 

lib/src/modules/default.test.nix

@@ -423,5 +423,36 @@ in {
       };
     in
       evaluated.config.aux.message == expected;
+
+    "submodules" = let
+      expected = "Hello, World!";
+      evaluated = lib.modules.run {
+        modules = [
+          {
+            options = {
+              aux = lib.options.create {
+                default.value = {
+                  message = "hi";
+                };
+                type = lib.types.attrs.of (lib.types.submodule ({name}: {
+                  # freeform = lib.types.any;
+                  options.message = lib.options.create {
+                    type = lib.types.string;
+                  };
+                }));
+              };
+            };
+            config = {
+              aux = {
+                x = {
+                  message = "Hello, World!";
+                };
+              };
+            };
+          }
+        ];
+      };
+    in
+      evaluated.config.aux.x.message == expected;
   };
 }

lib/src/types/default.nix

@@ -750,7 +750,13 @@ lib: {
         description ? null,
       }: let
         getModules = builtins.map (
-          definition: {
+          definition:
+            if builtins.isAttrs definition
+            then {
+              __file__ = definition.__file__;
+              config = definition.value;
+            }
+            else {
               __file__ = definition.__file__;
               includes = [definition.value];
             }
@@ -762,9 +768,6 @@ lib: {
           modules =
             [
               {
-                options.__module__.args.dynamic.name = lib.options.create {
-                  type = lib.types.string;
-                };
                 config.__module__.args.dynamic.name = lib.modules.overrides.default "<name>";
               }
             ]
@@ -989,7 +992,7 @@ lib: {
     ## @type List Attrs -> Attrs
     one = types: let
       first = builtins.elemAt types 0;
-      rest = lib.lists.tail types;
+      rest = builtins.tail types;
     in
       if types == []
       then builtins.throw "lib.types.one must be given at least one type"

potluck/default.nix

@@ -10,21 +10,24 @@
       ++ [
         ./src/export.nix
         {
-          __file__ = ./default.nix;
+          __file__ = "broken";
 
-          options.packages.aux = {
+          # options.foundation = lib.options.create {
-            foundation = lib.options.create {
+          #   type = lib.types.attrs.of lib.types.derivation;
-              type = lib.types.attrs.of lib.types.package;
+          # };
-              internal = true;
-              description = "The foundational packages used to construct the larger package set.";
-            };
-          };
 
-          config.packages.aux = {
+          # config.foundation = foundation;
-            foundation = foundation;
+          config.packages.foundation =
-          };
+            builtins.mapAttrs (name: package: {
+              name = package.name;
+
+              inherit package;
+
+              meta = package.meta;
+            })
+            foundation;
         }
       ];
   };
 in
-  result.config.exported
+  result.config

potluck/flake.lock

@@ -8,10 +8,10 @@
       },
       "locked": {
         "dir": "foundation",
-        "dirtyRev": "cd12786be17a611976b44fbba3e245eca512535f-dirty",
+        "dirtyRev": "9c29945531c58ad81f05cd1f4958c8894a733216-dirty",
-        "dirtyShortRev": "cd12786-dirty",
+        "dirtyShortRev": "9c29945-dirty",
-        "lastModified": 1718199069,
+        "lastModified": 1718255029,
-        "narHash": "sha256-H2Mkyp9BPDPte+E++uIG2N/vGtcS3H9Q7tM3fOOEXT0=",
+        "narHash": "sha256-fmrDe4GfvVfXZ9lzaOt+tgBUMFCsyKr0Dlnm8aQwAXs=",
         "type": "git",
         "url": "file:../?dir=foundation"
       },
@@ -24,10 +24,10 @@
     "lib": {
       "locked": {
         "dir": "lib",
-        "dirtyRev": "cd12786be17a611976b44fbba3e245eca512535f-dirty",
+        "dirtyRev": "9c29945531c58ad81f05cd1f4958c8894a733216-dirty",
-        "dirtyShortRev": "cd12786-dirty",
+        "dirtyShortRev": "9c29945-dirty",
-        "lastModified": 1718199069,
+        "lastModified": 1718255029,
-        "narHash": "sha256-H2Mkyp9BPDPte+E++uIG2N/vGtcS3H9Q7tM3fOOEXT0=",
+        "narHash": "sha256-fmrDe4GfvVfXZ9lzaOt+tgBUMFCsyKr0Dlnm8aQwAXs=",
         "type": "git",
         "url": "file:../?dir=lib"
       },

potluck/src/exports/modules.nix

@@ -2,7 +2,7 @@
   lib,
   config,
 }: let
-  cfg = config.exports.modules;
+  cfg = config.exports;
 
   type = lib.types.one [
     lib.types.path

potluck/src/exports/packages.nix

@@ -2,6 +2,7 @@
   config,
   lib,
 }: let
+  lib' = config.lib;
 in {
   options = {
     exports.packages = lib.options.create {
@@ -14,6 +15,8 @@ in {
   };
 
   config = {
-    exported.packages = {};
+    exported.packages = {
+      # i686-linux = config.packages.foundation;
+    };
   };
 }

potluck/src/lib/types.nix

@@ -107,7 +107,164 @@ in {
         };
       };
 
-      package = lib.types.submodule ({config}: {
+      package = {
+        base = lib.types.submodule ({config}: {
+          freeform = lib.types.any;
+
+          options = {
+            name = lib.options.create {
+              type = lib.types.string;
+              default = {
+                value = "${config.pname}-${config.version or "unknown"}";
+                text = "\${config.pname}-\${config.version}";
+              };
+              description = "The name of the package.";
+            };
+
+            pname = lib.options.create {
+              type = lib.types.nullish lib.types.string;
+              default.value = null;
+              description = "The name of the package.";
+            };
+
+            version = lib.options.create {
+              type = lib.types.nullish lib.types.string;
+              default.value = null;
+              description = "The version of the package.";
+            };
+
+            meta = lib.options.create {
+              type = lib'.types.meta;
+              default = {
+                text = "{ name = <package>.pname; }";
+                value = {
+                  name = config.pname;
+                };
+              };
+              description = "The metadata for the package.";
+            };
+
+            env = lib.options.create {
+              type = lib.types.attrs.of lib.types.string;
+              default.value = {};
+              description = "Environment variables for the package's builder to use.";
+            };
+
+            phases = lib.options.create {
+              type = lib.types.dag.of (
+                lib.types.either
+                lib.types.string
+                (lib.types.function lib.types.string)
+              );
+              default.value = {};
+              description = "Phases for the package's builder to use.";
+            };
+
+            platform = {
+              build = lib.options.create {
+                type = lib.types.nullish lib.types.string;
+                default.value = null;
+                description = "The platform the package is built on.";
+              };
+
+              host = lib.options.create {
+                type = lib.types.nullish lib.types.string;
+                default.value = null;
+                description = "The platform the package is run on.";
+              };
+
+              target = lib.options.create {
+                type = lib.types.nullish lib.types.string;
+                default.value = null;
+                description = "The platform the package generates code for.";
+              };
+            };
+
+            builder = lib.options.create {
+              type = lib'.types.builder;
+              description = "The builder for the package.";
+            };
+
+            package = lib.options.create {
+              type = lib.types.derivation;
+              default = {
+                value = config.builder.build config.builder config;
+                text = "<derivation>";
+              };
+              description = "The package derivation.";
+            };
+
+            deps = {
+              build = {
+                only = lib.options.create {
+                  type = lib'.types.dependencies;
+                  default.value = {};
+                  description = "Dependencies which are only used in the build environment.";
+                };
+
+                build = lib.options.create {
+                  type = lib'.types.dependencies;
+                  default.value = {};
+                  description = "Dependencies which are created in the build environment and are run in the build environment.";
+                };
+
+                host = lib.options.create {
+                  type = lib'.types.dependencies;
+                  default.value = {};
+                  description = "Dependencies which are created in the build environment and are run in the host environment.";
+                };
+
+                target = lib.options.create {
+                  type = lib'.types.dependencies;
+                  default.value = {};
+                  description = "Dependencies which are created in the build environment and are run in the target environment.";
+                };
+              };
+
+              host = {
+                only = lib.options.create {
+                  type = lib'.types.dependencies;
+                  default.value = {};
+                  description = "Dependencies which are only used in the host environment.";
+                };
+
+                host = lib.options.create {
+                  type = lib'.types.dependencies;
+                  default.value = {};
+                  description = "Dependencies which are run in the host environment.";
+                };
+
+                target = lib.options.create {
+                  type = lib'.types.dependencies;
+                  default.value = {};
+                  description = "Dependencies which are run in the host environment which produces code for the target environment.";
+                };
+              };
+
+              target = {
+                only = lib.options.create {
+                  type = lib'.types.dependencies;
+                  default.value = {};
+                  description = "Dependencies which are only used in the target environment.";
+                };
+
+                target = lib.options.create {
+                  type = lib'.types.dependencies;
+                  default.value = {};
+                  description = "Dependencies which are run in the target environment.";
+                };
+              };
+            };
+
+            versions = lib.options.create {
+              type = lib.types.attrs.of lib'.types.package;
+              default.value = {};
+              description = "Available versions of the package.";
+            };
+          };
+        });
+
+        targeted = lib.types.submodule ({config}: {
           freeform = lib.types.any;
 
           options = {
@@ -259,13 +416,46 @@ in {
             };
           };
         });
+      };
 
       dependencies = lib.types.attrs.of (lib.types.nullish lib'.types.package);
 
-      packages = lib.types.attrs.of (lib.types.submodule {
+      packages = {
-        freeform = lib.types.nullish lib'.types.package;
+        base = lib.types.attrs.of (lib.types.submodule {
+          freeform = lib'.types.package.base;
+
+          # options =
+          #   builtins.foldl' (result: system: {
+          #     "${system}" = lib.options.create {
+          #       type = lib'.types.packages.targeted;
+          #       default.value = {};
+          #       description = "Packages for the architecture `${system}`";
+          #     };
+          #   }) {}
+          #   lib'.systems.doubles.all;
         });
 
+        targeted = lib.types.attrs.of (lib.types.submodule {
+          freeform = lib.types.nullish lib'.types.package.targeted;
+
+          options = {
+            cross = lib.options.create {
+              type = lib'.types.packages.cross;
+              default.value = {};
+              description = "Cross-compiled packages targeting another architecture.";
+            };
+          };
+        });
+
+        # Cross-compiled packages are accessed via
+        # packages.cross.<platform>.<namespace>.<name>
+        cross = lib.types.attrs.of (lib.types.submodule {
+          freeform = lib.types.attrs.of (lib.types.submodule {
+            freeform = lib.types.nullish lib'.types.package.targeted;
+          });
+        });
+      };
+
       builder = lib.types.submodule {
         freeform = lib.types.any;
 

potluck/src/modules.nix

@@ -1,4 +1,5 @@
 {
   exports = ./exports;
   lib = ./lib;
+  packages = ./packages;
 }

potluck/src/packages/default.nix

@@ -3,19 +3,10 @@
   config,
 }: let
   lib' = config.lib;
-  # configure = namespace: packages:
+
-  #   builtins.mapAttrs
+  doubles = lib'.systems.doubles.all;
-  #   (key: package: let
+
-  #     name =
+  generic = builtins.removeAttrs config.packages ["targeted"];
-  #       if package.pname != null && package.version != null
-  #       then "${package.pname}-${package.version}"
-  #       else key;
-  #   in {
-  #     name = lib.modules.overrides.default name;
-  #     package = lib.modules.overrides.default (package.builder package);
-  #   })
-  #   packages;
-  # configs = builtins.mapAttrs configure config.packages;
 in {
   includes = [
     # ./aux/foundation.nix
@@ -23,9 +14,14 @@ in {
 
   options = {
     packages = lib.options.create {
-      type = lib'.types.packages;
+      default.value = {};
+      type = lib.types.attrs.of (lib.types.submodule {
+        freeform = lib.types.any;
+      });
     };
   };
 
-  # config = lib.modules.merge configs;
+  config = {
+    packages.targeted.i686-linux = generic;
+  };
 }