Merge changes Ief8e8ebc,Id3135db0,If1e76169 into main

* changes:
  libutil: delete unused boost context cruft
  build: remove approximately 400 seconds of CPU time (30%)
  fix: use http proxy for s3 access

1 files changed, 0 insertions, 19 deletions

diff --git a/src/libutil/serialise.hh b/src/libutil/serialise.hh
index 6c637bd35..8218db440 100644
--- a/src/libutil/serialise.hh
+++ b/src/libutil/serialise.hh
@@ -9,8 +9,6 @@
 #include "types.hh"
 #include "file-descriptor.hh"
 
-namespace boost::context { struct stack_context; }
-
 namespace nix {
 
 
@@ -612,23 +610,6 @@ struct FramedSink : nix::BufferedSink
     };
 };
 
-/**
- * Stack allocation strategy for sinkToSource.
- * Mutable to avoid a boehm gc dependency in libutil.
- *
- * boost::context doesn't provide a virtual class, so we define our own.
- */
-struct StackAllocator {
-    virtual boost::context::stack_context allocate() = 0;
-    virtual void deallocate(boost::context::stack_context sctx) = 0;
-
-    /**
-     * The stack allocator to use in sinkToSource and potentially elsewhere.
-     * It is reassigned by the initGC() method in libexpr.
-     */
-    static StackAllocator *defaultAllocator;
-};
-
 /* Disabling GC when entering a coroutine (without the boehm patch).
    mutable to avoid boehm gc dependency in libutil.
  */