add bootstraped x86_64-linux cross compiled gcc (#8)

Work in progress cross compiler for x86_64. I've managed to get a full x86_64 gcc using the binaries built from foundation, and am working on implementing their builds into tidepool.

### Bootstrapping steps
0) Start with i686 tools (gcc, binutils, musl, etc)
1) Build binutils targeting x86_64-linux
2) Build a minimal gcc cross compiler using the cross binutils. This minimal cross compiler does not have support for libc, so is pretty much only useful for building musl or glibc.
3) Use the minimal cross compiler to build x86_64-linux glibc or musl
4) Now that we have a cross compiler and x86_64-linux libc, we can build gcc for the target architecture!
5) Profit! We can now build anything x86_64 using our gcc compiler!

Co-authored-by: Jake Hamilton <jake.hamilton@hey.com>
Reviewed-on: #8
Reviewed-by: Jake Hamilton <jake.hamilton@hey.com>
Co-authored-by: Victor Fuentes <vmfuentes64@gmail.com>
Co-committed-by: Victor Fuentes <vmfuentes64@gmail.com>

format.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -I "nixpkgs=https://github.com/nixos/nixpkgs/archive/nixos-24.05.tar.gz" -p nixfmt-rfc-style
+#!nix-shell -i bash -I "nixpkgs=https://github.com/nixos/nixpkgs/archive/nixos-unstable.tar.gz" -p nixfmt-rfc-style
 
 files=$(find . -name "*.nix" -type f)
 

foundation/flake.lock

@@ -3,17 +3,18 @@
     "lib": {
       "locked": {
         "dir": "lib",
-        "dirtyRev": "9850da8aa9dc9be22e237c9b424a18e801e53ecb-dirty",
+        "lastModified": 1723737980,
-        "dirtyShortRev": "9850da8-dirty",
+        "narHash": "sha256-1WnFatW5kSuO2jjt62hvSbH84TSYyO+VmvkJ0d5e/ZY=",
-        "lastModified": 1718529861,
+        "ref": "master",
-        "narHash": "sha256-tv/0C7ixH+9Ij+r+5nua48OlXXXnbdEsnenxX4eG/Sk=",
+        "rev": "cadfaabc853d20f2bc20bad794fcbe520ea48f13",
+        "revCount": 82,
         "type": "git",
-        "url": "file:../?dir=lib"
+        "url": "file:../"
       },
       "original": {
         "dir": "lib",
         "type": "git",
-        "url": "file:../?dir=lib"
+        "url": "file:../"
       }
     },
     "root": {

foundation/flake.nix

@@ -14,10 +14,7 @@
 
       modules = import ./src;
 
-      forEachSystem = lib.attrs.generate [
+      forEachSystem = lib.attrs.generate [ "i686-linux" ];
-        "i686-linux"
-        "x86_64-linux"
-      ];
     in
     {
       extras =

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -34,10 +34,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
 
       mainProgram = lib.options.create {
@@ -109,8 +106,7 @@ in
             export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
             export AR="tcc -ar"
             export LD=tcc
-            chmod +x ./configure
+            bash ./configure \
-            ./configure \
               --prefix=$out \
               --build=${platform.build} \
               --host=${platform.host} \

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

@@ -32,10 +32,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
     };
 
@@ -133,8 +130,7 @@ in
             export AR="tcc -ar"
             export lt_cv_sys_max_cmd_len=32768
             export CFLAGS="-D__LITTLE_ENDIAN__=1"
-            chmod +x ./configure
+            bash ./configure ${builtins.concatStringsSep " " configureFlags}
-            ./configure ${builtins.concatStringsSep " " configureFlags}
 
             # Build
             make -j $NIX_BUILD_CORES all-libiberty all-gas all-bfd all-libctf all-zlib all-gprof

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

@@ -32,10 +32,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
     };
 
@@ -89,8 +86,7 @@ in
           cd bison-${cfg.version}
 
           # Configure
-          chmod +x ./configure
+          bash ./configure \
-          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

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

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

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

@@ -34,10 +34,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
     };
 
@@ -101,8 +98,7 @@ in
             # Configure
             export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
             export LD=tcc
-            chmod +x ./configure
+            bash ./configure ${builtins.concatStringsSep " " configureFlags}
-            ./configure ${builtins.concatStringsSep " " configureFlags}
 
             # Build
             make -j $NIX_BUILD_CORES AR="tcc -ar" MAKEINFO="true"

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

@@ -32,10 +32,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
     };
 
@@ -90,8 +87,7 @@ in
           # Configure
           export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
           export LD=tcc
-          chmod +x ./configure
+          bash ./configure \
-          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host}

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

@@ -32,10 +32,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
     };
 
@@ -95,8 +92,7 @@ in
           export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
           export AR="tcc -ar"
           export LD=tcc
-          chmod +x ./configure
+          bash ./configure \
-          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host}

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

@@ -68,8 +68,8 @@ in
             export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib"
             export ac_cv_func_getpgrp_void=yes
             export ac_cv_func_tzset=yes
-            chmod +x ./configure
+            chmod 0755 missing
-            ./configure \
+            bash ./configure \
               --build=${platform.build} \
               --host=${platform.host} \
               --disable-nls \

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

@@ -34,10 +34,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
 
       mainProgram = lib.options.create {
@@ -96,8 +93,7 @@ in
           export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
           export AR="tcc -ar"
           export LD=tcc
-          chmod +x ./configure
+          bash ./configure \
-          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host}

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

@@ -38,10 +38,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
     };
 
@@ -200,8 +197,7 @@ in
           export CFLAGS_FOR_TARGET="-Wl,-dynamic-linker -Wl,${stage1.musl.package}/lib/libc.so"
           export LIBRARY_PATH="${stage1.musl.package}/lib"
 
-          chmod +x ./configure
+          bash ./configure \
-          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

foundation/src/stages/stage1/gcc/v4.6.cxx.nix

@@ -162,8 +162,7 @@ in
             export CPLUS_INCLUDE_PATH="$C_INCLUDE_PATH"
             export LIBRARY_PATH="${stage1.musl.package}/lib"
 
-            chmod +x ./configure
+            bash ./configure \
-            ./configure \
               --prefix=$out \
               --build=${platform.build} \
               --host=${platform.host} \

foundation/src/stages/stage1/gcc/v4.6.nix

@@ -163,8 +163,7 @@ in
             export ac_cv_func_memcpy=yes
             export ac_cv_func_strerror=yes
 
-            chmod +x ./configure
+            bash ./configure \
-            ./configure \
               --prefix=$out \
               --build=${platform.build} \
               --host=${platform.host} \

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

@@ -167,8 +167,7 @@ in
           export CPLUS_INCLUDE_PATH="$C_INCLUDE_PATH"
           export LIBRARY_PATH="${stage1.musl.package}/lib"
 
-          chmod +x ./configure
+          bash ./configure \
-          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

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

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

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

@@ -32,10 +32,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
     };
 
@@ -88,8 +85,7 @@ in
           cd m4-${cfg.version}
 
           # Configure
-          chmod +x ./configure
+          bash ./configure \
-          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

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

@@ -34,10 +34,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
     };
 
@@ -104,8 +101,7 @@ in
             # Configure
             export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
             export LD=tcc
-            chmod +x ./configure
+            bash ./configure \
-            ./configure \
               --prefix=$out \
               --build=${platform.build} \
               --host=${platform.host}

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

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

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

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

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

@@ -34,44 +34,44 @@ in
         sha256 = "02m6gajm647n8l9a5bnld6fnbgdpyi4i3i83p7xcwv0kif47xhy6";
       };
 
-      package = builders.bash.boot.build {
+      package =
-        name = "gnutar-boot-${cfg.version}";
+        let
+        in
+        builders.bash.boot.build {
+          name = "gnutar-boot-${cfg.version}";
 
-        meta = stage1.gnutar.meta;
+          meta = stage1.gnutar.meta;
 
-        deps.build.host = [
+          deps.build.host = [
-          stage1.tinycc.mes.compiler.package
+            stage1.tinycc.mes.compiler.package
-          stage1.gnumake.boot.package
+            stage1.gnumake.boot.package
-          stage1.gnused.boot.package
+            stage1.gnused.boot.package
-          stage1.gnugrep.package
+            stage1.gnugrep.package
-        ];
+          ];
 
-        script = ''
+          script = ''
-          # Unpack
+            # Unpack
-          ungz --file ${cfg.src} --output tar.tar
+            ungz --file ${cfg.src} --output tar.tar
-          untar --file tar.tar
+            untar --file tar.tar
-          rm tar.tar
+            rm tar.tar
-          cd tar-${cfg.version}
+            cd tar-${cfg.version}
 
-          # Fix source permissions
+            # Configure
-          chmod -R +r .
+            export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib"
-          chmod +x ./configure
+            chmod 0755 missing
+            bash ./configure \
+              --build=${platform.build} \
+              --host=${platform.host} \
+              --disable-nls \
+              --prefix=$out
 
-          # Configure
+            # Build
-          export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib"
+            make AR="tcc -ar"
-          ./configure \
-            --build=${platform.build} \
-            --host=${platform.host} \
-            --disable-nls \
-            --prefix=$out
 
-          # Build
+            # Install
-          make AR="tcc -ar"
+            make install
-
+          '';
-          # Install
+        };
-          make install
-        '';
-      };
     };
   };
 }

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

@@ -37,10 +37,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
 
       mainProgram = lib.options.create {
@@ -98,8 +95,7 @@ in
           cd tar-${cfg.version}
 
           # Configure
-          chmod +x ./configure
+          bash ./configure \
-          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

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

@@ -59,8 +59,8 @@ in
           export ac_cv_sizeof_unsigned_long=4
           export ac_cv_sizeof_long_long=8
           export ac_cv_header_netdb_h=no
-          chmod +x ./configure
+          chmod 0755 missing
-          ./configure \
+          bash ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

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

@@ -31,10 +31,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
     };
 
@@ -63,37 +60,39 @@ in
         sha256 = "0ryr5b00qz3xcdcv03qwjdfji8pasp0007ay3ppmk71wl8c1i90w";
       };
 
-      package = builders.bash.boot.build {
+      package =
-        name = "gzip-${cfg.version}";
+        let
-        meta = cfg.meta;
+        in
+        builders.bash.boot.build {
+          name = "gzip-${cfg.version}";
+          meta = cfg.meta;
 
-        deps.build.host = [
+          deps.build.host = [
-          stage1.tinycc.mes.compiler.package
+            stage1.tinycc.mes.compiler.package
-          stage1.gnumake.boot.package
+            stage1.gnumake.boot.package
-          stage1.gnused.boot.package
+            stage1.gnused.boot.package
-          stage1.gnugrep.package
+            stage1.gnugrep.package
-        ];
+          ];
 
-        script = ''
+          script = ''
-          # Unpack
+            # Unpack
-          ungz --file ${cfg.src} --output gzip.tar
+            ungz --file ${cfg.src} --output gzip.tar
-          untar --file gzip.tar
+            untar --file gzip.tar
-          rm gzip.tar
+            rm gzip.tar
-          cd gzip-${cfg.version}
+            cd gzip-${cfg.version}
 
-          # Configure
+            # Configure
-          export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib -Dstrlwr=unused"
+            export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib -Dstrlwr=unused"
-          chmod +x ./configure
+            bash ./configure --prefix=$out
-          ./configure --prefix=$out
 
-          # Build
+            # Build
-          make
+            make
 
-          # Install
+            # Install
-          mkdir $out
+            mkdir $out
-          make install
+            make install
-        '';
+          '';
-      };
+        };
     };
   };
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -118,8 +118,7 @@ in
               src/misc/wordexp.c
 
             # Configure
-            chmod +x configure
+            bash ./configure \
-            ./configure \
               --prefix=$out \
               --build=${platform.build} \
               --host=${platform.host} \
@@ -132,6 +131,7 @@ in
             # Install
             make install
             cp ${stage1.tinycc.mes.libs.package}/lib/libtcc1.a $out/lib
+
           '';
         };
     };

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

@@ -35,10 +35,7 @@ in
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
         # TODO: Support more platforms.
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
     };
 
@@ -98,8 +95,7 @@ in
             src/misc/wordexp.c
 
           # Configure
-          chmod +x ./configure
+          bash ./configure \
-          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

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

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

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

@@ -32,10 +32,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
     };
 
@@ -107,8 +104,7 @@ in
             export C_INCLUDE_PATH="${stage1.zlib.package}/include"
             export LIBRARY_PATH="${stage1.zlib.package}/lib"
             export LD_LIBRARY_PATH="$LIBRARY_PATH"
-            chmod +x ./configure
+            bash ./configure \
-            ./configure \
               --prefix=$out \
               --build=${platform.build} \
               --host=${platform.host}

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

@@ -38,7 +38,6 @@ in
         default.value = [
           "x86_64-linux"
           "i686-linux"
-          "x86_64-linux"
         ];
       };
     };

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

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

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

@@ -35,10 +35,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
     };
 
@@ -91,8 +88,7 @@ in
           export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
           export AR="tcc -ar"
           export LD=tcc
-          chmod +x configure
+          bash ./configure \
-          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

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

@@ -32,10 +32,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
     };
 
@@ -86,8 +83,7 @@ in
 
           # Configure
           export CC=musl-gcc
-          chmod +x configure
+          bash ./configure --prefix=$out
-          ./configure --prefix=$out
 
           # Build
           make -j $NIX_BUILD_CORES

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

@@ -32,10 +32,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
 
       mainProgram = lib.options.create {
@@ -97,8 +94,7 @@ in
           cd bash-${cfg.version}
 
           # Configure
-          chmod +x ./configure
+          bash ./configure \
-          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

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

@@ -32,10 +32,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
     };
 
@@ -123,8 +120,7 @@ in
             ${lib.strings.concatMapSep "\n" (file: "patch -Np1 -i ${file}") patches}
 
             # Configure
-            chmod +x ./configure
+            bash ./configure ${builtins.concatStringsSep " " configureFlags}
-            ./configure ${builtins.concatStringsSep " " configureFlags}
 
             # Build
             make -j $NIX_BUILD_CORES

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

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

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

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

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

@@ -32,10 +32,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
     };
 
@@ -102,8 +99,7 @@ in
             cd coreutils-${cfg.version}
 
             # Configure
-            chmod +x ./configure
+            bash ./configure ${builtins.concatStringsSep " " configureFlags}
-            ./configure ${builtins.concatStringsSep " " configureFlags}
 
             # Build
             make -j $NIX_BUILD_CORES

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

@@ -32,10 +32,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
     };
 
@@ -89,8 +86,7 @@ in
           cd diffutils-${cfg.version}
 
           # Configure
-          chmod +x ./configure
+          bash ./configure \
-          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

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

@@ -32,10 +32,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
     };
 
@@ -89,8 +86,7 @@ in
           cd findutils-${cfg.version}
 
           # Configure
-          chmod +x ./configure
+          bash ./configure \
-          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

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

@@ -32,10 +32,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
 
       mainProgram = lib.options.create {
@@ -95,8 +92,7 @@ in
           cd gawk-${cfg.version}
 
           # Configure
-          chmod +x ./configure
+          bash ./configure \
-          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

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

@@ -32,10 +32,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
     };
 
@@ -194,8 +191,7 @@ in
           export CFLAGS_FOR_TARGET="-Wl,-dynamic-linker -Wl,${stage1.musl.package}/lib/libc.so"
           export LIBRARY_PATH="${stage1.musl.package}/lib"
 
-          chmod +x ./configure
+          bash ./configure \
-          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

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

@@ -33,10 +33,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
     };
 
@@ -94,8 +91,7 @@ in
           cd build
           # libstdc++.so is built against musl and fails to link
           export CXX=false
-          chmod +x ../configure
+          bash ../configure \
-          ../configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

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

@@ -32,10 +32,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
 
       mainProgram = lib.options.create {
@@ -94,8 +91,7 @@ in
           cd grep-${cfg.version}
 
           # Configure
-          chmod +x ./configure
+          bash ./configure \
-          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

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

@@ -33,10 +33,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
     };
 
@@ -105,8 +102,7 @@ in
             ${lib.strings.concatMapSep "\n" (file: "patch -Np1 -i ${file}") patches}
 
             # Configure
-            chmod +x ./configure
+            bash ./configure \
-            ./configure \
               --prefix=$out \
               --build=${platform.build} \
               --host=${platform.host} \

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

@@ -32,10 +32,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
     };
 
@@ -90,8 +87,7 @@ in
           cd patch-${cfg.version}
 
           # Configure
-          chmod +x ./configure
+          bash ./configure \
-          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

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

@@ -32,10 +32,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
 
       mainProgram = lib.options.create {
@@ -96,8 +93,7 @@ in
           cd sed-${cfg.version}
 
           # Configure
-          chmod +x ./configure
+          bash ./configure \
-          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

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

@@ -32,10 +32,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
 
       mainProgram = lib.options.create {
@@ -95,8 +92,7 @@ in
           cd tar-${cfg.version}
 
           # Configure
-          chmod +x ./configure
+          bash ./configure \
-          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

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

@@ -32,10 +32,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
     };
 
@@ -88,8 +85,7 @@ in
           cd gzip-${cfg.version}
 
           # Configure
-          chmod +x ./configure
+          bash ./configure \
-          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

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

@@ -33,10 +33,7 @@ in
       platforms = lib.options.create {
         type = lib.types.list.of lib.types.string;
         description = "Platforms the package supports.";
-        default.value = [
+        default.value = [ "i686-linux" ];
-          "i686-linux"
-          "x86_64-linux"
-        ];
       };
     };
 
@@ -89,8 +86,7 @@ in
           cd patchelf-${cfg.version}
 
           # Configure
-          chmod +x ./configure
+          bash ./configure \
-          ./configure \
             --prefix=$out \
             --build=${platform.build} \
             --host=${platform.host} \

foundation/src/system/default.nix

@@ -3,7 +3,7 @@
   options.aux = {
     system = lib.options.create {
       type = lib.types.string;
-      default.value = "x86_64-linux";
+      default.value = "i686-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/dag/default.nix

@@ -21,7 +21,7 @@ lib: {
       ## Apply a topological sort to a DAG.
       ##
       ## @type Dag a -> { result :: List a } | { cycle :: List a, loops :: List a }
-      topographic =
+      topological =
         graph:
         let
           getEntriesBefore =
@@ -43,7 +43,7 @@ lib: {
 
           isBefore = a: b: builtins.elem a.name b.after;
 
-          sorted = lib.lists.sort.topographic isBefore entries;
+          sorted = lib.lists.sort.topological isBefore entries;
         in
         if sorted ? result then
           {
@@ -95,7 +95,7 @@ lib: {
       ## Create a new DAG entry.
       ##
       ## @type List String -> List String -> a -> { before :: List String, after :: List String, value :: a }
-      between = before: after: value: { inherit before after value; };
+      between = after: before: value: { inherit before after value; };
 
       ## Create a new DAG entry with no dependencies.
       ##
@@ -105,12 +105,12 @@ lib: {
       ## Create a new DAG entry that occurs before other entries.
       ##
       ## @type List String -> a -> { before :: List String, after :: List String, value :: a }
-      before = before: lib.dag.entry.between before [ ];
+      before = before: lib.dag.entry.between [ ] before;
 
       ## Create a new DAG entry that occurs after other entries.
       ##
       ## @type List String -> a -> { before :: List String, after :: List String, value :: a }
-      after = lib.dag.entry.between [ ];
+      after = after: lib.dag.entry.between after [ ];
     };
 
     entries = {
@@ -121,7 +121,7 @@ lib: {
         tag:
         let
           process =
-            i: before: after: entries:
+            i: after: before: entries:
             let
               name = "${tag}-${builtins.toString i}";
               entry = builtins.head entries;
@@ -130,7 +130,7 @@ lib: {
             if builtins.length entries == 0 then
               { }
             else if builtins.length entries == 1 then
-              { "${name}" = lib.dag.entry.between before after entry; }
+              { "${name}" = lib.dag.entry.between after before entry; }
             else
               { "${name}" = lib.dag.entry.after after entry; } // (process (i + 1) before [ name ] rest);
         in
@@ -144,12 +144,12 @@ lib: {
       ## Create a DAG from a list of entries, prefixed with a tag, that occurs before other entries.
       ##
       ## @type String -> List String -> List a -> Dag a
-      before = tag: before: lib.dag.entries.between tag before [ ];
+      before = tag: before: lib.dag.entries.between tag [ ] before;
 
       ## Create a DAG from a list of entries, prefixed with a tag, that occurs after other entries.
       ##
       ## @type String -> List String -> List a -> Dag a
-      after = tag: lib.dag.entries.between tag [ ];
+      after = tag: after: lib.dag.entries.between tag after [ ];
     };
   };
 }

lib/src/dag/default.test.nix

@@ -119,11 +119,11 @@ in
   };
 
   "sort" = {
-    "topographic" = {
+    "topological" = {
       "handles an empty graph" =
         let
           expected = [ ];
-          actual = lib.dag.sort.topographic { };
+          actual = lib.dag.sort.topological { };
         in
         actual.result == expected;
 
@@ -147,7 +147,7 @@ in
               value = "d";
             }
           ];
-          actual = lib.dag.sort.topographic {
+          actual = lib.dag.sort.topological {
             a = lib.dag.entry.anywhere "a";
             b = lib.dag.entry.between [ "c" ] [ "a" ] "b";
             c = lib.dag.entry.before [ "c" ] "c";

lib/src/lists/default.nix

@@ -31,15 +31,15 @@ lib: {
         in
         builtins.map (x: builtins.elemAt x 1) (builtins.sort isLess prepared);
 
-      ## Perform a topographic sort on a list of items. The predicate function determines whether
+      ## Perform a topological sort on a list of items. The predicate function determines whether
       ## its first argument comes before the second argument.
       ##
       ## @type (a -> a -> Bool) -> List a -> List a
-      topographic =
+      topological =
         predicate: list:
         let
           searched = lib.lists.search.depthFirst true predicate list;
-          results = lib.lists.sort.topographic predicate (searched.visited ++ searched.rest);
+          results = lib.lists.sort.topological predicate (searched.visited ++ searched.rest);
         in
         if builtins.length list < 2 then
           { result = list; }
@@ -224,5 +224,11 @@ lib: {
         filter = result: value: if builtins.elem value result then result else result ++ [ value ];
       in
       builtins.foldl' filter [ ] list;
+
+    ## Flatten a list of lists into a single list.
+    ##
+    ## @type List (List a) -> List a
+    flatten =
+      value: if builtins.isList value then builtins.concatMap lib.lists.flatten value else [ value ];
   };
 }

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

@@ -49,18 +49,18 @@ lib: {
     ##
     ## @type Attrs -> Attrs
     create =
-      settings@{
+      settings@{ name
-        name,
+      , description ? name
-        description ? name,
+      , fallback ? { }
-        fallback ? { },
+      , check ? lib.fp.const true
-        check ? lib.fp.const true,
+      , merge ? lib.options.merge.default
-        merge ? lib.options.merge.default,
+      , functor ? lib.types.functor name
-        functor ? lib.types.functor name,
+      , mergeType ? lib.types.merge functor
-        mergeType ? lib.types.merge functor,
+      , getSubOptions ? lib.fp.const { }
-        getSubOptions ? lib.fp.const { },
+      , getSubModules ? null
-        getSubModules ? null,
+      , withSubModules ? lib.fp.const null
-        withSubModules ? lib.fp.const null,
+      , children ? { }
-        children ? { },
+      ,
       }:
       {
         __type__ = "type";
@@ -108,7 +108,7 @@ lib: {
           identifier = lib.options.getIdentifier location;
           first = builtins.elemAt definitions 0;
 
-          files = builtins.map lib.modules.getFiles definitions;
+          files = lib.modules.getFiles definitions;
           serializedFiles = builtins.concatStringsSep " and " files;
 
           getType =
@@ -118,13 +118,16 @@ lib: {
             else
               builtins.typeOf value;
 
-          commonType = builtins.foldl' (
+          commonType = builtins.foldl'
-            type: definition:
+            (
-            if getType definition.value != type then
+              type: definition:
-              builtins.throw "The option `${identifier}` has conflicting definitions in ${files}"
+                if getType definition.value != type then
-            else
+                  builtins.throw "The option `${identifier}` has conflicting definitions in ${serializedFiles}"
-              type
+                else
-          ) (getType first.value) definitions;
+                  type
+            )
+            (getType first.value)
+            definitions;
 
           mergeStringifiableAttrs = lib.options.merge.one;
 
@@ -132,7 +135,7 @@ lib: {
 
           mergeList =
             if builtins.length definitions > 1 then
-              builtins.throw "The option `${identifier}` has conflicting definitions in ${files}"
+              builtins.throw "The option `${identifier}` has conflicting definitions in ${serializedFiles}"
             else
               (lib.types.list.of lib.types.any).merge;
 
@@ -140,10 +143,12 @@ lib: {
             location: definitions: x:
             let
               resolvedLocation = location ++ [ "<function body>" ];
-              resolvedDefinitions = builtins.map (definition: {
+              resolvedDefinitions = builtins.map
-                __file__ = definition.__file__;
+                (definition: {
-                value = definition.value x;
+                  __file__ = definition.__file__;
-              }) definitions;
+                  value = definition.value x;
+                })
+                definitions;
             in
             lib.types.any.merge resolvedLocation resolvedDefinitions;
 
@@ -200,14 +205,15 @@ lib: {
         ## @type Int -> Int -> Attrs
         between =
           start: end:
-          assert lib.errors.trace (
+            assert lib.errors.trace
-            start <= end
+              (
-          ) "lib.types.ints.between start must be less than or equal to end";
+                start <= end
-          lib.types.withCheck lib.types.int (value: value >= start && value <= end)
+              ) "lib.types.ints.between start must be less than or equal to end";
-          // {
+            lib.types.withCheck lib.types.int (value: value >= start && value <= end)
-            name = "IntBetween";
+            // {
-            description = "integer between ${description start end}";
+              name = "IntBetween";
-          };
+              description = "integer between ${description start end}";
+            };
 
         ## Create a type that allows an integer value between a given range with a specific
         ## number of bits.
@@ -317,14 +323,15 @@ lib: {
         ## @type Int -> Int -> Attrs
         between =
           start: end:
-          assert lib.errors.trace (
+            assert lib.errors.trace
-            start <= end
+              (
-          ) "lib.types.numbers.between start must be less than or equal to end";
+                start <= end
-          lib.types.withCheck lib.types.number (value: value >= start && value <= end)
+              ) "lib.types.numbers.between start must be less than or equal to end";
-          // {
+            lib.types.withCheck lib.types.number (value: value >= start && value <= end)
-            name = "NumberBetween";
+            // {
-            description = "numbereger between ${description start end}";
+              name = "NumberBetween";
-          };
+              description = "numbereger between ${description start end}";
+            };
       in
       {
         inherit between;
@@ -447,8 +454,7 @@ lib: {
     };
 
     attrs = {
-      ## A type that allows an attribute set containing any type of value. The merged
+      ## A type that allows an attribute set containing any type of value.
-      ## definitions must all be.
       ##
       ## @type Attrs
       any = lib.types.create {
@@ -480,10 +486,12 @@ lib: {
             let
               normalize =
                 definition:
-                builtins.mapAttrs (name: value: {
+                builtins.mapAttrs
-                  __file__ = definition.__file__;
+                  (name: value: {
-                  value = value;
+                    __file__ = definition.__file__;
-                }) definition.value;
+                    value = value;
+                  })
+                  definition.value;
               normalized = builtins.map normalize definitions;
               zipper =
                 name: definitions: (lib.options.merge.definitions (location ++ [ name ]) type definitions).optional;
@@ -520,17 +528,19 @@ lib: {
             let
               normalize =
                 definition:
-                builtins.mapAttrs (name: value: {
+                builtins.mapAttrs
-                  __file__ = definition.__file__;
+                  (name: value: {
-                  value = value;
+                    __file__ = definition.__file__;
-                }) definition.value;
+                    value = value;
+                  })
+                  definition.value;
               normalized = builtins.map normalize definitions;
               zipper =
                 name: definitions:
                 let
                   merged = lib.options.merge.definitions (location ++ [ name ]) type definitions;
                 in
-                merged.optional.value or type.fallback.value or merged.merged;
+                  merged.optional.value or type.fallback.value or merged.merged;
             in
             builtins.zipAttrsWith zipper normalized;
           getSubOptions = prefix: type.getSubOptions (prefix ++ [ "<name>" ]);
@@ -569,7 +579,7 @@ lib: {
       ##
       ## @type Attrs
       shell = lib.types.derivation // {
-        check = value: lib.packages.isDerivation && builtins.hasAttr "shellPath" value;
+        check = value: lib.packages.isDerivation value && builtins.hasAttr "shellPath" value;
       };
     };
 
@@ -606,25 +616,30 @@ lib: {
           merge =
             location: definitions:
             let
-              result = lib.lists.mapWithIndex1 (
+              result = lib.lists.mapWithIndex1
-                i: definition:
+                (
-                lib.lists.mapWithIndex1 (
+                  i: definition:
-                  j: value:
+                    lib.lists.mapWithIndex1
-                  let
+                      (
-                    resolved =
+                        j: value:
-                      lib.options.merge.definitions (location ++ [ "[definition ${builtins.toString i}-entry ${j}]" ])
+                          let
-                        type
+                            resolved =
-                        [
+                              lib.options.merge.definitions (location ++ [ "[definition ${builtins.toString i}-entry ${j}]" ])
-                          {
+                                type
-                            file = definition.file;
+                                [
-                            value = value;
+                                  {
-                          }
+                                    file = definition.file;
-                        ];
+                                    value = value;
-                  in
+                                  }
-                  resolved.optional
+                                ];
-                ) definition.value
+                          in
-              ) definitions;
+                          resolved.optional
-              merged = builtins.concatLists result;
+                      )
+                      definition.value
+                )
+                definitions;
+
+              merged = lib.lists.flatten result;
               filtered = builtins.filter (definition: definition ? value) merged;
               values = lib.options.getDefinitionValues filtered;
             in
@@ -777,11 +792,11 @@ lib: {
       ##
       ## @type { modules :: List Module, args? :: Attrs, description? :: String | Null, shorthand? :: Bool } -> Attrs
       of =
-        settings@{
+        settings@{ modules
-          modules,
+        , args ? { }
-          args ? { },
+        , description ? null
-          description ? null,
+        , shorthand ? true
-          shorthand ? true,
+        ,
         }:
         let
           getModules = builtins.map (
@@ -790,9 +805,12 @@ lib: {
               let
                 # TODO: Figure out if we can apply additional attributes to the generated module.
                 # Currently this causes issues to do with redefined options.
-                rest = builtins.removeAttrs (lib.attrs.filter (
+                rest = builtins.removeAttrs
-                  name: value: builtins.elem name lib.modules.VALID_KEYS
+                  (lib.attrs.filter
-                ) definition.value) [ "freeform" ];
+                    (
+                      name: value: builtins.elem name lib.modules.VALID_KEYS
+                    )
+                    definition.value) [ "freeform" ];
               in
               if definition.value ? config then
                 rest
@@ -922,10 +940,12 @@ lib: {
           merge = location: definitions: {
             includes =
               modules
-              ++ builtins.map (definition: {
+              ++ builtins.map
-                __file__ = "${definition.__file__}; via ${lib.options.getIdentifier location}";
+                (definition: {
-                includes = [ definition.value ];
+                  __file__ = "${definition.__file__}; via ${lib.options.getIdentifier location}";
-              }) definitions;
+                  includes = [ definition.value ];
+                })
+                definitions;
           };
           getSubOptions = submodule.getSubOptions;
           getSubModules = submodule.getSubModules;
@@ -961,10 +981,12 @@ lib: {
         location: definitions:
         let
           first = builtins.elemAt definitions 0;
-          modules = builtins.map (definition: {
+          modules = builtins.map
-            __file__ = definition.__file__;
+            (definition: {
-            options = lib.options.create { type = definition.value; };
+              __file__ = definition.__file__;
-          }) definitions;
+              options = lib.options.create { type = definition.value; };
+            })
+            definitions;
           merged = lib.modules.fixup location (lib.options.merge.declarations location modules);
         in
         if builtins.length definitions == 1 then first.value else merged.type;
@@ -1100,6 +1122,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.
       ##
@@ -1160,10 +1219,12 @@ lib: {
           merge =
             location: definitions:
             submodule.merge location (
-              builtins.map (definition: {
+              builtins.map
-                __file__ = definition.__file__;
+                (definition: {
-                value = normalize definition;
+                  __file__ = definition.__file__;
-              }) definitions
+                  value = normalize definition;
+                })
+                definitions
             );
         };
     };

tidepool/flake.lock

@@ -8,33 +8,35 @@
       },
       "locked": {
         "dir": "foundation",
-        "dirtyRev": "9850da8aa9dc9be22e237c9b424a18e801e53ecb-dirty",
+        "lastModified": 1724190751,
-        "dirtyShortRev": "9850da8-dirty",
+        "narHash": "sha256-e8sOmeXS9YWuQqjW6gvtS3PIueazkf4S1iiJ/94eXv4=",
-        "lastModified": 1718529861,
+        "ref": "master",
-        "narHash": "sha256-X1Wd6mDz8GTaoxt1ylkvZfrJOcZtspJrEjXMtJ2ZyG0=",
+        "rev": "4b36a5a0133f5481840bdfaf693c971215a7ef1f",
+        "revCount": 84,
         "type": "git",
-        "url": "file:../?dir=foundation"
+        "url": "file:../"
       },
       "original": {
         "dir": "foundation",
         "type": "git",
-        "url": "file:../?dir=foundation"
+        "url": "file:../"
       }
     },
     "lib": {
       "locked": {
         "dir": "lib",
-        "dirtyRev": "9850da8aa9dc9be22e237c9b424a18e801e53ecb-dirty",
+        "lastModified": 1724190751,
-        "dirtyShortRev": "9850da8-dirty",
+        "narHash": "sha256-e8sOmeXS9YWuQqjW6gvtS3PIueazkf4S1iiJ/94eXv4=",
-        "lastModified": 1718529861,
+        "ref": "master",
-        "narHash": "sha256-X1Wd6mDz8GTaoxt1ylkvZfrJOcZtspJrEjXMtJ2ZyG0=",
+        "rev": "4b36a5a0133f5481840bdfaf693c971215a7ef1f",
+        "revCount": 84,
         "type": "git",
-        "url": "file:../?dir=lib"
+        "url": "file:../"
       },
       "original": {
         "dir": "lib",
         "type": "git",
-        "url": "file:../?dir=lib"
+        "url": "file:../"
       }
     },
     "root": {

tidepool/src/builders/basic.nix

@@ -1,10 +1,8 @@
-{ lib, config }:
+{ config }:
 let
   cfg = config.builders.basic;
 
-  lib' = config.lib;
+  inherit (config) lib foundation;
-
-  inherit (config) foundation;
 in
 {
   config.builders = {
@@ -14,15 +12,46 @@ in
       build =
         package:
         let
-          phases = package.phases;
-          sorted = lib.dag.sort.topographic phases;
-
-          script = lib.strings.concatMapSep "\n" (
-            entry: if builtins.isFunction entry.value then entry.value package else entry.value
-          ) sorted.result;
-
           system = package.platform.build.double;
 
+          dependencies = lib.packages.dependencies.collect package;
+
+          context = lib.packages.context.create dependencies { };
+
+          hooks = lib.packages.hooks.create dependencies context;
+
+          phasesWithHooks =
+            let
+              all = lib.lists.flatten [
+                hooks.build.only
+                hooks.build.build
+                hooks.build.host
+                hooks.build.target
+                hooks.host.only
+                hooks.host.host
+                hooks.host.target
+                hooks.target.only
+                hooks.target.target
+              ];
+            in
+            builtins.foldl' (final: defaults: lib.dag.apply.defaults final defaults) package.phases all;
+
+          phases = lib.dag.apply.defaults phasesWithHooks {
+            unpack = lib.dag.entry.before [ "patch" ] "";
+
+            patch = lib.dag.entry.between [ "unpack" ] [ "configure" ] "";
+
+            configure = lib.dag.entry.between [ "patch" ] [ "build" ] "";
+
+            build = lib.dag.entry.between [ "configure" ] [ "install" ] "";
+
+            install = lib.dag.entry.after [ "build" ] "";
+          };
+
+          sorted = lib.dag.sort.topological phases;
+
+          script = lib.strings.concatMapSep "\n" (entry: entry.value) sorted.result;
+
           built = builtins.derivation (
             package.env
             // {
@@ -36,7 +65,15 @@ in
               PATH =
                 let
                   bins = lib.paths.bin (
-                    (lib'.packages.dependencies.getPackages package.deps.build.host)
+                    (lib.packages.dependencies.get dependencies.build.only)
+                    ++ (lib.packages.dependencies.get dependencies.build.build)
+                    ++ (lib.packages.dependencies.get dependencies.build.host)
+                    ++ (lib.packages.dependencies.get dependencies.build.target)
+                    ++ (lib.packages.dependencies.get dependencies.host.only)
+                    ++ (lib.packages.dependencies.get dependencies.host.host)
+                    ++ (lib.packages.dependencies.get dependencies.host.target)
+                    ++ (lib.packages.dependencies.get dependencies.target.only)
+                    ++ (lib.packages.dependencies.get dependencies.target.target)
                     ++ [
                       foundation.stage2-bash
                       foundation.stage2-coreutils
@@ -70,7 +107,15 @@ in
             }
           );
         in
-        built // { inherit (package) meta; };
+        # (builtins.trace "build: ${package.name} -> build=${package.platform.build.triple} host=${package.platform.host.triple} target=${package.platform.target.triple}")
+        built
+        // {
+          inherit (package) meta;
+          extras = {
+            inherit package context;
+            phases = builtins.listToAttrs sorted.result;
+          } // package.extras;
+        };
     };
   };
 }

tidepool/src/export.nix

@@ -1,37 +1,39 @@
 # 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 = {
-        # foundation-gcc-x86_64 =
+        aux-a = config.packages.aux.a;
-        # (config.packages.foundation.gcc.versions."13.2.0".extend (args: {
+        aux-b = config.packages.aux.b;
-        #   config = {
+
-        #     platform = {
-        #       target = lib.modules.overrides.force "x86_64-linux";
-        #     };
-        #   };
-        # }))
-        # .config;
         foundation-gcc = config.packages.foundation.gcc;
+        foundation-glibc = config.packages.foundation.glibc;
         foundation-binutils = config.packages.foundation.binutils;
-        foundation-linux-headers = config.packages.foundation.linux-headers.versions.latest.extend {
+        foundation-linux-headers = config.packages.foundation.linux-headers;
-          platform.host = lib.modules.overrides.force "x86_64-linux";
+
+        cross-foundation-glibc-x86_64-linux = config.packages.cross.x86_64-linux.foundation.glibc;
+        cross-foundation-binutils-x86_64-linux = config.packages.cross.x86_64-linux.foundation.binutils;
+
+        cross-tool-foundation-gcc-newlib-x86_64-linux = config.packages.cross-tools.x86_64-linux.foundation.gcc-newlib;
+        cross-tool-foundation-gcc-x86_64-linux = config.packages.cross-tools.x86_64-linux.foundation.gcc-cross;
+        cross-foundation-gcc-x86_64-linux = config.packages.cross.x86_64-linux.foundation.gcc-bootstrap;
+
+        example-a = config.packages.foundation.gcc.versions.latest.extend {
+          platform = {
+            target = lib.modules.override 0 "x86_64-linux";
+          };
         };
-        # example-x = config.packages.example.x;
-        # cross-example-x-x86_64-linux = config.packages.cross.x86_64-linux.example.x;
       };
     };
-
-    # exported.packages.i686-linux.cross-foundation-gcc-x86_64-linux = config.packages.cross.x86_64-linux.foundation.gcc.package;
   };
 }

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,20 +1,272 @@
-{
+{ lib, config }:
-  lib,
+let
-  lib',
+  lib' = config.lib;
-  config,
+in
-}:
 {
   config = {
     lib.packages = {
       dependencies = {
-        getPackages =
+        get =
           dependencies:
           let
-            available = builtins.filter (dependency: !(builtins.isNull dependency)) (
+            exists = value: !(builtins.isNull value);
-              builtins.attrValues dependencies
+            available = builtins.filter exists dependencies;
-            );
           in
           builtins.map (dependency: dependency.package) available;
+
+        build =
+          build': host': target':
+          builtins.mapAttrs (name: dep: lib'.packages.build dep build' host' target');
+
+        collect =
+          package:
+          let
+            isPropagated = name: package: package.propagate or false;
+            getPropagatedDependencies = target: builtins.attrValues (lib.attrs.filter isPropagated target);
+
+            process =
+              dependencies:
+              let
+                getDeps =
+                  name: dependency:
+                  let
+                    deps = {
+                      build = {
+                        only = getPropagatedDependencies dependency.deps.build.only ++ process dependency.deps.build.only;
+                        build =
+                          getPropagatedDependencies dependency.deps.build.build
+                          ++ process dependency.deps.build.build;
+                        host = getPropagatedDependencies dependency.deps.build.host ++ process dependency.deps.build.host;
+                        target =
+                          getPropagatedDependencies dependency.deps.build.target
+                          ++ process dependency.deps.build.target;
+                      };
+                      host = {
+                        only = getPropagatedDependencies dependency.deps.host.only ++ process dependency.deps.host.only;
+                        host = getPropagatedDependencies dependency.deps.host.host ++ process dependency.deps.host.host;
+                        target =
+                          getPropagatedDependencies dependency.deps.host.target
+                          ++ process dependency.deps.host.target;
+                      };
+                      target = {
+                        only = getPropagatedDependencies dependency.deps.target.only ++ process dependency.deps.target.only;
+                        target =
+                          getPropagatedDependencies dependency.deps.target.target
+                          ++ process dependency.deps.target.target;
+                      };
+                    };
+                  in
+                  lib.lists.flatten [
+                    deps.build.only
+                    deps.build.build
+                    deps.build.host
+                    deps.build.target
+                    deps.host.only
+                    deps.host.host
+                    deps.host.target
+                    deps.target.only
+                    deps.target.target
+                  ];
+
+                propagated = lib.attrs.mapToList getDeps dependencies;
+              in
+              lib.lists.flatten propagated;
+          in
+          {
+            build = {
+              only = builtins.attrValues package.deps.build.only ++ process package.deps.build.only;
+              build = builtins.attrValues package.deps.build.build ++ process package.deps.build.build;
+              host = builtins.attrValues package.deps.build.host ++ process package.deps.build.host;
+              target = builtins.attrValues package.deps.build.target ++ process package.deps.build.target;
+            };
+            host = {
+              only = builtins.attrValues package.deps.host.only ++ process package.deps.host.only;
+              host = builtins.attrValues package.deps.host.host ++ process package.deps.host.host;
+              target = builtins.attrValues package.deps.host.target ++ process package.deps.host.target;
+            };
+            target = {
+              only = builtins.attrValues package.deps.target.only ++ process package.deps.target.only;
+              target = builtins.attrValues package.deps.target.target ++ process package.deps.target.target;
+            };
+          };
+      };
+
+      context = {
+        create =
+          collected: ctx:
+          let
+            process =
+              path:
+              let
+                dependencies = lib.attrs.selectOrThrow path collected;
+                contexts = builtins.map (dependency: dependency.context or { }) dependencies;
+                result = lib.modules.run {
+                  prefix = [ "<package>" ];
+                  modules = builtins.map (context: { config = context; }) contexts ++ [
+                    {
+                      freeform = lib.types.any;
+
+                      options = config.packages.context.options // {
+                        target = lib.options.create {
+                          description = "The dependency target that is being generated.";
+                          type = lib.types.enum [
+                            "build.only"
+                            "build.build"
+                            "build.host"
+                            "build.target"
+                            "host.only"
+                            "host.host"
+                            "host.target"
+                            "target.only"
+                            "target.target"
+                          ];
+                          writable = false;
+                          default.value = builtins.concatStringsSep "." path;
+                        };
+
+                        deps = lib.options.create {
+                          description = "The collected dependencies.";
+                          writable = false;
+                          default.value = collected;
+                          type = lib.types.submodule {
+                            options = {
+                              build = {
+                                only = lib.options.create { type = lib.types.list.of lib'.types.package; };
+                                build = lib.options.create { type = lib.types.list.of lib'.types.package; };
+                                host = lib.options.create { type = lib.types.list.of lib'.types.package; };
+                                target = lib.options.create { type = lib.types.list.of lib'.types.package; };
+                              };
+                              host = {
+                                only = lib.options.create { type = lib.types.list.of lib'.types.package; };
+                                host = lib.options.create { type = lib.types.list.of lib'.types.package; };
+                                target = lib.options.create { type = lib.types.list.of lib'.types.package; };
+                              };
+                              target = {
+                                only = lib.options.create { type = lib.types.list.of lib'.types.package; };
+                                target = lib.options.create { type = lib.types.list.of lib'.types.package; };
+                              };
+                            };
+                          };
+                        };
+                      };
+
+                      config = ctx;
+                    }
+                  ];
+                };
+              in
+              result.config;
+          in
+          {
+            build = {
+              only = process [
+                "build"
+                "only"
+              ];
+              build = process [
+                "build"
+                "build"
+              ];
+              host = process [
+                "build"
+                "host"
+              ];
+              target = process [
+                "build"
+                "target"
+              ];
+            };
+            host = {
+              only = process [
+                "host"
+                "only"
+              ];
+              host = process [
+                "host"
+                "host"
+              ];
+              target = process [
+                "host"
+                "target"
+              ];
+            };
+            target = {
+              only = process [
+                "target"
+                "only"
+              ];
+              target = process [
+                "target"
+                "target"
+              ];
+            };
+          };
+      };
+
+      hooks = {
+        create =
+          collected: ctx:
+          let
+            process =
+              path:
+              let
+                dependencies = lib.attrs.selectOrThrow path collected;
+                hooks = builtins.map
+                  (
+                    dependency:
+                    let
+                      getHooks = dependency.hooks or (lib.fp.const { });
+                    in
+                    getHooks ctx
+                  )
+                  dependencies;
+              in
+              hooks;
+          in
+          {
+            build = {
+              only = process [
+                "build"
+                "only"
+              ];
+              build = process [
+                "build"
+                "build"
+              ];
+              host = process [
+                "build"
+                "host"
+              ];
+              target = process [
+                "build"
+                "target"
+              ];
+            };
+            host = {
+              only = process [
+                "host"
+                "only"
+              ];
+              host = process [
+                "host"
+                "host"
+              ];
+              target = process [
+                "host"
+                "target"
+              ];
+            };
+            target = {
+              only = process [
+                "target"
+                "only"
+              ];
+              target = process [
+                "target"
+                "target"
+              ];
+            };
+          };
       };
 
       getLatest =
@@ -25,54 +277,89 @@
         in
         builtins.head sorted;
 
+      resolve =
+        alias:
+        if alias ? versions then
+          alias.versions.${config.preferences.packages.version}
+            or (alias.versions.${lib'.packages.getLatest alias})
+        else
+          alias;
+
       build =
-        package: build: host: target:
+        alias: build: host: target:
         let
-          resolved =
+          package = lib'.packages.resolve alias;
-            if package ? versions then
-              package.versions.${config.preferences.packages.version}
-                or (package.versions.${lib'.packages.getLatest package})
-            else
-              package;
 
           buildDependencies =
             build': host': target':
             builtins.mapAttrs (name: dep: lib'.packages.build dep build' host' target');
 
-          result = resolved.extend (
+          platform = {
-            { config }:
+            build = lib.modules.overrides.force build;
-            {
+            host = lib.modules.overrides.force host;
-              config = {
+            target = lib.modules.overrides.force target;
-                platform = {
+          };
-                  build = build;
-                  host = host;
-                  target = lib.modules.override 150 target;
-                };
 
-                deps = {
+          withPlatform = lib.modules.run {
-                  build = {
+            modules = package.__modules__ ++ [
-                    only = buildDependencies build build build resolved.deps.build.only;
+              lib'.types.package.children.submodule
-                    build = buildDependencies build build target resolved.deps.build.build;
+              (
-                    host = buildDependencies build host target resolved.deps.build.host;
+                { config }:
-                    target = buildDependencies build target target resolved.deps.build.target;
+                {
-                  };
+                  config = {
-                  host = {
+                    __modules__ = package.__modules__;
-                    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, config }:
-  lib,
+let
-  lib',
+  inherit (config) preferences builders;
-  config,
+
-}:
+  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,256 +71,397 @@
         };
       };
 
-      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 (
+      dependencies =
-        lib.types.submodule {
+        build: host: target:
-          options = {
+        let
-            versions = lib.options.create {
+          initial = lib.types.raw;
-              description = "All available package versions.";
+
-              type = lib.types.attrs.of lib'.types.package;
+          transform =
-            };
+            value:
+            let
+              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;
           };
-        }
-      );
 
-      dependencies = lib.types.attrs.of (
+          latest = lib.options.create {
-        lib.types.nullish (lib.types.either lib'.types.alias lib'.types.package)
+            description = "The latest version of the package.";
-      );
+            type = lib'.types.package;
+          };
 
-      package = lib.types.submodule (
+          versions = lib.options.create {
-        { config, meta }:
+            description = "Available versions of the package.";
-        {
+            type = lib.types.attrs.of lib'.types.package;
-          options = {
+            default.value = { };
-            extend = lib.options.create {
+          };
-              description = "Extend the package's submodules with additional configuration.";
+        };
-              type = lib.types.function lib.types.raw;
+      };
-              default.value =
+
-                value:
+      package =
-                let
+        let
-                  result = meta.extend {
+          normalize =
-                    modules = if builtins.isAttrs value then [ { config = value; } ] else lib.lists.from.any value;
+            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 = { };
                   };
-                in
-                result.config;
-            };
 
-            name = lib.options.create {
+                  build = lib.options.create {
-              description = "The name of the package.";
+                    description = "Dependencies which are created in the build environment and are executed in the build environment.";
-              type = lib.types.string;
+                    type = lib'.types.dependencies build build target;
-              default = {
+                    default.value = { };
-                text = "\${config.pname}-\${config.version}";
+                  };
-                value =
+
-                  if config.pname != null && config.version != null then "${config.pname}-${config.version}" else "";
+                  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 = { };
+                  };
+                };
+
+                host = {
+                  only = lib.options.create {
+                    description = "Dependencies which are only used in the host environment.";
+                    type = lib'.types.dependencies host host host;
+                    default.value = { };
+                  };
+
+                  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 = { };
+                  };
+                };
               };
             };
 
-            pname = lib.options.create {
+          submodule =
-              description = "The program name for the package";
+            { config, meta }:
-              type = lib.types.nullish lib.types.string;
+            let
-              default.value = null;
+              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 = [ ];
+                };
 
-            version = lib.options.create {
+                # extend = lib.options.create {
-              description = "The version for the package.";
+                #   description = "Extend the package definition.";
-              type = lib.types.nullish lib.types.version;
+                #   type = lib.types.function lib.types.raw;
-              default.value = null;
+                #   internal = true;
-            };
+                #   writable = false;
-
+                #   default.value = module:
-            meta = {
+                #     let
-              description = lib.options.create {
+                #       normalized =
-                description = "The description for the package.";
+                #         if builtins.isList module then
-                type = lib.types.nullish lib.types.string;
+                #           module
-                default.value = null;
+                #         else if builtins.isFunction module || module ? config then
-              };
+                #           [ module ]
-
+                #         else
-              homepage = lib.options.create {
+                #           [{
-                description = "The homepage for the package.";
+                #             config = module;
-                type = lib.types.nullish lib.types.string;
+                #           }];
-                default.value = null;
+                #       result = meta.extend {
-              };
+                #         modules =
-
+                #           normalized ++ [
-              license = lib.options.create {
+                #             {
-                description = "The license for the package.";
+                #               config.__modules__ = lib.modules.overrides.force (config.__modules__ ++ normalized);
-                type = lib.types.nullish lib'.types.license;
+                #             }
-                default.value = null;
+                #           ];
-              };
+                #       };
-
+                #     in
-              free = lib.options.create {
+                #     result.config;
-                description = "Whether the package is free.";
-                type = lib.types.bool;
-                default.value = true;
-              };
-
-              insecure = lib.options.create {
-                description = "Whether the package is insecure.";
-                type = lib.types.bool;
-                default.value = false;
-              };
-
-              broken = lib.options.create {
-                description = "Whether the package is broken.";
-                type = lib.types.bool;
-                default.value = false;
-              };
-
-              main = lib.options.create {
-                description = "The main entry point for the package.";
-                type = lib.types.nullish lib.types.string;
-                default.value = null;
-              };
-
-              platforms = lib.options.create {
-                description = "The platforms the package supports.";
-                type = lib.types.list.of lib.types.string;
-                default.value = [ ];
-              };
-            };
-
-            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;
-              };
-
-              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;
-              };
 
-              target = lib.options.create {
+                extend = lib.options.create {
-                description = "The target platform for the package.";
+                  description = "Extend the package definition.";
-                type = lib.types.string;
+                  type = lib.types.function lib.types.raw;
-                default.value = "x86_64-linux";
+                  internal = true;
-                # apply = raw: let
+                  writable = false;
-                #   system = lib'.systems.from.string raw;
+                  default.value = module:
-                # in {
+                    let
-                #   inherit raw system;
+                      normalized =
+                        if builtins.isList module then
+                          module
+                        else if builtins.isFunction module || module ? config then
+                          [ module ]
+                        else
+                          [{
+                            config = module;
+                          }];
 
-                #   double = lib'.systems.into.double system;
+											modules = config.__modules__ ++ normalized;
-                #   triple = lib'.systems.into.triple system;
-                # };
-                apply =
-                  raw:
-                  let
-                    system = lib'.systems.from.string raw;
-                    x = lib'.systems.withBuildInfo raw;
-                  in
-                  x;
-              };
-            };
 
-            phases = lib.options.create {
+                      result = lib.modules.run {
-              description = "The phases for the package.";
+                        modules = [
-              type = lib.types.dag.of (lib.types.either lib.types.string (lib.types.function lib.types.string));
+													submodule
-              default.value = { };
+													{ config.__modules__ = modules; }
-            };
+												] ++ modules;
+                      };
+                    in
+                    result.config;
+                };
 
-            env = lib.options.create {
+                meta = {
-              description = "The environment for the package.";
+                  description = lib.options.create {
-              type = lib.types.attrs.of lib.types.string;
+                    description = "The description for the package.";
-              default.value = { };
+                    type = lib.types.string;
-            };
+                    default.value = "";
+                  };
 
-            builder = lib.options.create {
+                  homepage = lib.options.create {
-              description = "The builder for the package.";
+                    description = "The homepage for the package.";
-              type = lib'.types.builder;
+                    type = lib.types.nullish lib.types.string;
-            };
+                    default.value = null;
+                  };
 
-            deps = {
+                  license = lib.options.create {
-              build = {
+                    description = "The license for the package.";
-                only = lib.options.create {
+                    type = lib.types.nullish lib'.types.license;
-                  description = "Dependencies which are only used in the build environment.";
+                    default.value = null;
-                  type = lib'.types.dependencies;
+                  };
+
+                  free = lib.options.create {
+                    description = "Whether the package is free.";
+                    type = lib.types.bool;
+                    default.value = true;
+                  };
+
+                  insecure = lib.options.create {
+                    description = "Whether the package is insecure.";
+                    type = lib.types.bool;
+                    default.value = false;
+                  };
+
+                  broken = lib.options.create {
+                    description = "Whether the package is broken.";
+                    type = lib.types.bool;
+                    default.value = false;
+                  };
+
+                  main = lib.options.create {
+                    description = "The main entry point for the package.";
+                    type = lib.types.nullish lib.types.string;
+                    default.value = null;
+                  };
+
+                  platforms = lib.options.create {
+                    description = "The platforms the package supports.";
+                    type = lib.types.list.of lib.types.string;
+                    default.value = [ ];
+                  };
+                };
+
+                extras = lib.options.create {
+                  description = "Extra information for the package.";
+                  type = lib.types.attrs.of lib.types.any;
                   default.value = { };
                 };
 
-                build = lib.options.create {
+                platform = {
-                  description = "Dependencies which are created in the build environment and are executed in the build environment.";
+                  build = lib.options.create {
-                  type = lib'.types.dependencies;
+                    description = "The build platform for the package.";
+                    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.platform;
+                    default.value = lib'.systems.withBuildInfo "x86_64-linux";
+                  };
+
+                  target = lib.options.create {
+                    description = "The target platform for the package.";
+                    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;
+                };
+
+                env = lib.options.create {
+                  description = "The environment for the package.";
+                  type = lib.types.attrs.of lib.types.string;
                   default.value = { };
                 };
 
-                host = lib.options.create {
+                package = lib.options.create {
-                  description = "Dependencies which are created in the build environment and are executed in the host environment.";
+                  description = "The built derivation.";
-                  type = lib'.types.dependencies;
+                  type = lib.types.derivation;
+                  default.value = config.builder.build config;
+                };
+
+                phases = lib.options.create {
+                  description = "The phases for the package.";
+                  type = lib.types.dag.of lib.types.string;
                   default.value = { };
                 };
 
-                target = lib.options.create {
+                context = lib.options.create {
-                  description = "Dependencies which are created in the build environment and are executed in the target environment.";
+                  description = "The context information that the package provides.";
-                  type = lib'.types.dependencies;
+                  type = lib.types.attrs.of lib.types.raw;
-                  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 {
+                hooks = lib.options.create {
-                  description = "Dependencies which are executed in the host environment.";
+                  description = "The hooks that the package provides.";
-                  type = lib'.types.dependencies;
+                  type = lib.types.function (lib.types.dag.of lib.types.string);
-                  default.value = { };
+                  default.value = ctx: { };
                 };
 
-                target = lib.options.create {
+                propagate = lib.options.create {
-                  description = "Dependencies which are executed in the host environment which produces code for the target environment.";
+                  description = "Whether the package should propagate its hooks and context.";
-                  type = lib'.types.dependencies;
+                  type = lib.types.bool;
-                  default.value = { };
+                  default.value = false;
-                };
-              };
-
-              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 {
+                deps = lib.options.create {
-                  description = "Dependencies which are executed in the target environment.";
+                  description = "The dependencies for the package.";
-                  type = lib'.types.dependencies;
+                  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;
+                    };
+                  };
                 };
               };
             };
 
-            package = lib.options.create {
+          type = (lib.types.coerceWithLocation initial transform final) // {
-              description = "The built derivation.";
+            name = "Package";
-              type = lib.types.derivation;
+            description = "a package definition";
-              default.value = config.builder.build config;
-            };
           };
-        }
+        in
-      );
+        type
+        // {
+          children = type.children // {
+            inherit submodule;
+          };
+        };
     };
   };
 }

tidepool/src/packages/aux/a.nix

@@ -0,0 +1,36 @@
+{ 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,54 @@
+{ 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;
+
+            deps = {
+              build = {
+                host = {
+                  c = packages.aux.c.versions.latest.extend {
+                    propagate = true;
+                  };
+                };
+              };
+            };
+
+            context = {
+              "foundation:cflags" = [ "-I $AUX_B/include" ];
+            };
+
+            hooks = ctx: { "aux:b:env" = lib.dag.entry.after [ "unpack" ] ''export AUX_B=${config.package}''; };
+
+            phases = {
+              install = ''
+                echo "b" > $out
+              '';
+            };
+          };
+        };
+    };
+  };
+}

tidepool/src/packages/aux/c.nix

@@ -0,0 +1,44 @@
+{ config }:
+let
+  inherit (config) lib builders packages;
+in
+{
+  config.packages.aux.c = {
+    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 = "c";
+            version = "1.0.0";
+
+            builder = builders.basic;
+
+            context = {
+              "foundation:cflags" = [ "-I $AUX_C/include" ];
+            };
+
+            hooks = ctx: { "aux:c:env" = lib.dag.entry.after [ "unpack" ] ''export AUX_C=${config.package}''; };
+
+            phases = {
+              install = ''
+                echo "c" > $out
+              '';
+            };
+          };
+        };
+    };
+  };
+}

tidepool/src/packages/default.nix

@@ -1,30 +1,51 @@
-{
+{ config }:
-  lib,
-  lib',
-  config,
-}:
 let
-  doubles = lib'.systems.doubles.all;
+  inherit (config) lib;
 
-  packages = builtins.removeAttrs config.packages [ "cross" ];
+  doubles = lib.systems.doubles.all;
+
+  packages = builtins.removeAttrs config.packages [ "cross" "cross-tools" ];
 in
 {
-  includes = [ ./foundation ];
+  includes = [
+    ./foundation
+    ./aux/a.nix
+    ./aux/b.nix
+    ./aux/c.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 (
+        options = {
-          system:
+          cross-tools = lib.attrs.generate doubles (
-          lib.options.create {
+            system:
-            description = "The cross-compiled package set for the ${system} target.";
+            lib.options.create {
-            type = lib'.types.packages;
+              description = "The cross-compilation tools for the ${system} target.";
-            default = { };
+              type = lib.types.packages;
-          }
+              default.value = { };
-        );
+            }
+          );
+          cross = lib.attrs.generate doubles (
+            system:
+            lib.options.create {
+              description = "The cross-compiled package set for the ${system} target.";
+              type = lib.types.packages;
+              default.value = { };
+            }
+          );
+
+          # NOTE: We may offer a way to set default context values. For this reason we have
+          # nested `options` under `context` rather than using a plain option directly under `packages`.
+          context.options = lib.options.create {
+            description = "The available options for package contexts.";
+            default.value = { };
+            type = lib.types.attrs.of lib.types.option;
+          };
+        };
       };
     };
 
@@ -40,54 +61,67 @@ in
     };
   };
 
-  config.packages.cross = lib.attrs.generate doubles (
+  config = {
-    system:
+    packages.cross-tools = lib.attrs.generate doubles (
-    builtins.mapAttrs (
+      system:
-      namespace:
+      builtins.mapAttrs
-      builtins.mapAttrs (
+        (
-        name: alias:
+          namespace:
-        let
+          builtins.mapAttrs (
-          setHost =
+            name: alias:
-            package:
+              let
-            if package != { } then
+                setTarget =
-              (package.extend (
+                  package:
-                { config }:
+                  package
-                {
+                  // {
-                  config = {
+                    __modules__ = package.__modules__ ++ [
-                    platform = {
+                      {
-                      host = lib.modules.overrides.force system;
+                        config.platform = {
-                      target = lib.modules.overrides.default system;
+                          target = lib.modules.override 5 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 // {
+                updated = alias // {
-            versions = builtins.mapAttrs (version: package: setHost package) alias.versions;
+                  versions = builtins.mapAttrs (version: package: setTarget package) alias.versions;
-          };
+                };
-        in
+              in
-        updated
+              updated
-      )
+          )
-    ) packages
+        )
-  );
+        packages
+    );
+    packages.cross = lib.attrs.generate doubles (
+      system:
+      builtins.mapAttrs
+        (
+          namespace:
+          builtins.mapAttrs (
+            name: alias:
+              let
+                setPlatform =
+                  package:
+                  package
+                  // {
+                    __modules__ = package.__modules__ ++ [
+                      {
+                        config.platform = {
+                          host = lib.modules.override 5 system;
+                          target = lib.modules.override 5 system;
+                        };
+                      }
+                    ];
+                  };
+
+                updated = alias // {
+                  versions = builtins.mapAttrs (version: package: setPlatform package) alias.versions;
+                };
+              in
+              updated
+          )
+        )
+        packages
+    );
+  };
 }

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

@@ -1,8 +1,8 @@
-{
+{ lib
-  lib,
+, lib'
-  lib',
+, config
-  config,
+, options
-  options,
+,
 }:
 let
   inherit (config)
@@ -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 {
@@ -26,93 +27,149 @@ in
             };
           };
 
-          config = {
+          config =
-            meta = {
+            let
-              platforms = [ "i686-linux" ];
+              isBuildBootstrapped = config.platform.build.double == "i686-linux";
-            };
+              isHostBootstrapped = config.platform.host.double == "i686-linux";
 
-            pname = "binutils";
+              isBootstrapped = isBuildBootstrapped && isHostBootstrapped;
-            version = "2.41";
 
-            builder = builders.basic;
+              isCross =
-
+                config.platform.build.double != config.platform.host.double
-            env = {
+                && config.platform.host.double == config.platform.target.double;
-              PATH = lib.paths.bin [
+            in
-                foundation.stage2-gcc
+            {
-                foundation.stage2-binutils
+              meta = {
-                foundation.stage2-gnumake
+                platforms = [
-                foundation.stage2-gnupatch
+                  "i686-linux"
-                foundation.stage2-gnused
+                  "x86_64-linux"
-                foundation.stage2-gnugrep
-                foundation.stage2-gawk
-                foundation.stage2-diffutils
-                foundation.stage2-findutils
-                foundation.stage2-gnutar
-                foundation.stage1-xz
-              ];
-            };
-
-            phases =
-              let
-                patches = [
-                  # Make binutils output deterministic by default.
-                  ./patches/deterministic.patch
                 ];
-
-                configureFlags = [
-                  # "CC=musl-gcc"
-                  "LDFLAGS=--static"
-                  "--prefix=${builtins.placeholder "out"}"
-                  "--build=${config.platform.build.triple}"
-                  "--host=${config.platform.host.triple}"
-                  "--target=${config.platform.target.triple}"
-
-                  "--with-sysroot=/"
-                  "--enable-deterministic-archives"
-                  # depends on bison
-                  "--disable-gprofng"
-
-                  # Turn on --enable-new-dtags by default to make the linker set
-                  # RUNPATH instead of RPATH on binaries.  This is important because
-                  # RUNPATH can be overridden using LD_LIBRARY_PATH at runtime.
-                  "--enable-new-dtags"
-
-                  # By default binutils searches $libdir for libraries. This brings in
-                  # libbfd and libopcodes into a default visibility. Drop default lib
-                  # path to force users to declare their use of these libraries.
-                  "--with-lib-path=:"
-
-                  "--disable-multilib"
-                ];
-              in
-              {
-                unpack = lib.dag.entry.before [ "patch" ] ''
-                  tar xf ${config.src}
-                  cd binutils-${config.version}
-                '';
-
-                patch = lib.dag.entry.between [ "configure" ] [ "unpack" ] ''
-                  ${lib.strings.concatMapSep "\n" (file: "patch -Np1 -i ${file}") patches}
-                '';
-
-                configure = lib.dag.entry.between [ "build" ] [ "patch" ] ''
-                  bash ./configure ${builtins.concatStringsSep " " configureFlags}
-                '';
-
-                build = lib.dag.entry.between [ "install" ] [ "configure" ] ''
-                  make -j $NIX_BUILD_CORES
-                '';
-
-                install = lib.dag.entry.after [ "build" ] ''
-                  make -j $NIX_BUILD_CORES install-strip
-                '';
               };
 
-            src = builtins.fetchurl {
+              pname = "binutils";
-              url = "${mirrors.gnu}/binutils/binutils-${config.version}.tar.xz";
+              version = "2.41";
-              sha256 = "rppXieI0WeWWBuZxRyPy0//DHAMXQZHvDQFb3wYAdFA=";
+
+              builder = builders.basic;
+
+              deps = {
+                build = {
+                  only = {
+                    gcc = lib.modules.when (!isBootstrapped) (
+                      if isCross then
+                        packages.foundation.gcc-cross.versions.latest.extend
+                          {
+                            platform = lib.modules.override 0 {
+                              inherit (config.platform) build target;
+                              host = config.platform.build;
+                            };
+                          }
+                      else
+                        packages.foundation.gcc.versions.latest
+                    );
+                    glibc = lib.modules.when (isCross) (
+                      packages.foundation.glibc.versions.latest.extend {
+                        platform = lib.modules.override 0 {
+                          inherit (config.platform) host target build;
+                        };
+                      }
+                    );
+                    binutils = lib.modules.when (isCross) (
+                      packages.foundation.binutils.versions.latest.extend {
+                        platform = lib.modules.override 0 {
+                          inherit (config.platform) target build;
+                          host = config.platform.build;
+                        };
+                      }
+                    );
+                  };
+                };
+              };
+
+              env = {
+                PATH = lib.paths.bin (
+                  lib.lists.when (isBootstrapped) [ foundation.stage2-gcc ]
+                    ++ [
+                    foundation.stage2-gcc
+                    foundation.stage2-binutils
+                    foundation.stage2-gnumake
+                    foundation.stage2-gnupatch
+                    foundation.stage2-gnused
+                    foundation.stage2-gnugrep
+                    foundation.stage2-gawk
+                    foundation.stage2-diffutils
+                    foundation.stage2-findutils
+                    foundation.stage2-gnutar
+                    foundation.stage1-xz
+                  ]
+                );
+              } // (lib.attrs.when (isCross) {
+                LDFLAGS_FOR_TARGET = "-B${config.deps.build.only.glibc.package}/lib -L${config.deps.build.only.glibc.package}/lib -I${config.deps.build.only.glibc.package}/include";
+              });
+
+              phases =
+                let
+                  patches = [
+                    # Make binutils output deterministic by default.
+                    ./patches/deterministic.patch
+                  ];
+
+                  configureFlags =
+                    lib.lists.when (!isCross) [
+                      "LDFLAGS=--static"
+                    ]
+                    ++ [
+                      "--prefix=${builtins.placeholder "out"}"
+                      "--build=${config.platform.build.triple}"
+                      "--host=${config.platform.host.triple}"
+                      "--target=${config.platform.target.triple}"
+
+                      "--with-sysroot=/"
+                      "--enable-deterministic-archives"
+                      # depends on bison
+                      "--disable-gprofng"
+
+                      # Turn on --enable-new-dtags by default to make the linker set
+                      # RUNPATH instead of RPATH on binaries.  This is important because
+                      # RUNPATH can be overridden using LD_LIBRARY_PATH at runtime.
+                      "--enable-new-dtags"
+
+                      # By default binutils searches $libdir for libraries. This brings in
+                      # libbfd and libopcodes into a default visibility. Drop default lib
+                      # path to force users to declare their use of these libraries.
+                      "--with-lib-path=:"
+
+                      "--disable-multilib"
+
+                    ];
+                in
+                {
+                  unpack = ''
+                    tar xf ${config.src}
+                    cd binutils-${config.version}
+                  '';
+
+                  patch = ''
+                    ${lib.strings.concatMapSep "\n" (file: "patch -Np1 -i ${file}") patches}
+                  '';
+
+                  configure = ''
+                    bash ./configure ${builtins.concatStringsSep " " configureFlags}
+                  '';
+
+                  build = ''
+                    make -j $NIX_BUILD_CORES
+                  '';
+
+                  install = ''
+                    make -j $NIX_BUILD_CORES install-strip
+                  '';
+                };
+
+              src = builtins.fetchurl {
+                url = "${mirrors.gnu}/binutils/binutils-${config.version}.tar.xz";
+                sha256 = "rppXieI0WeWWBuZxRyPy0//DHAMXQZHvDQFb3wYAdFA=";
+              };
             };
-          };
         };
     };
   };

tidepool/src/packages/foundation/default.nix

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

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

@@ -0,0 +1,84 @@
+{ config, options }:
+let
+  inherit (config)
+    lib
+    packages
+    ;
+in
+{
+  config.packages.foundation.gcc-bootstrap = {
+    versions = {
+      "latest" = config.packages.foundation.gcc.versions.latest.extend
+        (
+          { config }:
+          {
+            config = {
+              meta = {
+                platforms = lib.modules.override 0 [
+                  "i686-linux"
+                ];
+              };
+
+              deps = {
+                build = {
+                  build = {
+                    gcc = lib.modules.override 0 (
+                      packages.foundation.gcc-cross.versions.latest.extend {
+                        platform = lib.modules.override 0 {
+                          build = "i686-linux";
+                          target = config.platform.target;
+                          host = "i686-linux";
+                        };
+                      }
+                    );
+                    binutils = lib.modules.override 0 (
+                      packages.foundation.binutils.versions.latest.extend {
+                        platform = lib.modules.override 0 {
+                          build = "i686-linux";
+                          target = config.platform.target;
+                          host = config.platform.host;
+                        };
+                      }
+                    );
+                    glibc = lib.modules.override 0 (
+                      packages.foundation.glibc.versions.latest.extend {
+                        platform = lib.modules.override 0 {
+                          build = "i686-linux";
+                          target = config.platform.target;
+                          host = config.platform.host;
+                        };
+                      }
+                    );
+                  };
+                };
+              };
+
+              env = {
+                LIBRARY_PATH = lib.modules.override 0 "${config.deps.build.build.glibc.package}/lib";
+                LDFLAGS_FOR_TARGET =
+                  lib.modules.override 0
+                    "-L$(pwd)/${config.platform.target.triple}/libgcc -L${config.deps.build.build.glibc.package}/lib";
+              };
+
+              configureFlags = lib.modules.override 0 [
+                "--prefix=${builtins.placeholder "out"}"
+                # Pretend we're native even though we're not
+                "--build=${config.platform.target.triple}"
+                "--host=${config.platform.host.triple}"
+                "--target=${config.platform.target.triple}"
+                "--with-as=${config.deps.build.build.binutils.package}/bin/as"
+                "--with-ld=${config.deps.build.build.binutils.package}/bin/ld"
+                "--enable-languages=c,c++"
+                "--disable-bootstrap"
+                "--disable-libsanitizer"
+                "--disable-multilib"
+                "--with-native-system-header-dir=${config.deps.build.build.glibc.package}/include"
+                "--with-gxx-include-dir=${placeholder "out"}/include/c++/${config.version}/"
+                "--with-build-sysroot=/"
+              ];
+            };
+          }
+        );
+    };
+  };
+}

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

@@ -0,0 +1,104 @@
+{ config, options }:
+let
+  inherit (config)
+    lib
+    foundation
+    packages
+    ;
+in
+{
+  config.packages.foundation.gcc-cross = {
+    versions = {
+      "latest" = config.packages.foundation.gcc.versions.latest.extend
+        (
+          { config }:
+          {
+            config =
+              let
+                programPrefix = lib.strings.when
+                  (
+                    config.platform.build.triple != config.platform.target.triple
+                  ) "${config.platform.target.triple}-";
+              in
+              {
+                meta = {
+                  platforms = lib.modules.override 0 [
+                    "i686-linux"
+                  ];
+                };
+
+                deps = {
+                  build = {
+                    build = {
+                      binutils = (
+                        packages.foundation.binutils.versions.latest.extend {
+                          platform = lib.modules.override 0 config.platform;
+                        }
+                      );
+                      glibc = (
+                        packages.foundation.glibc.versions.latest.extend {
+                          platform = lib.modules.override 0 {
+                            inherit (config.platform) build target;
+                            host = config.platform.target;
+                          };
+                        }
+                      );
+                      linux-headers = (
+                        packages.foundation.linux-headers.versions.latest.extend {
+                          platform.target = lib.modules.override 0 config.platform.target;
+                        }
+                      );
+                    };
+                  };
+                };
+
+                env = {
+                  # LIBRARY_PATH = lib.modules.override 0 "${foundation.stage1-musl}/lib";
+                  CC = lib.modules.override 0 "gcc -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so -idirafter ${foundation.stage1-musl}/include";
+                  CXX = lib.modules.override 0 "g++ -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so -idirafter ${foundation.stage1-musl}/include";
+                  CFLAGS_FOR_TARGET =
+                    lib.modules.override 0
+                      "-Wl,-dynamic-linker -Wl,${config.deps.build.build.glibc.package}/lib/ld-linux-x86-64.so.2 -B${config.deps.build.build.glibc.package}/lib";
+                  LDFLAGS_FOR_TARGET =
+                    lib.modules.override 0
+                      "-L$(pwd)/${config.platform.target.triple}/libgcc -L${config.deps.build.build.glibc.package}/lib";
+                };
+
+                configureFlags = lib.modules.override 0 [
+                  "--prefix=${builtins.placeholder "out"}"
+                  "--build=${config.platform.build.triple}"
+                  "--host=${config.platform.host.triple}"
+                  "--target=${config.platform.target.triple}"
+                  "--with-as=${config.deps.build.build.binutils.package}/bin/${programPrefix}as"
+                  "--with-ld=${config.deps.build.build.binutils.package}/bin/${programPrefix}ld"
+                  "--enable-languages=c,c++"
+                  "--disable-libsanitizer"
+                  "--disable-lto"
+                  "--disable-multilib"
+                  "--with-headers=${config.deps.build.build.glibc.package}/include"
+                  "--with-build-sysroot=/"
+                  # "--with-sysroot=${config.deps.build.build.glibc.package}"
+                  "--with-native-system-header-dir=${config.deps.build.build.glibc.package}/include"
+                ];
+
+                phases.configure = lib.modules.override 0 ''
+                  # Configure
+
+                  mkdir build
+                  cd build
+                  echo PATH=$PATH
+
+                  # TODO(vlinkz) Hack to fix missing crti.o and crtn.o. Figure out how to properly find their paths.
+                  mkdir gcc
+                  ln -sv ${config.deps.build.build.glibc.package}/lib/{crti.o,crtn.o} gcc
+                  mkdir -p x86_64-unknown-linux-gnu/libstdc++-v3/src
+                  ln -sv ${config.deps.build.build.glibc.package}/lib/{crti.o,crtn.o} x86_64-unknown-linux-gnu/libstdc++-v3/src
+
+                  bash ../configure ${builtins.concatStringsSep " " config.configureFlags}
+                '';
+              };
+          }
+        );
+    };
+  };
+}

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

@@ -1,19 +1,22 @@
-{
+{ config, options }:
-  lib,
-  lib',
-  config,
-  options,
-}:
 let
   inherit (config)
+    lib
     mirrors
     builders
     # These are the upstream foundational packages exported from the Aux Foundation project.
 
     foundation
+    packages
     ;
 in
 {
+  includes = [
+    ./newlib.nix
+    ./cross.nix
+    ./bootstrap.nix
+  ];
+
   config.packages.foundation.gcc = {
     versions = {
       "latest" =
@@ -78,158 +81,239 @@ in
                 description = "Version of isl.";
               };
             };
-          };
 
-          config = {
+            configureFlags = lib.options.create {
-            meta = {
+              type = lib.types.list.of lib.types.string;
-              platforms = [ "i686-linux" ];
+              description = "Flags to pass to the configure script.";
             };
 
-            pname = "gcc";
+            exports = lib.options.create {
-            version = "13.2.0";
+              type = lib.types.attrs.of lib.types.string;
+              description = "List of exports to add to the environment.";
+            };
+          };
 
-            builder = builders.basic;
+          config =
+            let
+              isBuildBootstrapped = config.platform.build.double == "i686-linux";
+              isHostBootstrapped = config.platform.host.double == "i686-linux";
 
-            env = {
+              isBootstrapped = isBuildBootstrapped && isHostBootstrapped;
-              PATH =
+
-                let
+              crossTool =
-                  gcc =
+                (config.platform.target.triple != config.platform.host.triple)
-                    if
+                && (config.platform.host.triple == config.platform.build.triple);
-                      config.platform.build.triple == config.platform.host.triple
+              cross =
-                    # If we're on the same system then we can use the existing GCC instance.
+                (config.platform.target.triple != config.platform.host.triple)
-                    then
+                && (config.platform.host.triple == config.platform.target.triple);
-                      foundation.stage2-gcc
+
-                    # Otherwise we are going to need a cross-compiler.
+              programPrefix = lib.strings.when
-                    else
+                (
-                      # TODO: Create a gcc-cross package.
+                  config.platform.build.triple != config.platform.target.triple
-                      (meta.extend (args: {
+                ) "${config.platform.target.triple}-";
-                        config = {
+
-                          platform = {
+              libc = if isBootstrapped then foundation.stage1-musl else config.deps.build.build.glibc.package;
-                            build = config.platform.build.triple;
+              libcLd =
-                            host = config.platform.build.triple;
+                if isBootstrapped then
-                            target = lib.modules.override.force config.platform.host.triple;
+                  "${foundation.stage1-musl}/lib/libc.so"
-                          };
+                else
-                        };
+                  "${config.deps.build.build.glibc.package}/lib/ld-linux-x86-64.so.2";
-                      })).config.package;
+
-                in
+              host = lib.systems.withBuildInfo config.platform.host;
-                lib.paths.bin [
+              target = lib.systems.withBuildInfo config.platform.target;
-                  foundation.stage2-gcc
+            in
-                  foundation.stage2-binutils
+            {
-                  foundation.stage2-gnumake
+              meta = {
-                  foundation.stage2-gnused
+                platforms = [
-                  foundation.stage2-gnugrep
+                  "i686-linux"
-                  foundation.stage2-gawk
-                  foundation.stage2-diffutils
-                  foundation.stage2-findutils
-                  foundation.stage2-gnutar
-                  foundation.stage2-gzip
-                  foundation.stage2-bzip2
-                  foundation.stage1-xz
                 ];
-            };
-
-            phases =
-              let
-                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
-                  tar xf ${config.src}
-                  tar xf ${config.gmp.src}
-                  tar xf ${config.mpfr.src}
-                  tar xf ${config.mpc.src}
-                  tar xf ${config.isl.src}
-                  cd gcc-${config.version}
-
-                  ln -s ../gmp-${config.gmp.version} gmp
-                  ln -s ../mpfr-${config.mpfr.version} mpfr
-                  ln -s ../mpc-${config.mpc.version} mpc
-                  ln -s ../isl-${config.isl.version} isl
-                '';
-
-                patch = lib.dag.entry.between [ "configure" ] [ "unpack" ] ''
-                  # 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
-                  export CC="gcc -Wl,-dynamic-linker -march=${
-                    host.gcc.arch or host.system.cpu.family
-                  } ${mbits} -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"
-
-                  bash ./configure \
-                    --prefix=$out \
-                    --build=${config.platform.build.triple} \
-                    --host=${config.platform.host.triple} \
-                    --target=${config.platform.target.triple} \
-                    --with-native-system-header-dir=/include \
-                    --with-sysroot=${foundation.stage1-musl} \
-                    --enable-languages=c,c++ \
-                    --disable-bootstrap \
-                    --disable-libsanitizer \
-                    --disable-lto \
-                    --disable-multilib \
-                    --disable-plugin \
-                    CFLAGS=-static \
-                    CXXFLAGS=-static
-                '';
-
-                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
-                '';
               };
 
-            src = builtins.fetchurl {
+              pname = "gcc-${config.platform.build.double}--${config.platform.host.double}--${config.platform.target.double}";
-              url = "${mirrors.gnu}/gcc/gcc-${config.version}/gcc-${config.version}.tar.xz";
+              version = "13.2.0";
-              sha256 = "4nXnZEKmBnNBon8Exca4PYYTFEAEwEE1KIY9xrXHQ9o=";
+
-            };
+              builder = builders.basic;
+
+              deps = {
+                build = {
+                  build = lib.modules.when (!isBootstrapped) {
+                    gcc = packages.foundation.gcc-cross.versions.latest;
+                    glibc = packages.foundation.glibc.versions.latest;
+                    linux-headers = packages.foundation.linux-headers.versions.latest;
+                    binutils = packages.foundation.binutils.versions.latest;
+                  };
+                };
+              };
+
+              env =
+                {
+                  PATH = lib.modules.when (isBuildBootstrapped) (
+                    lib.paths.bin ([
+                      foundation.stage2-gnumake
+                      foundation.stage2-gnused
+                      foundation.stage2-gnugrep
+                      foundation.stage2-gnupatch
+                      foundation.stage2-gawk
+                      foundation.stage2-diffutils
+                      foundation.stage2-findutils
+                      foundation.stage2-gnutar
+                      foundation.stage2-gzip
+                      foundation.stage2-bzip2
+                      foundation.stage1-xz
+                    ] ++ (lib.lists.when (isBootstrapped) [
+                      foundation.stage2-gcc
+                      foundation.stage2-binutils
+                    ]))
+                  );
+                  CFLAGS_FOR_TARGET = "-Wl,-dynamic-linker -Wl,${libcLd}";
+                }
+                // lib.attrs.when (isBootstrapped) {
+                  CC = "gcc -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so";
+                  CXX = "g++ -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so";
+                }
+                // lib.attrs.when (!cross && !crossTool) {
+                  LIBRARY_PATH = "${libc}/lib";
+                };
+
+              hooks =
+                let
+                  flags =
+                    if (isBootstrapped && !(cross || crossTool)) then
+                      [
+                        "-Wl,-dynamic-linker"
+                        "-Wl,${foundation.stage1-musl}/lib/libc.so"
+                      ]
+                    else
+                      [
+                        "-Wl,-dynamic-linker"
+                        "-Wl,${config.deps.build.build.glibc.package}/lib/ld-linux${lib.strings.when (target.isx86 && target.is64bit) "-x86-64"}.so.2"
+                        "-B${config.deps.build.build.glibc.package}/lib"
+                        # "-idirafter ${config.deps.build.build.glibc.package}/include"
+                      ];
+                in
+                ctx: {
+                  "aux:gcc:env" = lib.dag.entry.between [ "unpack" ] [ "configure" ] ''
+                    export CC='${config.package}/bin/${programPrefix}gcc  ${builtins.concatStringsSep " " flags}'
+                    export CXX='${config.package}/bin/${programPrefix}g++  ${builtins.concatStringsSep " " flags}'
+                    export CC_FOR_TARGET=$CC
+                    export CXX_FOR_TARGET=$CXX
+                    export CC_FOR_BUILD=$CC
+                    export CXX_FOR_BUILD=$CXX
+                    alias gcc='$CC'
+                    alias g++='$CXX'
+                  '';
+                };
+
+              configureFlags =
+                [
+                  "--prefix=${builtins.placeholder "out"}"
+                  "--build=${config.platform.build.triple}"
+                  "--host=${config.platform.host.triple}"
+                  "--target=${config.platform.target.triple}"
+                  "--enable-languages=c,c++"
+                  "--disable-bootstrap"
+                  "--disable-libsanitizer"
+                  "--disable-multilib"
+                  "--with-build-sysroot=/"
+                  "--with-native-system-header-dir=${libc}/include"
+                ]
+                ++ lib.lists.when (isBootstrapped) [
+                  "--disable-lto"
+                ];
+
+              phases =
+                let
+                  patches = [
+                    # Make binutils output deterministic by default.
+                    ./patches/libstdc++-target.patch
+                  ];
+                in
+                {
+                  unpack = ''
+                    # Unpack
+                    tar xf ${config.src}
+                    tar xf ${config.gmp.src}
+                    tar xf ${config.mpfr.src}
+                    tar xf ${config.mpc.src}
+                    tar xf ${config.isl.src}
+                    cd gcc-${config.version}
+
+                    ln -s ../gmp-${config.gmp.version} gmp
+                    ln -s ../mpfr-${config.mpfr.version} mpfr
+                    ln -s ../mpc-${config.mpc.version} mpc
+                    ln -s ../isl-${config.isl.version} isl
+                  '';
+
+                  patch = ''
+                    ${lib.strings.concatMapSep "\n" (file: "patch -Np1 -i ${file}") patches}
+                    ${lib.strings.when (isBootstrapped && !(crossTool || cross))''
+                      # force musl even if host triple is gnu
+                      sed -i 's|"os/gnu-linux"|"os/generic"|' libstdc++-v3/configure.host
+                    ''}
+                  '';
+
+                  configure = ''
+                    # Configure
+                    mkdir build
+                    cd build
+
+                    bash ../configure ${builtins.concatStringsSep " " config.configureFlags}
+                  '';
+
+                  build = ''
+                    # Build
+                    make -j $NIX_BUILD_CORES
+                  '';
+
+                  install = ''
+                    # Install
+                    ${
+                      lib.strings.when (host.is64bit) ''
+                        mkdir -p $out/lib
+                        ln -s lib $out/lib64
+                      ''
+                    }
+                    make -j $NIX_BUILD_CORES install
+                  '';
+                };
 
-            gmp = {
-              version = "6.3.0";
               src = builtins.fetchurl {
-                url = "${mirrors.gnu}/gmp/gmp-${config.gmp.version}.tar.xz";
+                url = "${mirrors.gnu}/gcc/gcc-${config.version}/gcc-${config.version}.tar.xz";
-                sha256 = "o8K4AgG4nmhhb0rTC8Zq7kknw85Q4zkpyoGdXENTiJg=";
+                sha256 = "4nXnZEKmBnNBon8Exca4PYYTFEAEwEE1KIY9xrXHQ9o=";
               };
-            };
 
-            mpfr = {
+              gmp = {
-              version = "4.2.1";
+                version = "6.3.0";
-              src = builtins.fetchurl {
+                src = builtins.fetchurl {
-                url = "${mirrors.gnu}/mpfr/mpfr-${config.mpfr.version}.tar.xz";
+                  url = "${mirrors.gnu}/gmp/gmp-${config.gmp.version}.tar.xz";
-                sha256 = "J3gHNTpnJpeJlpRa8T5Sgp46vXqaW3+yeTiU4Y8fy7I=";
+                  sha256 = "o8K4AgG4nmhhb0rTC8Zq7kknw85Q4zkpyoGdXENTiJg=";
+                };
               };
-            };
 
-            mpc = {
+              mpfr = {
-              version = "1.3.1";
+                version = "4.2.1";
-              src = builtins.fetchurl {
+                src = builtins.fetchurl {
-                url = "${mirrors.gnu}/mpc/mpc-${config.mpc.version}.tar.gz";
+                  url = "${mirrors.gnu}/mpfr/mpfr-${config.mpfr.version}.tar.xz";
-                sha256 = "q2QkkvXPiCt0qgy3MM1BCoHtzb7IlRg86TDnBsHHWbg=";
+                  sha256 = "J3gHNTpnJpeJlpRa8T5Sgp46vXqaW3+yeTiU4Y8fy7I=";
+                };
               };
-            };
 
-            isl = {
+              mpc = {
-              version = "0.24";
+                version = "1.3.1";
-              src = builtins.fetchurl {
+                src = builtins.fetchurl {
-                url = "https://gcc.gnu.org/pub/gcc/infrastructure/isl-${config.isl.version}.tar.bz2";
+                  url = "${mirrors.gnu}/mpc/mpc-${config.mpc.version}.tar.gz";
-                sha256 = "/PeN2WVsEOuM+fvV9ZoLawE4YgX+GTSzsoegoYmBRcA=";
+                  sha256 = "q2QkkvXPiCt0qgy3MM1BCoHtzb7IlRg86TDnBsHHWbg=";
+                };
+              };
+
+              isl = {
+                version = "0.24";
+                src = builtins.fetchurl {
+                  url = "https://gcc.gnu.org/pub/gcc/infrastructure/isl-${config.isl.version}.tar.bz2";
+                  sha256 = "/PeN2WVsEOuM+fvV9ZoLawE4YgX+GTSzsoegoYmBRcA=";
+                };
               };
             };
-          };
         };
     };
   };

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

@@ -0,0 +1,71 @@
+{ config, options }:
+let
+  inherit (config)
+    lib
+    packages
+    ;
+in
+{
+  config.packages.foundation.gcc-newlib = {
+    versions = {
+      "latest" = config.packages.foundation.gcc.versions.latest.extend (
+        { config }:
+        {
+          config =
+            let
+              programPrefix = lib.strings.when
+                (
+                  config.platform.build.triple != config.platform.target.triple
+                ) "${config.platform.target.triple}-";
+            in
+            {
+              meta = {
+                platforms = lib.modules.override 0 [
+                  "i686-linux"
+                ];
+              };
+
+              deps = {
+                build = {
+                  build = {
+                    binutils = (
+                      packages.foundation.binutils.versions.latest.extend {
+                        platform = lib.modules.override 0 config.platform;
+                      }
+                    );
+                  };
+                };
+              };
+
+              configureFlags = lib.modules.override 0 [
+                "--prefix=${builtins.placeholder "out"}"
+                "--build=${config.platform.build.triple}"
+                "--host=${config.platform.host.triple}"
+                "--target=${config.platform.target.triple}"
+                "--with-as=${config.deps.build.build.binutils.package}/bin/${programPrefix}as"
+                "--with-ld=${config.deps.build.build.binutils.package}/bin/${programPrefix}ld"
+                "--enable-languages=c,c++"
+                "--disable-bootstrap"
+                "--disable-libsanitizer"
+                "--disable-lto"
+                "--disable-multilib"
+                "--disable-plugin"
+                "--disable-libssp"
+                "--disable-libvtv"
+                "--disable-libstdcxx"
+                "--disable-libquadmath"
+                "--disable-threads"
+                "--disable-decimal-float"
+                "--disable-shared"
+                "--disable-libmudflap"
+                "--disable-libgomp"
+                "--disable-libatomic"
+                "--without-headers"
+                "--with-newlib"
+              ];
+            };
+        }
+      );
+    };
+  };
+}

tidepool/src/packages/foundation/gcc/patches/libstdc++-target.patch

@@ -0,0 +1,33 @@
+# From https://github.com/NixOS/nixpkgs/blob/nixos-24.05/pkgs/development/compilers/gcc/patches/libstdc%2B%2B-target.patch
+Patch to make the target libraries 'configure' scripts find the proper CPP.
+I noticed that building the mingw32 cross compiler.
+Looking at the build script for mingw in archlinux, I think that only nixos
+needs this patch. I don't know why.
+diff --git a/Makefile.in b/Makefile.in
+index 93f66b6..d691917 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -266,6 +266,7 @@ BASE_TARGET_EXPORTS = \
+ 	AR="$(AR_FOR_TARGET)"; export AR; \
+ 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
+ 	CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \
++	CPP="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CC; \
+ 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+ 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
+@@ -291,11 +292,13 @@ BASE_TARGET_EXPORTS = \
+ RAW_CXX_TARGET_EXPORTS = \
+ 	$(BASE_TARGET_EXPORTS) \
+ 	CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
+-	CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
++	CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \
++	CXXCPP="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX;
+ 
+ NORMAL_TARGET_EXPORTS = \
+ 	$(BASE_TARGET_EXPORTS) \
+-	CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
++	CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \
++	CXXCPP="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX;
+ 
+ # Where to find GMP
+ HOST_GMPLIBS = @gmplibs@

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

@@ -3,6 +3,7 @@
   lib',
   config,
   options,
+  packages,
 }:
 let
   inherit (config)
@@ -10,6 +11,7 @@ let
     builders
     # These are the upstream foundational packages exported from the Aux Foundation project.
 
+    packages
     foundation
     ;
 in
@@ -26,87 +28,124 @@ in
             };
           };
 
-          config = {
+          config =
-            meta = {
+            let
-              platforms = [ "i686-linux" ];
+              isCross =
-            };
+                (config.platform.build.triple != config.platform.host.triple)
+                && (config.platform.host.triple == config.platform.target.triple);
 
-            pname = "gcc";
+              binutils =
-            version = "2.38";
+                if isCross then
+                  "${
+                    (packages.foundation.binutils.versions.latest.extend {
+                      platform = lib.modules.override 0 {
+                        inherit (config.platform) build target;
+                        host = config.platform.build;
+                      };
+                    }).package
+                  }/${config.platform.target.triple}"
+                else
+                  foundation.stage2-binutils;
+            in
+            {
 
-            src = builtins.fetchurl {
+              meta = {
-              url = "${mirrors.gnu}/libc/glibc-${config.version}.tar.xz";
+                platforms = [
-              sha256 = "+4KZiZiyspllRnvBtp0VLpwwfSzzAcnq+0VVt3DvP9I=";
+                  "i686-linux"
-            };
+                  "x86_64-linux"
-
-            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
-                      (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 [
-                  foundation.stage2-gcc
-                  foundation.stage2-binutils
-                  foundation.stage2-gnumake
-                  foundation.stage2-gnused
-                  foundation.stage2-gnugrep
-                  foundation.stage2-gawk
-                  foundation.stage2-diffutils
-                  foundation.stage2-findutils
-                  foundation.stage2-gnutar
-                  foundation.stage2-gzip
-                  foundation.stage2-bzip2
-                  foundation.stage1-xz
                 ];
+              };
+
+              pname = "glibc";
+              version = "2.38";
+
+              src = builtins.fetchurl {
+                url = "${mirrors.gnu}/libc/glibc-${config.version}.tar.xz";
+                sha256 = "+4KZiZiyspllRnvBtp0VLpwwfSzzAcnq+0VVt3DvP9I=";
+              };
+
+              builder = builders.basic;
+
+              deps = {
+                build = {
+                  host = {
+                    linux-headers = (
+                      packages.foundation.linux-headers.versions.latest.extend {
+                        platform.target = lib.modules.override 0 config.platform.target;
+                      }
+                    );
+                  };
+                };
+              };
+
+              env = {
+                PATH =
+                  let
+                    gcc =
+                      if
+                        isCross
+                      # Otherwise we are going to need a cross-compiler.
+                      then
+                        (packages.foundation.gcc-newlib.versions.latest.extend {
+                          platform = lib.modules.override 0 {
+                            inherit (config.platform) build target;
+                            host = config.platform.build;
+                          };
+                        }).package
+                      # If we're on the same system then we can use the existing GCC instance.
+                      else
+                        foundation.stage2-gcc;
+                  in
+                  lib.paths.bin [
+                    gcc
+                    binutils
+                    foundation.stage2-gnumake
+                    foundation.stage2-gnused
+                    foundation.stage2-gnugrep
+                    foundation.stage2-gawk
+                    foundation.stage2-diffutils
+                    foundation.stage2-findutils
+                    foundation.stage2-gnutar
+                    foundation.stage2-gzip
+                    foundation.stage2-bzip2
+                    foundation.stage1-python
+                    foundation.stage1-bison
+                    foundation.stage1-xz
+                  ];
+              };
+
+              phases =
+
+                {
+                  unpack = ''
+                    tar xf ${config.src}
+                    cd glibc-${config.version}
+                  '';
+
+                  configure = ''
+                    mkdir build
+                    cd build
+
+                    bash ../configure \
+                      --prefix=$out \
+                      --build=${config.platform.build.triple} \
+                      --host=${config.platform.host.triple} \
+                      --with-headers=${config.deps.build.host.linux-headers.package}/include \
+                      --with-binutils=${binutils}/bin
+                  '';
+
+                  build = ''
+                    # Build
+                    make -j $NIX_BUILD_CORES
+                  '';
+
+                  install = ''
+                    # Install
+                    make -j $NIX_BUILD_CORES install
+                    ln -sv $(ls -d ${config.deps.build.host.linux-headers.package}/include/* | grep -v scsi\$) $out/include/
+                  '';
+                };
             };
-
-            phases = {
-              unpack = lib.dag.entry.before [ "patch" ] ''
-                tar xf ${config.src}
-                cd glibc-${config.version}
-              '';
-
-              configure = lib.dag.entry.between [ "build" ] [ "patch" ] ''
-                mkdir build
-                cd build
-                # libstdc++.so is built against musl and fails to link
-                export CXX=false
-                bash ../configure \
-                  --prefix=$out \
-                  --build=${config.platform.build.triple} \
-                  --host=${config.platform.host.triple} \
-                  --with-headers=${foundation.stage1-linux-headers}/include
-              '';
-
-              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/linux-headers/default.nix

@@ -1,8 +1,8 @@
-{
+{ lib
-  lib,
+, lib'
-  lib',
+, config
-  config,
+, options
-  options,
+,
 }:
 let
   inherit (config)
@@ -28,7 +28,7 @@ in
 
           config = {
             meta = {
-              platforms = [ "i686-linux" ];
+              platforms = [ "x86_64-linux" "i686-linux" ];
             };
 
             pname = "linux-headers";
@@ -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" ] '''';
+              build = ''
-
+                make -j $NIX_BUILD_CORES CC=musl-gcc HOSTCC=musl-gcc ARCH=${config.platform.target.linux.arch} headers
-              configure = lib.dag.entry.between [ "build" ] [ "patch" ] '''';
-
-              build = lib.dag.entry.between [ "install" ] [ "configure" ] ''
-                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/