Updated sources and fixed source build

flake.nix

@@ -21,7 +21,9 @@
     { packages = rec
       { default = nixie;
         nixie = pkgs.callPackage ./. { inherit amber-lang; };
-        sources = pkgs.callPackage ./sources {};
+        sources = pkgs.callPackage ./sources
+          { nix-source = nix;
+          };
         static-bins = import ./static-bins
           { inherit nixpkgs fakedir pkgs;
             nix-source = nix;

sources/Makefile

@@ -10,8 +10,8 @@ WGET            := wget
 BOOST_VER 		:= 1.87.0
 BOOST_ARCHIVE	:= $(WORKDIR)/boost.tar.bz2
 
-BOOST_ADD_HEADERS = core,utility,io,system,thread,context,lexical_cast,config,format,coroutine2,container,chrono,atomic,predef,move,assert,detail,type_traits,intrusive,mpl,date_time,bind,align,preprocessor,ratio,exception,smart_ptr,numeric,functional,container_hash,describe,tuple,iterator,function,integer,type_index,algorithm,range,concept,optional,mp11
-BOOST_ADD_MODULES = system,thread,context,format,coroutine2,container,chrono,atomic,optional
+BOOST_ADD_HEADERS = core,utility,io,system,thread,context,lexical_cast,config,format,coroutine,container,chrono,atomic,predef,move,assert,detail,type_traits,intrusive,mpl,date_time,bind,align,preprocessor,ratio,exception,smart_ptr,numeric,functional,container_hash,describe,tuple,iterator,function,integer,type_index,algorithm,range,concept,optional,mp11
+BOOST_ADD_MODULES = assert,static_assert,throw_exception,integer,type_traits,move,mpl,ratio,variant2,mp11,winapi,typeof,utility,intrusive,pool,smart_ptr,exception,system,predef,thread,context,format,coroutine,container,chrono,atomic,optional
 
 boost-shaved.tar.gz: $(BOOST_ARCHIVE)
 	@mkdir -p $(WORKDIR)

sources/default.nix

@@ -1,12 +1,15 @@
 { stdenv, boost, openssl, lowdown, nlohmann_json, brotli, libsodium, editline
 , gnutar, coreutils, findutils, python3, nix
-, meson, automake, autoconf-archive, autoconf, m4, bc, libtool, pkg-config, ... }:
+, meson, automake, autoconf-archive, autoconf, m4, bc, libtool, pkg-config
+# External source for Nix
+, nix-source ? nix.src
+, ... }:
 
 let
-  mkConfiguredSrc = { pkg, confScript, patches ? [], dest?pkg.pname }:
+  mkConfiguredSrc = { pkg, confScript, src ? pkg.src, patches ? pkg.patches, dest ? pkg.pname }:
     stdenv.mkDerivation {
-      inherit (pkg) version src;
-      inherit dest patches;
+      inherit (pkg) version;
+      inherit dest patches src;
       pname = "${pkg.pname}-configured-sources";
 
       configurePhase = confScript;
@@ -33,6 +36,7 @@ let
 
   nix_configured_src = mkConfiguredSrc
     { pkg = nix;
+      src = nix-source;
       confScript = ''
         mkdir -p $out
         cp -r . $out/nix

src/builders/boost.ab

@@ -9,7 +9,7 @@ import { pull_source_file } from "../resources.ab"
 
 import { pkg_exists, step_title, get_source_root } from "./common.ab"
 
-const modules = ["chrono", "container", "context", "system", "thread"]
+const modules = ["predef", "chrono", "container", "context", "coroutine", "system", "thread"]
 
 /// Check that the Boost modules we need exist on the system.
 ///