flake: unvendor capnproto

Nixpkgs has a recent enough version and all the relevant packaging changes now.

Change-Id: Ifdf814f80689803dd63ba7d16049e7d37e389542

flake.lock

@@ -108,11 +108,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1757198069,
-        "narHash": "sha256-m3VUcOD4rTs8J7S+3dOjWMrAjw6RcITC3XYQ98zhEFs=",
+        "lastModified": 1758391731,
+        "narHash": "sha256-UuwQoPWv13DVKMveeev+F0OC/N95AOmAz6SzCuGhxjQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0747026fc57ecb9c28901c7f7a2b5dc40e8af43c",
+        "rev": "3f00d36f15e16e0471d9ca1e8f88958941fa970a",
         "type": "github"
       },
       "original": {

flake.nix

@@ -259,8 +259,6 @@
             nativeBuildInputs = prevAttrs.nativeBuildInputs ++ [ final.buildPackages.bmake ];
             postInstall = lib.replaceStrings [ "lowdown.so.1" ] [ "lowdown.so.2" ] prevAttrs.postInstall;
           });
-
-          capnproto = final.callPackage ./misc/capnproto.nix { stdenv = final.clangStdenv; };
         };
     in
     {

misc/capnproto-monotonic-clocks-are-a-lie.patch

@@ -1,47 +0,0 @@
-From 11375442cf591f055ca95902f27c68b0e983d371 Mon Sep 17 00:00:00 2001
-From: Fabio Rossetto <fabio.rossetto@zhinst.com>
-Date: Thu, 8 May 2025 18:18:10 +0200
-Subject: [PATCH] Remove check for monotonic time
-
-The check was disabled on Mac, but in #2261 it was reported also on
-Linux. At this point, it makes more sense to remove the KJ_REQUIRE for
-monotonicity alltogether.
-
-Backport of the original PR #2296 to v1.0.2.
-
-Signed-off-by: Raito Bezarius <raito@lix.systems>
-Co-authored-by: Raito Bezarius <raito@lix.systems>
----
- c++/src/kj/timer.c++ | 15 ++++++---------
- 1 file changed, 6 insertions(+), 9 deletions(-)
-
-diff --git a/c++/src/kj/timer.c++ b/c++/src/kj/timer.c++
-index e5cd2648..a659e5d0 100644
---- a/c++/src/kj/timer.c++
-+++ b/c++/src/kj/timer.c++
-@@ -110,16 +110,13 @@ Maybe<uint64_t> TimerImpl::timeoutToNextEvent(TimePoint start, Duration unit, ui
- }
- 
- void TimerImpl::advanceTo(TimePoint newTime) {
--  // On Macs running an Intel processor, it has been observed that clock_gettime 
--  // may return non monotonic time, even when CLOCK_MONOTONIC is used.
--  // This workaround is to avoid the assert triggering on these machines.
--  // See also https://github.com/capnproto/capnproto/issues/1693
--#if __APPLE__ && defined(__x86_64__)
-+  // It has been observed that clock_gettime may return non monotonic time,
-+  // even when CLOCK_MONOTONIC is used.
-+  // We use std::max to guard against this rare issue.
-+  // - on Mac: https://github.com/capnproto/capnproto/issues/1693
-+  // - on Linux: https://github.com/capnproto/capnproto/issues/2261
-+
-   time = std::max(time, newTime);
--#else
--  KJ_REQUIRE(newTime >= time, "can't advance backwards in time") { return; }
--  time = newTime;
--#endif
- 
-   for (;;) {
-     auto front = impl->timers.begin();
--- 
-2.49.0
-

misc/capnproto-promise-nodiscard.patch

@@ -1,206 +0,0 @@
-diff --git a/c++/WORKSPACE b/c++/WORKSPACE
-index d94a279e..4871ead7 100644
---- a/c++/WORKSPACE
-+++ b/c++/WORKSPACE
-@@ -31,6 +31,7 @@ cc_library(
-     name = "zlib",
-     srcs = glob(["*.c"]),
-     hdrs = glob(["*.h"]),
-+    includes = ["."],
-     # Temporary workaround for zlib warnings and mac compilation, should no longer be needed with next release https://github.com/madler/zlib/issues/633
-     copts = [
-         "-w",
-diff --git a/c++/src/kj/array.h b/c++/src/kj/array.h
-index 3932f9f4..677c691a 100644
---- a/c++/src/kj/array.h
-+++ b/c++/src/kj/array.h
-@@ -780,7 +780,7 @@ struct CopyConstructArray_<T, Iterator, true, false> {
-
-   static T* apply(T* __restrict__ pos, Iterator start, Iterator end) {
-     // Verify that T can be *implicitly* constructed from the source values.
--    if (false) implicitCast<T>(kj::mv(*start));
-+    if (false) (void)implicitCast<T>(kj::mv(*start));
-
-     if (noexcept(T(kj::mv(*start)))) {
-       while (start != end) {
-diff --git a/c++/src/kj/async-coroutine-test.c++ b/c++/src/kj/async-coroutine-test.c++
-index de767eca..d6ed1359 100644
---- a/c++/src/kj/async-coroutine-test.c++
-+++ b/c++/src/kj/async-coroutine-test.c++
-@@ -288,5 +288,5 @@ KJ_TEST("Exceptions during suspended coroutine frame-unwind propagate via destru
-   WaitScope waitScope(loop);
-
-   auto exception = KJ_ASSERT_NONNULL(kj::runCatchingExceptions([&]() {
--    deferredThrowCoroutine(kj::NEVER_DONE);
-+    (void)deferredThrowCoroutine(kj::NEVER_DONE);
-   }));
-
-   KJ_EXPECT(exception.getDescription() == "thrown during unwind");
-diff --git a/c++/src/kj/async-io-test.c++ b/c++/src/kj/async-io-test.c++
-index e8892b79..dffcbb26 100644
---- a/c++/src/kj/async-io-test.c++
-+++ b/c++/src/kj/async-io-test.c++
-@@ -1577,7 +1577,7 @@ KJ_TEST("Userland pipe pump into zero-limited pipe, no data to pump") {
-   auto pipe2 = newOneWayPipe(uint64_t(0));
-   auto pumpPromise = KJ_ASSERT_NONNULL(pipe2.out->tryPumpFrom(*pipe.in));
-
--  expectRead(*pipe2.in, "");
-+  expectRead(*pipe2.in, "").wait(ws);
-   pipe.out = nullptr;
-   KJ_EXPECT(pumpPromise.wait(ws) == 0);
- }
-@@ -1590,7 +1590,7 @@ KJ_TEST("Userland pipe pump into zero-limited pipe, data is pumped") {
-   auto pipe2 = newOneWayPipe(uint64_t(0));
-   auto pumpPromise = KJ_ASSERT_NONNULL(pipe2.out->tryPumpFrom(*pipe.in));
-
--  expectRead(*pipe2.in, "");
-+  expectRead(*pipe2.in, "").wait(ws);
-   auto writePromise = pipe.out->write("foo", 3);
-   KJ_EXPECT_THROW_RECOVERABLE_MESSAGE("abortRead() has been called", pumpPromise.wait(ws));
- }
-diff --git a/c++/src/kj/async.h b/c++/src/kj/async.h
-index 564b5171..d4f2d55c 100644
---- a/c++/src/kj/async.h
-+++ b/c++/src/kj/async.h
-@@ -118,7 +118,7 @@ private:
- // Promises
-
- template <typename T>
--class Promise: protected _::PromiseBase {
-+class [[nodiscard]] Promise: protected _::PromiseBase {
-   // The basic primitive of asynchronous computation in KJ.  Similar to "futures", but designed
-   // specifically for event loop concurrency.  Similar to E promises and JavaScript Promises/A.
-   //
-diff --git a/c++/src/kj/common-test.c++ b/c++/src/kj/common-test.c++
-index 97856125..913a6be4 100644
---- a/c++/src/kj/common-test.c++
-+++ b/c++/src/kj/common-test.c++
-@@ -573,7 +573,7 @@ TEST(Common, Downcast) {
-
-   EXPECT_EQ(&bar, &downcast<Bar>(foo));
- #if defined(KJ_DEBUG) && !KJ_NO_RTTI
--  KJ_EXPECT_THROW_MESSAGE("Value cannot be downcast", downcast<Baz>(foo));
-+  KJ_EXPECT_THROW_MESSAGE("Value cannot be downcast", (void)downcast<Baz>(foo));
- #endif
-
- #if KJ_NO_RTTI
-diff --git a/c++/src/kj/compat/http-test.c++ b/c++/src/kj/compat/http-test.c++
-index f10ff8d1..9003099d 100644
---- a/c++/src/kj/compat/http-test.c++
-+++ b/c++/src/kj/compat/http-test.c++
-@@ -6553,7 +6553,7 @@ KJ_TEST("Simple CONNECT Server works") {
-              "\r\n"
-              "hello"_kj).wait(waitScope);
-
--  expectEnd(*pipe.ends[1]);
-+  expectEnd(*pipe.ends[1]).wait(waitScope);
-
-   listenTask.wait(waitScope);
-
-@@ -6628,7 +6628,7 @@ KJ_TEST("CONNECT Server (201 status)") {
-              "\r\n"
-              "hello"_kj).wait(waitScope);
-
--  expectEnd(*pipe.ends[1]);
-+  expectEnd(*pipe.ends[1]).wait(waitScope);
-
-   listenTask.wait(waitScope);
-
-@@ -6706,7 +6706,7 @@ KJ_TEST("CONNECT Server rejected") {
-              "\r\n"
-              "boom"_kj).wait(waitScope);
-
--  expectEnd(*pipe.ends[1]);
-+  expectEnd(*pipe.ends[1]).wait(waitScope);
-
-   listenTask.wait(waitScope);
-
-@@ -6774,7 +6774,7 @@ KJ_TEST("CONNECT Server cancels read") {
-              "HTTP/1.1 200 OK\r\n"
-              "\r\n"_kj).wait(waitScope);
-
--  expectEnd(*pipe.ends[1]);
-+  expectEnd(*pipe.ends[1]).wait(waitScope);
-
-   listenTask.wait(waitScope);
- }
-@@ -6840,7 +6840,7 @@ KJ_TEST("CONNECT Server cancels write") {
-              "HTTP/1.1 200 OK\r\n"
-              "\r\n"_kj).wait(waitScope);
-
--  expectEnd(*pipe.ends[1]);
-+  expectEnd(*pipe.ends[1]).wait(waitScope);
-
-   listenTask.wait(waitScope);
- }
-@@ -6913,7 +6913,7 @@ KJ_TEST("CONNECT rejects Transfer-Encoding") {
-              "\r\n"
-              "ERROR: Bad Request"_kj).wait(waitScope);
-
--  expectEnd(*pipe.ends[1]);
-+  expectEnd(*pipe.ends[1]).wait(waitScope);
-
-   listenTask.wait(waitScope);
- }
-@@ -6947,7 +6947,7 @@ KJ_TEST("CONNECT rejects Content-Length") {
-              "\r\n"
-              "ERROR: Bad Request"_kj).wait(waitScope);
-
--  expectEnd(*pipe.ends[1]);
-+  expectEnd(*pipe.ends[1]).wait(waitScope);
-
-   listenTask.wait(waitScope);
- }
-diff --git a/c++/src/kj/compat/tls-test.c++ b/c++/src/kj/compat/tls-test.c++
-index dddefa57..52ccc68a 100644
---- a/c++/src/kj/compat/tls-test.c++
-+++ b/c++/src/kj/compat/tls-test.c++
-@@ -1037,15 +1037,15 @@ KJ_TEST("TLS receiver experiences pre-TLS error") {
-   TlsReceiverTest test;
-
-   KJ_LOG(INFO, "Accepting before a bad connect");
--  auto promise = test.receiver->accept();
-+  auto acceptPromise = test.receiver->accept();
-
-   KJ_LOG(INFO, "Disappointing our server");
--  test.baseReceiver->badConnect();
-+  auto connectPromise = test.baseReceiver->badConnect();
-
-   // Can't use KJ_EXPECT_THROW_RECOVERABLE_MESSAGE because wait() that returns a value can't throw
-   // recoverable exceptions. Can't use KJ_EXPECT_THROW_MESSAGE because non-recoverable exceptions
-   // will fork() in -fno-exception which screws up our state.
--  promise.then([](auto) {
-+  acceptPromise.then([](auto) {
-     KJ_FAIL_EXPECT("expected exception");
-   }, [](kj::Exception&& e) {
-     KJ_EXPECT(e.getDescription() == "Pipes are leaky");
-diff --git a/c++/src/kj/test.h b/c++/src/kj/test.h
-index 5acbb00d..de5efec2 100644
---- a/c++/src/kj/test.h
-+++ b/c++/src/kj/test.h
-@@ -92,6 +92,7 @@ private:
-   else KJ_FAIL_EXPECT("failed: expected " #cond, _kjCondition, ##__VA_ARGS__)
- #endif
-
-+// TODO(msvc): cast results to void like non-MSVC versions do
- #if _MSC_VER && !defined(__clang__)
- #define KJ_EXPECT_THROW_RECOVERABLE(type, code, ...) \
-   do { \
-@@ -115,7 +116,7 @@ private:
- #else
- #define KJ_EXPECT_THROW_RECOVERABLE(type, code, ...) \
-   do { \
--    KJ_IF_MAYBE(e, ::kj::runCatchingExceptions([&]() { code; })) { \
-+    KJ_IF_MAYBE(e, ::kj::runCatchingExceptions([&]() { (void)({code}); })) { \
-       KJ_EXPECT(e->getType() == ::kj::Exception::Type::type, \
-           "code threw wrong exception type: " #code, *e, ##__VA_ARGS__); \
-     } else { \
-@@ -125,7 +126,7 @@ private:
-
- #define KJ_EXPECT_THROW_RECOVERABLE_MESSAGE(message, code, ...) \
-   do { \
--    KJ_IF_MAYBE(e, ::kj::runCatchingExceptions([&]() { code; })) { \
-+    KJ_IF_MAYBE(e, ::kj::runCatchingExceptions([&]() { (void)({code}); })) { \
-       KJ_EXPECT(::kj::_::hasSubstring(e->getDescription(), message), \
-           "exception description didn't contain expected substring", *e, ##__VA_ARGS__); \
-     } else { \

misc/capnproto.nix

@@ -1,83 +0,0 @@
-# FIXME: upstream to nixpkgs (do NOT build with gcc due to gcc coroutine bugs)
-{
-  binutils,
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  openssl,
-  zlib,
-}:
-assert stdenv.cc.isClang;
-let
-  # HACK: work around https://github.com/NixOS/nixpkgs/issues/177129
-  # Though this is an issue between Clang and GCC,
-  # so it may not get fixed anytime soon...
-  empty-libgcc_eh = stdenv.mkDerivation {
-    pname = "empty-libgcc_eh";
-    version = "0";
-    dontUnpack = true;
-    installPhase = ''
-      mkdir -p "$out"/lib
-      "${binutils}"/bin/ar r "$out"/lib/libgcc_eh.a
-    '';
-  };
-in
-stdenv.mkDerivation rec {
-  pname = "capnproto";
-  version = "1.0.2";
-
-  # release tarballs are missing some ekam rules
-  src = fetchFromGitHub {
-    owner = "capnproto";
-    repo = "capnproto";
-    rev = "v${version}";
-    sha256 = "sha256-LVdkqVBTeh8JZ1McdVNtRcnFVwEJRNjt0JV2l7RkuO8=";
-  };
-
-  patches = [
-    # backport of https://github.com/capnproto/capnproto/pull/1810
-    ./capnproto-promise-nodiscard.patch
-    # backport of https://github.com/capnproto/capnproto/pull/2296
-    ./capnproto-monotonic-clocks-are-a-lie.patch
-  ];
-
-  nativeBuildInputs = [ cmake ];
-  propagatedBuildInputs = [
-    openssl
-    zlib
-  ]
-  ++ lib.optional (stdenv.cc.isClang && stdenv.hostPlatform.isStatic) empty-libgcc_eh;
-
-  # FIXME: separate the binaries from the stuff that user systems actually use
-  # This runs into a terrible UX issue in Lix and I just don't want to debug it
-  # right now for the couple MB of closure size:
-  # https://git.lix.systems/lix-project/lix/issues/551
-  # outputs = [ "bin" "dev" "out" ];
-
-  cmakeFlags = [
-    (lib.cmakeBool "BUILD_SHARED_LIBS" true)
-    # Take optimization flags from CXXFLAGS rather than cmake injecting them
-    (lib.cmakeFeature "CMAKE_BUILD_TYPE" "None")
-  ];
-
-  env = {
-    # Required to build the coroutine library
-    CXXFLAGS = "-std=c++20";
-  };
-
-  separateDebugInfo = true;
-
-  meta = with lib; {
-    homepage = "https://capnproto.org/";
-    description = "Cap'n Proto cerealization protocol";
-    longDescription = ''
-      Cap’n Proto is an insanely fast data interchange format and
-      capability-based RPC system. Think JSON, except binary. Or think Protocol
-      Buffers, except faster.
-    '';
-    license = licenses.mit;
-    platforms = platforms.all;
-    maintainers = lib.teams.lix.members;
-  };
-}