foundation/flake.lock

@@ -3,18 +3,17 @@
     "lib": {
       "locked": {
         "dir": "lib",
-        "lastModified": 1723737980,
+        "dirtyRev": "2be3111b2c0911f40b47fe0a1fb22b5f5188cf59-dirty",
-        "narHash": "sha256-1WnFatW5kSuO2jjt62hvSbH84TSYyO+VmvkJ0d5e/ZY=",
+        "dirtyShortRev": "2be3111-dirty",
-        "ref": "master",
+        "lastModified": 1719251485,
-        "rev": "cadfaabc853d20f2bc20bad794fcbe520ea48f13",
+        "narHash": "sha256-63NvfFVeTDITfNu60rmCUlaZtAeZUnvrIaOLSk9ScC8=",
-        "revCount": 82,
         "type": "git",
-        "url": "file:../"
+        "url": "file:../?dir=lib"
       },
       "original": {
         "dir": "lib",
         "type": "git",
-        "url": "file:../"
+        "url": "file:../?dir=lib"
       }
     },
     "root": {

tidepool/flake.lock

@@ -8,35 +8,33 @@
       },
       "locked": {
         "dir": "foundation",
-        "lastModified": 1724190751,
+        "dirtyRev": "3f9d287065ac685ce500c2cddb35428b2927f5a2-dirty",
-        "narHash": "sha256-e8sOmeXS9YWuQqjW6gvtS3PIueazkf4S1iiJ/94eXv4=",
+        "dirtyShortRev": "3f9d287-dirty",
-        "ref": "master",
+        "lastModified": 1720514984,
-        "rev": "4b36a5a0133f5481840bdfaf693c971215a7ef1f",
+        "narHash": "sha256-AuixwSlYk34Z6+GEc7y4QotF3Hk963zC9I9hAwX5KCE=",
-        "revCount": 84,
         "type": "git",
-        "url": "file:../"
+        "url": "file:../?dir=foundation"
       },
       "original": {
         "dir": "foundation",
         "type": "git",
-        "url": "file:../"
+        "url": "file:../?dir=foundation"
       }
     },
     "lib": {
       "locked": {
         "dir": "lib",
-        "lastModified": 1724190751,
+        "dirtyRev": "3f9d287065ac685ce500c2cddb35428b2927f5a2-dirty",
-        "narHash": "sha256-e8sOmeXS9YWuQqjW6gvtS3PIueazkf4S1iiJ/94eXv4=",
+        "dirtyShortRev": "3f9d287-dirty",
-        "ref": "master",
+        "lastModified": 1720514984,
-        "rev": "4b36a5a0133f5481840bdfaf693c971215a7ef1f",
+        "narHash": "sha256-AuixwSlYk34Z6+GEc7y4QotF3Hk963zC9I9hAwX5KCE=",
-        "revCount": 84,
         "type": "git",
-        "url": "file:../"
+        "url": "file:../?dir=lib"
       },
       "original": {
         "dir": "lib",
         "type": "git",
-        "url": "file:../"
+        "url": "file:../?dir=lib"
       }
     },
     "root": {

tidepool/src/builders/basic.nix

@@ -65,15 +65,7 @@ in
               PATH =
                 let
                   bins = lib.paths.bin (
-                    (lib.packages.dependencies.get dependencies.build.only)
+                    (lib.packages.dependencies.get dependencies.build.host)
-                    ++ (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
@@ -107,7 +99,6 @@ in
             }
           );
         in
-        # (builtins.trace "build: ${package.name} -> build=${package.platform.build.triple} host=${package.platform.host.triple} target=${package.platform.target.triple}")
         built
         // {
           inherit (package) meta;

tidepool/src/export.nix

@@ -26,32 +26,16 @@ in
         # }))
         # .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;
         # foundation-linux-headers = config.packages.foundation.linux-headers.versions.latest.extend {
         #   platform.host = lib.modules.overrides.force "x86_64-linux";
         # };
+        # example-x = config.packages.example.x;
         cross-aux-a-x86_64-linux = config.packages.cross.x86_64-linux.aux.a;
         cross-foundation-gcc-x86_64-linux = config.packages.cross.x86_64-linux.foundation.gcc;
-
-        example-a = config.packages.foundation.gcc.versions.latest.extend {
-          platform = {
-            target = lib.modules.override 0 "x86_64-linux";
-          };
-        };
       };
     };
-    # exported.packages.i686-linux.example-b =
-    #   let
-    #     pkg =
-    #       config.packages.foundation.gcc.versions.latest.extend {
-    #         platform = {
-    #           target = "aarch64-linux";
-    #         };
-    #       };
-    #   in
-    #   pkg.package;
 
     # exported.packages.i686-linux.cross-foundation-gcc-x86_64-linux = config.packages.cross.x86_64-linux.foundation.gcc.package;
   };

tidepool/src/lib/types.nix

@@ -230,34 +230,6 @@ in
                   default.value = [ ];
                 };
 
-                # extend = lib.options.create {
-                #   description = "Extend the package definition.";
-                #   type = lib.types.function lib.types.raw;
-                #   internal = true;
-                #   writable = false;
-                #   default.value = module:
-                #     let
-                #       normalized =
-                #         if builtins.isList module then
-                #           module
-                #         else if builtins.isFunction module || module ? config then
-                #           [ module ]
-                #         else
-                #           [{
-                #             config = module;
-                #           }];
-                #       result = meta.extend {
-                #         modules =
-                #           normalized ++ [
-                #             {
-                #               config.__modules__ = lib.modules.overrides.force (config.__modules__ ++ normalized);
-                #             }
-                #           ];
-                #       };
-                #     in
-                #     result.config;
-                # };
-
                 extend = lib.options.create {
                   description = "Extend the package definition.";
                   type = lib.types.function lib.types.raw;
@@ -274,14 +246,13 @@ in
                           [{
                             config = module;
                           }];
-
+                      result = meta.extend {
-											modules = config.__modules__ ++ normalized;
+                        modules =
-
+                          normalized ++ [
-                      result = lib.modules.run {
+                            {
-                        modules = [
+                              config.__modules__ = lib.modules.overrides.force (config.__modules__ ++ normalized);
-													submodule
+                            }
-													{ config.__modules__ = modules; }
+                          ];
-												] ++ modules;
                       };
                     in
                     result.config;
@@ -290,8 +261,8 @@ in
                 meta = {
                   description = lib.options.create {
                     description = "The description for the package.";
-                    type = lib.types.string;
+                    type = lib.types.nullish lib.types.string;
-                    default.value = "";
+                    default.value = null;
                   };
 
                   homepage = lib.options.create {

tidepool/src/packages/aux/a.nix

@@ -1,4 +1,4 @@
-{ config }:
+{ lib', config }:
 let
   inherit (config) builders packages;
 in

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

@@ -1,8 +1,8 @@
-{ lib
+{
-, lib'
+  lib,
-, config
+  lib',
-, options
+  config,
-,
+  options,
 }:
 let
   inherit (config)
@@ -27,112 +27,101 @@ in
             };
           };
 
-          config =
+          config = {
-            let
+            meta = {
-              isBuildBootstrapped = config.platform.build.double == "i686-linux";
+              platforms = [ "i686-linux" ];
-              isHostBootstrapped = config.platform.host.double == "i686-linux";
+            };
 
-              isBootstrapped = isBuildBootstrapped && isHostBootstrapped;
+            pname = "binutils";
-            in
+            version = "2.41";
-            {
-              meta = {
-                platforms = [ "i686-linux" ];
-              };
 
-              pname = "binutils";
+            builder = builders.basic;
-              version = "2.41";
 
-              builder = builders.basic;
+            deps = {
-
+              build = {
-              deps = {
+                host = {
-                build = {
+                  inherit (packages.foundation) gcc;
-                  only = {
-										gcc = lib.modules.when (!isBootstrapped) packages.foundation.gcc;
-                  };
                 };
               };
-
-              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
-									]
-								);
-              };
-
-              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 = ''
-                    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=";
-              };
             };
+
+            env = {
+              PATH = lib.paths.bin [
+                # 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
+              ];
+            };
+
+            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 = ''
+                  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/gcc/default.nix

@@ -84,200 +84,133 @@ in
             };
           };
 
-          config =
+          config = {
-            let
+            meta = {
-              isBuildBootstrapped = config.platform.build.double == "i686-linux";
+              platforms = [ "i686-linux" ];
-              isHostBootstrapped = config.platform.host.double == "i686-linux";
+            };
 
-              isBootstrapped = isBuildBootstrapped && isHostBootstrapped;
+            pname = "gcc";
-            in
+            version = "13.2.0";
-            {
+
-              meta = {
+            builder = builders.basic;
-                platforms = [ "i686-linux" ];
+
+            env = {
+              PATH = 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
+              ];
+            };
+
+            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 = ''
+                  # 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 = ''
+                  # Patch
+                  # force musl even if host triple is gnu
+                  sed -i 's|"os/gnu-linux"|"os/generic"|' libstdc++-v3/configure.host
+                '';
+
+                configure = ''
+                  # Configure
+                  export CC="gcc -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so"
+                  export CXX="g++ -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so"
+                  export CFLAGS_FOR_TARGET="-Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so"
+                  export LIBRARY_PATH="${foundation.stage1-musl}/lib"
+
+                  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 = ''
+                  # Build
+                  make -j $NIX_BUILD_CORES
+                '';
+
+                install = ''
+                  # Install
+                  make -j $NIX_BUILD_CORES install-strip
+                '';
               };
 
-              pname = "gcc-${config.platform.build.double}--${config.platform.host.double}--${config.platform.target.double}";
+            src = builtins.fetchurl {
-              version = "13.2.0";
+              url = "${mirrors.gnu}/gcc/gcc-${config.version}/gcc-${config.version}.tar.xz";
-
+              sha256 = "4nXnZEKmBnNBon8Exca4PYYTFEAEwEE1KIY9xrXHQ9o=";
-              builder = builders.basic;
+            };
-
-              # hooks = ctx: let
-              #
-              # in {
-              # 	"aux:gcc:env" = lib.dag.entry.before [ "unpack" ] ''
-              #
-              # 	'';
-              # };
-
-              deps =
-                let
-                  platform =
-                    if !isBuildBootstrapped then
-                      {
-                        build = "i686-linux";
-                        host = lib.modules.override 0 config.platform.build.triple;
-                        target = lib.modules.override 0 config.platform.build.triple;
-                      }
-                    else
-                      {
-                        build = "i686-linux";
-                        host = "i686-linux";
-                        target = lib.modules.override 0 config.platform.host.triple;
-                      };
-                in
-                {
-                  build = {
-                    only = {
-                      gcc =
-                        lib.modules.when
-                          (!isBootstrapped)
-                          (packages.foundation.gcc.versions.latest.extend {
-                            inherit platform;
-                          });
-                    };
-                    build = {
-                      binutils = packages.foundation.binutils;
-											linux-headers = packages.foundation.linux-headers;
-											glibc = packages.foundation.glibc;
-                    };
-                  };
-                };
-
-							hooks = ctx: {
-								"aux:compiler:setup" = lib.dag.entry.before [ "unpack" ] ''
-									: ''${AUX_COMPILER_LIBRARY_PATH:=}
-								'';
-							};
-
-              env = {
-                PATH = lib.paths.bin (
-                  lib.lists.when
-                    (isBootstrapped)
-                    [
-                      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
-                  ]
-                );
-              };
-
-              phases =
-                let
-                  host = lib.systems.withBuildInfo config.platform.host;
-
-									compiler = if isBootstrapped then "gcc" else "${config.platform.build.triple}-gcc";
-
-                  mbits = if host.system.cpu.family == "x86" then if host.is64bit then "-m64" else "-m32" else "";
-                in
-                {
-									"aux:compiler:setup" = ''
-										: ''${AUX_COMPILER_LIBRARY_PATH:=}
-									'';
-
-                  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 = ''
-                    # Patch
-                    # force musl even if host triple is gnu
-                    sed -i 's|"os/gnu-linux"|"os/generic"|' libstdc++-v3/configure.host
-                  '';
-
-                  configure = ''
-                    # Configure
-                    export CC="gcc -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so"
-                    export CXX="g++ -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so"
-                    export CFLAGS_FOR_TARGET="-Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so"
-                    export LIBRARY_PATH="${foundation.stage1-musl}/lib"
-
-                    bash ./configure \
-                      --prefix=$out \
-                      --build=${config.platform.build.triple} \
-                      --host=${config.platform.host.triple} \
-                      --target=${config.platform.target.triple} \
-											--with-sysroot=${foundation.stage1-musl} \
-											--with-native-system-header-dir=/include \
-                      --enable-languages=c,c++ \
-                      --disable-bootstrap \
-                      --disable-libsanitizer \
-                      --disable-lto \
-                      --disable-multilib \
-                      --disable-plugin \
-                      CFLAGS=-static \
-                      CXXFLAGS=-static
-                  '';
-
-                  build = ''
-                    # Build
-                    make -j $NIX_BUILD_CORES
-                  '';
-
-                  install = ''
-                    # Install
-                    make -j $NIX_BUILD_CORES install
-                  '';
-                };
 
+            gmp = {
+              version = "6.3.0";
               src = builtins.fetchurl {
-                url = "${mirrors.gnu}/gcc/gcc-${config.version}/gcc-${config.version}.tar.xz";
+                url = "${mirrors.gnu}/gmp/gmp-${config.gmp.version}.tar.xz";
-                sha256 = "4nXnZEKmBnNBon8Exca4PYYTFEAEwEE1KIY9xrXHQ9o=";
+                sha256 = "o8K4AgG4nmhhb0rTC8Zq7kknw85Q4zkpyoGdXENTiJg=";
-              };
-
-              gmp = {
-                version = "6.3.0";
-                src = builtins.fetchurl {
-                  url = "${mirrors.gnu}/gmp/gmp-${config.gmp.version}.tar.xz";
-                  sha256 = "o8K4AgG4nmhhb0rTC8Zq7kknw85Q4zkpyoGdXENTiJg=";
-                };
-              };
-
-              mpfr = {
-                version = "4.2.1";
-                src = builtins.fetchurl {
-                  url = "${mirrors.gnu}/mpfr/mpfr-${config.mpfr.version}.tar.xz";
-                  sha256 = "J3gHNTpnJpeJlpRa8T5Sgp46vXqaW3+yeTiU4Y8fy7I=";
-                };
-              };
-
-              mpc = {
-                version = "1.3.1";
-                src = builtins.fetchurl {
-                  url = "${mirrors.gnu}/mpc/mpc-${config.mpc.version}.tar.gz";
-                  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=";
-                };
               };
             };
+
+            mpfr = {
+              version = "4.2.1";
+              src = builtins.fetchurl {
+                url = "${mirrors.gnu}/mpfr/mpfr-${config.mpfr.version}.tar.xz";
+                sha256 = "J3gHNTpnJpeJlpRa8T5Sgp46vXqaW3+yeTiU4Y8fy7I=";
+              };
+            };
+
+            mpc = {
+              version = "1.3.1";
+              src = builtins.fetchurl {
+                url = "${mirrors.gnu}/mpc/mpc-${config.mpc.version}.tar.gz";
+                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/glibc/default.nix

@@ -41,12 +41,6 @@ in
 
             builder = builders.basic;
 
-						hooks = ctx: {
-							"aux:glibc:env" = lib.dag.entry.between ["aux:compiler:setup"] ["configure"] ''
-								AUX_COMPILER_LIBRARY_PATH="${config.package}/lib:$AUX_COMPILER_LIBRARY_PATH"
-							'';
-						};
-
             env = {
               PATH =
                 let
@@ -80,8 +74,6 @@ in
                   foundation.stage2-gnutar
                   foundation.stage2-gzip
                   foundation.stage2-bzip2
-									foundation.stage1-python
-									foundation.stage1-bison
                   foundation.stage1-xz
                 ];
             };
@@ -111,7 +103,7 @@ in
 
               install = ''
                 # Install
-                make -j $NIX_BUILD_CORES INSTALL_UNCOMPRESSED=yes install
+                make -j $NIX_BUILD_CORES install-strip
               '';
             };
           };