refactor(format): apply formatting

foundation/flake.lock

@@ -3,10 +3,10 @@
     "lib": {
       "locked": {
         "dir": "lib",
-        "dirtyRev": "9850da8aa9dc9be22e237c9b424a18e801e53ecb-dirty",
-        "dirtyShortRev": "9850da8-dirty",
-        "lastModified": 1718529861,
-        "narHash": "sha256-tv/0C7ixH+9Ij+r+5nua48OlXXXnbdEsnenxX4eG/Sk=",
+        "dirtyRev": "2be3111b2c0911f40b47fe0a1fb22b5f5188cf59-dirty",
+        "dirtyShortRev": "2be3111-dirty",
+        "lastModified": 1719251485,
+        "narHash": "sha256-63NvfFVeTDITfNu60rmCUlaZtAeZUnvrIaOLSk9ScC8=",
         "type": "git",
         "url": "file:../?dir=lib"
       },

lib/src/options/default.nix

@@ -43,7 +43,7 @@ lib: {
           resolve =
             definition:
             let
-              properties = builtins.addErrorContext "while evaluating definitions from `${definition.__file__}`:" (
+              properties = builtins.addErrorContext "while evaluating definitions from `${definition.__file__ or "<unknown>"}`:" (
                 lib.modules.apply.properties definition.value
               );
               normalize = value: {

lib/src/types/default.nix

@@ -1100,6 +1100,43 @@ lib: {
           };
         };
 
+    ## Create a type that allows a value which is either the final type or is transformable
+    ## to the final type.
+    ##
+    ## @type Attrs -> (Any -> Any) -> Attrs -> Attrs
+    coerceWithLocation =
+      initial: transform: final:
+      let
+      in
+      if initial.getSubModules != null then
+        builtins.throw "lib.types.coerceWithLocation's first argument may not have submodules, but got ${initial.description}"
+      else
+        lib.types.create {
+          name = "Coerce";
+          description = "${initial.description} that is transformed to ${final.description}";
+          fallback = final.fallback;
+          check = value: final.check value || (initial.check value && final.check (transform [ ] value));
+          merge =
+            location: definitions:
+            let
+              process = value: if initial.check value then transform location value else value;
+              normalize = definition: definition // { value = process definition.value; };
+              normalized = builtins.map normalize definitions;
+            in
+            final.merge location normalized;
+          getSubOptions = final.getSubOptions;
+          getSubModules = final.getSubModules;
+          withSubModules =
+            modules: lib.types.coerceWithLocation initial transform (final.withSubModules modules);
+          mergeType = x: y: null;
+          functor = lib.types.functor "coerceWithLocation" // {
+            wrapped = final;
+          };
+          children = {
+            inherit initial final;
+          };
+        };
+
     dag = {
       ## Create a type that allows a DAG (Directed Acyclic Graph) of a given type.
       ##

tidepool/flake.lock

@@ -8,10 +8,10 @@
       },
       "locked": {
         "dir": "foundation",
-        "dirtyRev": "9850da8aa9dc9be22e237c9b424a18e801e53ecb-dirty",
-        "dirtyShortRev": "9850da8-dirty",
-        "lastModified": 1718529861,
-        "narHash": "sha256-X1Wd6mDz8GTaoxt1ylkvZfrJOcZtspJrEjXMtJ2ZyG0=",
+        "dirtyRev": "2be3111b2c0911f40b47fe0a1fb22b5f5188cf59-dirty",
+        "dirtyShortRev": "2be3111-dirty",
+        "lastModified": 1719251485,
+        "narHash": "sha256-9G1TPBdlQNXCZf6A66bCT9m2vhodkSF+rDtqOVuFteY=",
         "type": "git",
         "url": "file:../?dir=foundation"
       },
@@ -24,10 +24,10 @@
     "lib": {
       "locked": {
         "dir": "lib",
-        "dirtyRev": "9850da8aa9dc9be22e237c9b424a18e801e53ecb-dirty",
-        "dirtyShortRev": "9850da8-dirty",
-        "lastModified": 1718529861,
-        "narHash": "sha256-X1Wd6mDz8GTaoxt1ylkvZfrJOcZtspJrEjXMtJ2ZyG0=",
+        "dirtyRev": "2be3111b2c0911f40b47fe0a1fb22b5f5188cf59-dirty",
+        "dirtyShortRev": "2be3111-dirty",
+        "lastModified": 1719251485,
+        "narHash": "sha256-9G1TPBdlQNXCZf6A66bCT9m2vhodkSF+rDtqOVuFteY=",
         "type": "git",
         "url": "file:../?dir=lib"
       },

tidepool/src/builders/basic.nix

@@ -14,7 +14,17 @@ in
       build =
         package:
         let
-          phases = package.phases;
+          phases = lib.dag.apply.defaults package.phases {
+            unpack = lib.dag.entry.before [ "patch" ] "";
+
+            patch = lib.dag.entry.between [ "configure" ] [ "unpack" ] "";
+
+            configure = lib.dag.entry.between [ "build" ] [ "patch" ] "";
+
+            build = lib.dag.entry.between [ "install" ] [ "configure" ] "";
+
+            install = lib.dag.entry.after [ "build" ] "";
+          };
           sorted = lib.dag.sort.topographic phases;
 
           script = lib.strings.concatMapSep "\n" (
@@ -70,7 +80,13 @@ in
             }
           );
         in
-        built // { inherit (package) meta; };
+        built
+        // {
+          inherit (package) meta;
+          extras = {
+            inherit package;
+          };
+        };
     };
   };
 }

tidepool/src/export.nix

@@ -1,18 +1,20 @@
 # This file handles creating all of the exports for this project and is not
 # exported itself.
-{ lib, config }:
+{ config }:
 let
-  lib' = config.lib;
+  inherit (config) lib;
 in
 {
-  freeform = lib.types.any;
+  # freeform = lib.types.any;
 
   config = {
     exports = {
-      lib = config.lib;
+      inherit lib;
       modules = import ./modules.nix;
 
       packages = {
+        aux-a = config.packages.aux.a;
+
         # foundation-gcc-x86_64 =
         # (config.packages.foundation.gcc.versions."13.2.0".extend (args: {
         #   config = {
@@ -24,11 +26,13 @@ in
         # .config;
         foundation-gcc = config.packages.foundation.gcc;
         foundation-binutils = config.packages.foundation.binutils;
-        foundation-linux-headers = config.packages.foundation.linux-headers.versions.latest.extend {
-          platform.host = lib.modules.overrides.force "x86_64-linux";
-        };
+        foundation-linux-headers = config.packages.foundation.linux-headers;
+        # foundation-linux-headers = config.packages.foundation.linux-headers.versions.latest.extend {
+        #   platform.host = lib.modules.overrides.force "x86_64-linux";
+        # };
         # example-x = config.packages.example.x;
-        # cross-example-x-x86_64-linux = config.packages.cross.x86_64-linux.example.x;
+        cross-aux-a-x86_64-linux = config.packages.cross.x86_64-linux.aux.a;
+        cross-foundation-gcc-x86_64-linux = config.packages.cross.x86_64-linux.foundation.gcc;
       };
     };
 

tidepool/src/lib/options.nix

@@ -5,7 +5,7 @@ in
   config = {
     lib.options = {
       package = lib.options.create {
-        type = config.lib.types.package;
+        type = config.lib.types.package.base;
         description = "A package definition.";
       };
     };

tidepool/src/lib/packages.nix

@@ -1,8 +1,7 @@
-{
-  lib,
-  lib',
-  config,
-}:
+{ lib, config }:
+let
+  lib' = config.lib;
+in
 {
   config = {
     lib.packages = {
@@ -15,6 +14,10 @@
             );
           in
           builtins.map (dependency: dependency.package) available;
+
+        build =
+          build': host': target':
+          builtins.mapAttrs (name: dep: lib'.packages.build dep build' host' target');
       };
 
       getLatest =
@@ -25,54 +28,89 @@
         in
         builtins.head sorted;
 
-      build =
-        package: build: host: target:
-        let
-          resolved =
-            if package ? versions then
-              package.versions.${config.preferences.packages.version}
-                or (package.versions.${lib'.packages.getLatest package})
+      resolve =
+        alias:
+        if alias ? versions then
+          alias.versions.${config.preferences.packages.version}
+            or (alias.versions.${lib'.packages.getLatest alias})
         else
-              package;
+          alias;
+
+      build =
+        alias: build: host: target:
+        let
+          package = lib'.packages.resolve alias;
 
           buildDependencies =
             build': host': target':
             builtins.mapAttrs (name: dep: lib'.packages.build dep build' host' target');
 
-          result = resolved.extend (
+          platform = {
+            build = lib.modules.overrides.force build;
+            host = lib.modules.overrides.force host;
+            target = lib.modules.overrides.force target;
+          };
+
+          withPlatform = lib.modules.run {
+            modules = package.__modules__ ++ [
+              lib'.types.package.children.submodule
+              (
                 { config }:
                 {
                   config = {
-                platform = {
-                  build = build;
-                  host = host;
-                  target = lib.modules.override 150 target;
-                };
+                    __modules__ = package.__modules__;
 
-                deps = {
-                  build = {
-                    only = buildDependencies build build build resolved.deps.build.only;
-                    build = buildDependencies build build target resolved.deps.build.build;
-                    host = buildDependencies build host target resolved.deps.build.host;
-                    target = buildDependencies build target target resolved.deps.build.target;
-                  };
-                  host = {
-                    only = buildDependencies host host host resolved.deps.host.only;
-                    host = buildDependencies host host target resolved.deps.host.host;
-                    target = buildDependencies host target target resolved.deps.host.target;
-                  };
-                  target = {
-                    only = buildDependencies target target target resolved.deps.target.only;
-                    target = buildDependencies target target target resolved.deps.target.target;
-                  };
-                };
-
-                package = config.builder.build config;
+                    inherit platform;
                   };
                 }
-          );
+              )
+            ];
+          };
+
+          # Not all platform information can be effectively handled via submodules. To handle
+          # the case where a user copies the resolved config over we need to ensure that
+          # dependencies are appropriately updated.
+          withDeps = withPlatform.config // {
+            deps = {
+              build = {
+                only = buildDependencies build build build withPlatform.config.deps.build.only;
+                build = buildDependencies build build target withPlatform.config.deps.build.build;
+                host = buildDependencies build host target withPlatform.config.deps.build.host;
+                target = buildDependencies build target target withPlatform.config.deps.build.target;
+              };
+              host = {
+                only = buildDependencies host host host withPlatform.config.deps.host.only;
+                host = buildDependencies host host target withPlatform.config.deps.host.host;
+                target = buildDependencies host target target withPlatform.config.deps.host.target;
+              };
+              target = {
+                only = buildDependencies target target target withPlatform.config.deps.target.only;
+                target = buildDependencies target target target withPlatform.config.deps.target.target;
+              };
+            };
+          };
+
+          withPackage = lib.modules.run {
+            modules = package.__modules__ ++ [
+              lib'.types.package.children.submodule
+              (
+                { config }:
+                {
+                  config = {
+                    __modules__ = package.__modules__;
+
+                    inherit platform;
+
+                    deps = lib.modules.overrides.force withDeps.deps;
+
+                    package = lib.modules.overrides.force (withDeps.builder.build withDeps);
+                  };
+                }
+              )
+            ];
+          };
         in
-        result;
+        withPackage.config;
     };
   };
 }

tidepool/src/lib/systems.nix

@@ -1220,6 +1220,7 @@ in
               vendor,
               kernel,
               abi,
+              ...
             }:
             types.cpu.check cpu
             && types.vendor.check vendor
@@ -1227,6 +1228,17 @@ in
             && types.abi.check abi;
         };
 
+        platformWithBuildInfo = lib.types.create {
+          name = "systemWithBuildInfo";
+          description = "fully parsed representation of llvm- or nix-style platform tuple with build information";
+          merge = lib.options.merge.one;
+          check =
+            value:
+            lib.types.is "systemWithBuildInfo" value
+            && value ? system
+            && lib'.systems.types.platform.check value.system;
+        };
+
         endian = lib.types.enum (builtins.attrValues types.endians);
 
         endians = setTypes types.generic.endian {
@@ -2792,7 +2804,7 @@ in
         assert resolved.useAndroidPrebuilt -> resolved.isAndroid;
         assert assertions;
         # And finally, return the generated system info.
-        resolved;
+        lib.types.set "systemWithBuildInfo" resolved;
     };
   };
 }

tidepool/src/lib/types.nix

@@ -1,8 +1,9 @@
-{
-  lib,
-  lib',
-  config,
-}:
+{ lib, config }:
+let
+  inherit (config) preferences builders;
+
+  lib' = config.lib;
+in
 {
   config = {
     lib.types = {
@@ -55,6 +56,10 @@
         in
         lib.types.either type (lib.types.list.of type);
 
+      platform =
+        lib.types.coerce lib.types.string lib'.systems.withBuildInfo
+          lib'.systems.types.platformWithBuildInfo;
+
       builder = lib.types.submodule {
         freeform = lib.types.any;
 
@@ -66,60 +71,163 @@
         };
       };
 
-      packages = lib.types.attrs.of (lib'.types.alias);
+      packages = lib.types.attrs.of (lib.types.attrs.of lib'.types.alias);
 
-      alias = lib.types.attrs.of (
-        lib.types.submodule {
-          options = {
-            versions = lib.options.create {
-              description = "All available package versions.";
-              type = lib.types.attrs.of lib'.types.package;
-            };
-          };
-        }
-      );
+      dependencies =
+        build: host: target:
+        let
+          initial = lib.types.raw;
 
-      dependencies = lib.types.attrs.of (
-        lib.types.nullish (lib.types.either lib'.types.alias lib'.types.package)
-      );
-
-      package = lib.types.submodule (
-        { config, meta }:
-        {
-          options = {
-            extend = lib.options.create {
-              description = "Extend the package's submodules with additional configuration.";
-              type = lib.types.function lib.types.raw;
-              default.value =
+          transform =
             value:
             let
-                  result = meta.extend {
-                    modules = if builtins.isAttrs value then [ { config = value; } ] else lib.lists.from.any value;
+              package = lib'.packages.resolve value;
+            in
+            lib'.packages.build package build host target;
+        in
+        lib.types.attrs.of (lib.types.coerce initial transform lib'.types.package);
+
+      alias = lib.types.submodule {
+        options = {
+          stable = lib.options.create {
+            description = "The stable version of the package.";
+            type = lib.types.nullish lib'.types.package;
+          };
+
+          latest = lib.options.create {
+            description = "The latest version of the package.";
+            type = lib'.types.package;
+          };
+
+          versions = lib.options.create {
+            description = "Available versions of the package.";
+            type = lib.types.attrs.of lib'.types.package;
+            default.value = { };
+          };
+        };
+      };
+
+      package =
+        let
+          normalize =
+            value:
+            if builtins.isFunction value || builtins.isList value then
+              value
+            else if value ? __modules__ then
+              value.__modules__
+            else
+              { config = value; };
+
+          initial = lib.types.create {
+            name = "PackageConfig";
+            description = "configuration for a package";
+            check = value: builtins.isFunction value || builtins.isAttrs value || builtins.isList value;
+            merge =
+              location: definitions:
+              let
+                normalized = builtins.map (definition: lib.lists.from.any (normalize definition.value)) definitions;
+              in
+              builtins.concatLists normalized;
+          };
+
+          transform =
+            location: value:
+            let
+              modules = lib.lists.from.any (normalize value);
+
+              result = lib.modules.run {
+                prefix = location;
+                modules = modules ++ [
+                  submodule
+                  { config.__modules__ = modules; }
+                ];
               };
             in
             result.config;
+
+          final = lib.types.raw;
+
+          deps =
+            build: host: target:
+            lib.types.submodule {
+              options = {
+                build = {
+                  only = lib.options.create {
+                    description = "Dependencies which are only used in the build environment.";
+                    type = lib'.types.dependencies build build build;
+                    default.value = { };
                   };
 
-            name = lib.options.create {
-              description = "The name of the package.";
-              type = lib.types.string;
-              default = {
-                text = "\${config.pname}-\${config.version}";
-                value =
-                  if config.pname != null && config.version != null then "${config.pname}-${config.version}" else "";
+                  build = lib.options.create {
+                    description = "Dependencies which are created in the build environment and are executed in the build environment.";
+                    type = lib'.types.dependencies build build target;
+                    default.value = { };
+                  };
+
+                  host = lib.options.create {
+                    description = "Dependencies which are created in the build environment and are executed in the host environment.";
+                    type = lib'.types.dependencies build host target;
+                    default.value = { };
+                  };
+
+                  target = lib.options.create {
+                    description = "Dependencies which are created in the build environment and are executed in the target environment.";
+                    type = lib'.types.dependencies build target target;
+                    default.value = { };
                   };
                 };
 
-            pname = lib.options.create {
-              description = "The program name for the package";
-              type = lib.types.nullish lib.types.string;
-              default.value = null;
+                host = {
+                  only = lib.options.create {
+                    description = "Dependencies which are only used in the host environment.";
+                    type = lib'.types.dependencies host host host;
+                    default.value = { };
                   };
 
-            version = lib.options.create {
-              description = "The version for the package.";
-              type = lib.types.nullish lib.types.version;
-              default.value = null;
+                  host = lib.options.create {
+                    description = "Dependencies which are executed in the host environment.";
+                    type = lib'.types.dependencies host host target;
+                    default.value = { };
+                  };
+
+                  target = lib.options.create {
+                    description = "Dependencies which are executed in the host environment which produces code for the target environment.";
+                    type = lib'.types.dependencies host target target;
+                    default.value = { };
+                  };
+                };
+
+                target = {
+                  only = lib.options.create {
+                    description = "Dependencies which are only used in the target environment.";
+                    type = lib'.types.dependencies target target target;
+                    default.value = { };
+                  };
+
+                  target = lib.options.create {
+                    description = "Dependencies which are executed in the target environment.";
+                    type = lib'.types.dependencies target target target;
+                    default.value = { };
+                  };
+                };
+              };
+            };
+
+          submodule =
+            { config }:
+            let
+              build = config.platform.build;
+              host = config.platform.host;
+              target = config.platform.target;
+            in
+            {
+              options = {
+                __modules__ = lib.options.create {
+                  description = "User specified modules for the package definition.";
+                  type = lib.types.list.of (initial // { merge = lib.options.merge.one; });
+                  # writable = false;
+                  internal = true;
+                  default.value = [ ];
                 };
 
                 meta = {
@@ -175,63 +283,53 @@
                 platform = {
                   build = lib.options.create {
                     description = "The build platform for the package.";
-                type = lib.types.string;
-                default.value = "x86_64-linux";
-                apply =
-                  raw:
-                  let
-                    system = lib'.systems.from.string raw;
-                    x = lib'.systems.withBuildInfo raw;
-                  in
-                  x;
+                    type = lib'.types.platform;
+                    default.value = lib'.systems.withBuildInfo "x86_64-linux";
                   };
 
                   host = lib.options.create {
                     description = "The host platform for the package.";
-                type = lib.types.string;
-                default.value = "x86_64-linux";
-                # apply = raw: let
-                #   system = lib'.systems.from.string raw;
-                # in {
-                #   inherit raw system;
-
-                #   double = lib'.systems.into.double system;
-                #   triple = lib'.systems.into.triple system;
-                # };
-                apply =
-                  raw:
-                  let
-                    system = lib'.systems.from.string raw;
-                    x = lib'.systems.withBuildInfo raw;
-                  in
-                  x;
+                    type = lib'.types.platform;
+                    default.value = lib'.systems.withBuildInfo "x86_64-linux";
                   };
 
                   target = lib.options.create {
                     description = "The target platform for the package.";
-                type = lib.types.string;
-                default.value = "x86_64-linux";
-                # apply = raw: let
-                #   system = lib'.systems.from.string raw;
-                # in {
-                #   inherit raw system;
-
-                #   double = lib'.systems.into.double system;
-                #   triple = lib'.systems.into.triple system;
-                # };
-                apply =
-                  raw:
-                  let
-                    system = lib'.systems.from.string raw;
-                    x = lib'.systems.withBuildInfo raw;
-                  in
-                  x;
+                    type = lib'.types.platform;
+                    default.value = lib'.systems.withBuildInfo "x86_64-linux";
                   };
                 };
 
+                name = lib.options.create {
+                  description = "The name of the package.";
+                  type = lib.types.string;
+                  default = {
+                    text = "\${config.pname}-\${config.version}";
+                    value =
+                      if config.pname != null && config.version != null then "${config.pname}-${config.version}" else "";
+                  };
+                };
+
+                pname = lib.options.create {
+                  description = "The program name for the package";
+                  type = lib.types.nullish lib.types.string;
+                  default.value = null;
+                };
+
+                version = lib.options.create {
+                  description = "The version for the package.";
+                  type = lib.types.nullish lib.types.version;
+                  default.value = null;
+                };
+
+                builder = lib.options.create {
+                  description = "The builder for the package.";
+                  type = lib'.types.builder;
+                };
+
                 phases = lib.options.create {
                   description = "The phases for the package.";
-              type = lib.types.dag.of (lib.types.either lib.types.string (lib.types.function lib.types.string));
+                  type = lib.types.dag.of lib.types.string;
                   default.value = { };
                 };
 
@@ -241,81 +339,48 @@
                   default.value = { };
                 };
 
-            builder = lib.options.create {
-              description = "The builder for the package.";
-              type = lib'.types.builder;
-            };
-
-            deps = {
-              build = {
-                only = lib.options.create {
-                  description = "Dependencies which are only used in the build environment.";
-                  type = lib'.types.dependencies;
-                  default.value = { };
-                };
-
-                build = lib.options.create {
-                  description = "Dependencies which are created in the build environment and are executed in the build environment.";
-                  type = lib'.types.dependencies;
-                  default.value = { };
-                };
-
-                host = lib.options.create {
-                  description = "Dependencies which are created in the build environment and are executed in the host environment.";
-                  type = lib'.types.dependencies;
-                  default.value = { };
-                };
-
-                target = lib.options.create {
-                  description = "Dependencies which are created in the build environment and are executed in the target environment.";
-                  type = lib'.types.dependencies;
-                  default.value = { };
-                };
-              };
-
-              host = {
-                only = lib.options.create {
-                  description = "Dependencies which are only used in the host environment.";
-                  type = lib'.types.dependencies;
-                  default.value = { };
-                };
-
-                host = lib.options.create {
-                  description = "Dependencies which are executed in the host environment.";
-                  type = lib'.types.dependencies;
-                  default.value = { };
-                };
-
-                target = lib.options.create {
-                  description = "Dependencies which are executed in the host environment which produces code for the target environment.";
-                  type = lib'.types.dependencies;
-                  default.value = { };
-                };
-              };
-
-              target = {
-                only = lib.options.create {
-                  description = "Dependencies which are only used in the target environment.";
-                  type = lib'.types.dependencies;
-                  default.value = { };
-                };
-
-                target = lib.options.create {
-                  description = "Dependencies which are executed in the target environment.";
-                  type = lib'.types.dependencies;
-                  default.value = { };
-                };
-              };
-            };
-
                 package = lib.options.create {
                   description = "The built derivation.";
                   type = lib.types.derivation;
                   default.value = config.builder.build config;
                 };
+
+                deps = lib.options.create {
+                  description = "The dependencies for the package.";
+                  type = deps build host target;
+                  default.value = { };
+                  apply = value: {
+                    build = {
+                      only = lib'.packages.dependencies.build build build build value.build.only;
+                      build = lib'.packages.dependencies.build build build target value.build.build;
+                      host = lib'.packages.dependencies.build build host target value.build.host;
+                      target = lib'.packages.dependencies.build build target target value.build.target;
+                    };
+                    host = {
+                      only = lib'.packages.dependencies.build host host host value.host.only;
+                      host = lib'.packages.dependencies.build host host target value.host.host;
+                      target = lib'.packages.dependencies.build host target target value.host.target;
+                    };
+                    target = {
+                      only = lib'.packages.dependencies.build target target target value.target.only;
+                      target = lib'.packages.dependencies.build target target target value.target.target;
+                    };
+                  };
+                };
+              };
+            };
+
+          type = (lib.types.coerceWithLocation initial transform final) // {
+            name = "Package";
+            description = "a package definition";
+          };
+        in
+        type
+        // {
+          children = type.children // {
+            inherit submodule;
+          };
         };
-        }
-      );
     };
   };
 }

tidepool/src/packages/aux/a.nix

@@ -0,0 +1,36 @@
+{ lib', config }:
+let
+  inherit (config) builders packages;
+in
+{
+  config.packages.aux.a = {
+    versions = {
+      "latest" =
+        { config }:
+        {
+          config = {
+            meta = {
+              platforms = [ "i686-linux" ];
+            };
+
+            name = "${config.pname}-${config.version}";
+
+            pname = "a";
+            version = "1.0.0";
+
+            builder = builders.basic;
+
+            deps.build.host = {
+              inherit (packages.aux) b;
+            };
+
+            phases = {
+              install = ''
+                echo "a with b: ${config.deps.build.host.b.package.system}" > $out
+              '';
+            };
+          };
+        };
+    };
+  };
+}

tidepool/src/packages/aux/b.nix

@@ -0,0 +1,38 @@
+{ config }:
+let
+  inherit (config) lib builders packages;
+in
+{
+  config.packages.aux.b = {
+    versions = {
+      "latest" =
+        { config }:
+        {
+          options = {
+            custom = lib.options.create { type = lib.types.bool; };
+          };
+
+          config = {
+            meta = {
+              platforms = [ "i686-linux" ];
+            };
+
+            name = "${config.pname}-${config.version}";
+
+            custom = true;
+
+            pname = "b";
+            version = "1.0.0";
+
+            builder = builders.basic;
+
+            phases = {
+              install = ''
+                echo "b" > $out
+              '';
+            };
+          };
+        };
+    };
+  };
+}

tidepool/src/packages/default.nix

@@ -1,27 +1,29 @@
-{
-  lib,
-  lib',
-  config,
-}:
+{ config }:
 let
-  doubles = lib'.systems.doubles.all;
+  inherit (config) lib;
+
+  doubles = lib.systems.doubles.all;
 
   packages = builtins.removeAttrs config.packages [ "cross" ];
 in
 {
-  includes = [ ./foundation ];
+  includes = [
+    ./foundation
+    ./aux/a.nix
+    ./aux/b.nix
+  ];
 
   options = {
     packages = lib.options.create {
       description = "The package set.";
       type = lib.types.submodule {
-        freeform = lib.types.attrs.of (lib.types.submodule { freeform = lib'.types.alias; });
+        freeform = lib.types.packages;
 
         options.cross = lib.attrs.generate doubles (
           system:
           lib.options.create {
             description = "The cross-compiled package set for the ${system} target.";
-            type = lib'.types.packages;
+            type = lib.types.packages;
             default = { };
           }
         );
@@ -49,38 +51,49 @@ in
         let
           setHost =
             package:
-            if package != { } then
-              (package.extend (
-                { config }:
+            package
+            // {
+              __modules__ = package.__modules__ ++ [
                 {
-                  config = {
-                    platform = {
-                      host = lib.modules.overrides.force system;
-                      target = lib.modules.overrides.default system;
-                    };
-
-                    deps = {
-                      build = {
-                        only = setHost package.deps.build.only;
-                        build = setHost package.deps.build.build;
-                        host = setHost package.deps.build.host;
-                        target = setHost package.deps.build.target;
-                      };
-                      host = {
-                        only = setHost package.deps.host.only;
-                        host = setHost package.deps.host.host;
-                        target = setHost package.deps.host.target;
-                      };
-                      target = {
-                        only = setHost package.deps.target.only;
-                        target = setHost package.deps.target.target;
-                      };
-                    };
+                  config.platform = {
+                    host = lib.modules.override 5 system;
+                    target = lib.modules.override 5 system;
                   };
                 }
-              )).config
-            else
-              package;
+              ];
+            };
+          # if package != {}
+          # then
+          #   (package.extend (
+          #     {config}: {
+          #       config = {
+          #         platform = {
+          #           host = lib.modules.overrides.force system;
+          #           target = lib.modules.overrides.default system;
+          #         };
+
+          #         deps = {
+          #           build = {
+          #             only = setHost package.deps.build.only;
+          #             build = setHost package.deps.build.build;
+          #             host = setHost package.deps.build.host;
+          #             target = setHost package.deps.build.target;
+          #           };
+          #           host = {
+          #             only = setHost package.deps.host.only;
+          #             host = setHost package.deps.host.host;
+          #             target = setHost package.deps.host.target;
+          #           };
+          #           target = {
+          #             only = setHost package.deps.target.only;
+          #             target = setHost package.deps.target.target;
+          #           };
+          #         };
+          #       };
+          #     }
+          #   ))
+          #   .config
+          # else package;
 
           updated = alias // {
             versions = builtins.mapAttrs (version: package: setHost package) alias.versions;

tidepool/src/packages/foundation/binutils/default.nix

@@ -11,13 +11,14 @@ let
     # These are the upstream foundational packages exported from the Aux Foundation project.
 
     foundation
+    packages
     ;
 in
 {
   config.packages.foundation.binutils = {
     versions = {
       "latest" =
-        { config, meta }:
+        { config }:
         {
           options = {
             src = lib.options.create {
@@ -36,9 +37,17 @@ in
 
             builder = builders.basic;
 
+            deps = {
+              build = {
+                host = {
+                  inherit (packages.foundation) gcc;
+                };
+              };
+            };
+
             env = {
               PATH = lib.paths.bin [
-                foundation.stage2-gcc
+                # foundation.stage2-gcc
                 foundation.stage2-binutils
                 foundation.stage2-gnumake
                 foundation.stage2-gnupatch
@@ -86,24 +95,24 @@ in
                 ];
               in
               {
-                unpack = lib.dag.entry.before [ "patch" ] ''
+                unpack = ''
                   tar xf ${config.src}
                   cd binutils-${config.version}
                 '';
 
-                patch = lib.dag.entry.between [ "configure" ] [ "unpack" ] ''
+                patch = ''
                   ${lib.strings.concatMapSep "\n" (file: "patch -Np1 -i ${file}") patches}
                 '';
 
-                configure = lib.dag.entry.between [ "build" ] [ "patch" ] ''
+                configure = ''
                   bash ./configure ${builtins.concatStringsSep " " configureFlags}
                 '';
 
-                build = lib.dag.entry.between [ "install" ] [ "configure" ] ''
+                build = ''
                   make -j $NIX_BUILD_CORES
                 '';
 
-                install = lib.dag.entry.after [ "build" ] ''
+                install = ''
                   make -j $NIX_BUILD_CORES install-strip
                 '';
               };

tidepool/src/packages/foundation/default.nix

@@ -9,6 +9,8 @@
     ./gcc
     ./binutils
     ./linux-headers
+    ./glibc
+    # ./xz
   ];
 
   config = {

tidepool/src/packages/foundation/gcc/default.nix

@@ -1,16 +1,13 @@
-{
-  lib,
-  lib',
-  config,
-  options,
-}:
+{ config, options }:
 let
   inherit (config)
+    lib
     mirrors
     builders
     # These are the upstream foundational packages exported from the Aux Foundation project.
 
     foundation
+    packages
     ;
 in
 {
@@ -91,28 +88,7 @@ in
             builder = builders.basic;
 
             env = {
-              PATH =
-                let
-                  gcc =
-                    if
-                      config.platform.build.triple == config.platform.host.triple
-                    # If we're on the same system then we can use the existing GCC instance.
-                    then
-                      foundation.stage2-gcc
-                    # Otherwise we are going to need a cross-compiler.
-                    else
-                      # TODO: Create a gcc-cross package.
-                      (meta.extend (args: {
-                        config = {
-                          platform = {
-                            build = config.platform.build.triple;
-                            host = config.platform.build.triple;
-                            target = lib.modules.override.force config.platform.host.triple;
-                          };
-                        };
-                      })).config.package;
-                in
-                lib.paths.bin [
+              PATH = lib.paths.bin [
                 foundation.stage2-gcc
                 foundation.stage2-binutils
                 foundation.stage2-gnumake
@@ -130,12 +106,12 @@ in
 
             phases =
               let
-                host = lib'.systems.withBuildInfo config.platform.host;
+                host = lib.systems.withBuildInfo config.platform.host;
 
                 mbits = if host.system.cpu.family == "x86" then if host.is64bit then "-m64" else "-m32" else "";
               in
               {
-                unpack = lib.dag.entry.before [ "patch" ] ''
+                unpack = ''
                   # Unpack
                   tar xf ${config.src}
                   tar xf ${config.gmp.src}
@@ -150,17 +126,15 @@ in
                   ln -s ../isl-${config.isl.version} isl
                 '';
 
-                patch = lib.dag.entry.between [ "configure" ] [ "unpack" ] ''
+                patch = ''
                   # Patch
                   # force musl even if host triple is gnu
                   sed -i 's|"os/gnu-linux"|"os/generic"|' libstdc++-v3/configure.host
                 '';
 
-                configure = lib.dag.entry.between [ "build" ] [ "patch" ] ''
+                configure = ''
                   # Configure
-                  export CC="gcc -Wl,-dynamic-linker -march=${
-                    host.gcc.arch or host.system.cpu.family
-                  } ${mbits} -Wl,${foundation.stage1-musl}/lib/libc.so"
+                  export CC="gcc -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so"
                   export CXX="g++ -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so"
                   export CFLAGS_FOR_TARGET="-Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so"
                   export LIBRARY_PATH="${foundation.stage1-musl}/lib"
@@ -182,12 +156,12 @@ in
                     CXXFLAGS=-static
                 '';
 
-                build = lib.dag.entry.between [ "install" ] [ "configure" ] ''
+                build = ''
                   # Build
                   make -j $NIX_BUILD_CORES
                 '';
 
-                install = lib.dag.entry.after [ "build" ] ''
+                install = ''
                   # Install
                   make -j $NIX_BUILD_CORES install-strip
                 '';

tidepool/src/packages/foundation/linux-headers/default.nix

@@ -54,20 +54,16 @@ in
             };
 
             phases = {
-              unpack = lib.dag.entry.before [ "patch" ] ''
+              unpack = ''
                 tar xf ${config.src}
                 cd linux-${config.version}
               '';
 
-              patch = lib.dag.entry.between [ "configure" ] [ "unpack" ] '''';
-
-              configure = lib.dag.entry.between [ "build" ] [ "patch" ] '''';
-
-              build = lib.dag.entry.between [ "install" ] [ "configure" ] ''
+              build = ''
                 make -j $NIX_BUILD_CORES CC=musl-gcc HOSTCC=musl-gcc ARCH=${config.platform.host.linux.arch} headers
               '';
 
-              install = lib.dag.entry.after [ "build" ] ''
+              install = ''
                 find usr/include -name '.*' -exec rm {} +
                 mkdir -p $out
                 cp -rv usr/include $out/