From dd9b425b775c9c191fb75b52223f3948b071b548 Mon Sep 17 00:00:00 2001
From: will <will@256k1.dev>
Date: Sat, 14 Mar 2026 19:47:33 -0400
Subject: [PATCH] capnproto: 1.2.0 -> 1.4.0

Diff: https://github.com/capnproto/capnproto/compare/v1.2.0...v1.4.0

Drop the libatomic patch as this has been merged as part of 1.3.0

Co-authored-by: Michael Daniels <mdaniels5757@gmail.com>
---
 pkgs/by-name/ca/capnproto/fix-libatomic.patch | 35 -------------------
 pkgs/by-name/ca/capnproto/package.nix         |  6 ++--
 2 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/by-name/ca/capnproto/fix-libatomic.patch

diff --git a/pkgs/by-name/ca/capnproto/fix-libatomic.patch b/pkgs/by-name/ca/capnproto/fix-libatomic.patch
deleted file mode 100644
index a72036c463d8..000000000000
--- a/pkgs/by-name/ca/capnproto/fix-libatomic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From dfbbc505817bd0c3e01af5865196629c2a2a2b5e Mon Sep 17 00:00:00 2001
-From: Marie Ramlow <me@nycode.dev>
-Date: Wed, 10 Sep 2025 20:12:39 +0200
-Subject: [PATCH] Check if libatomic is needed
-
----
- c++/src/kj/CMakeLists.txt | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/c++/src/kj/CMakeLists.txt b/c++/src/kj/CMakeLists.txt
-index 7114ddb80e..8ce355b8b0 100644
---- a/c++/src/kj/CMakeLists.txt
-+++ b/c++/src/kj/CMakeLists.txt
-@@ -84,6 +84,21 @@ target_compile_features(kj PUBLIC cxx_std_20)
- if(UNIX AND NOT ANDROID)
-   target_link_libraries(kj PUBLIC pthread)
- endif()
-+
-+include(CheckCXXSourceCompiles)
-+check_cxx_source_compiles("#include <atomic>
-+int main() {
-+  std::atomic<uint8_t> w1;
-+  std::atomic<uint16_t> w2;
-+  std::atomic<uint32_t> w4;
-+  std::atomic<uint64_t> w8;
-+  return ++w1 + ++w2 + ++w4 + ++w8;
-+}" CAPNP_BUILDS_WITHOUT_LIBATOMIC)
-+
-+if(NOT CAPNP_BUILDS_WITHOUT_LIBATOMIC)
-+  target_link_libraries(kj PUBLIC atomic)
-+endif()
-+
- #make sure the lite flag propagates to all users (internal + external) of this library
- target_compile_definitions(kj PUBLIC ${CAPNP_LITE_FLAG})
- #make sure external consumers don't need to manually set the include dirs
diff --git a/pkgs/by-name/ca/capnproto/package.nix b/pkgs/by-name/ca/capnproto/package.nix
index c308fb66ef7b..04a8c602610b 100644
--- a/pkgs/by-name/ca/capnproto/package.nix
+++ b/pkgs/by-name/ca/capnproto/package.nix
@@ -33,21 +33,19 @@ in
 # See: https://gerrit.lix.systems/c/lix/+/1874
 clangStdenv.mkDerivation rec {
   pname = "capnproto";
-  version = "1.2.0";
+  version = "1.4.0";
 
   # release tarballs are missing some ekam rules
   src = fetchFromGitHub {
     owner = "capnproto";
     repo = "capnproto";
     rev = "v${version}";
-    hash = "sha256-aDcn4bLZGq8915/NPPQsN5Jv8FRWd8cAspkG3078psc=";
+    hash = "sha256-CuhKOJwU+QG25lRR8F7ina+DV45ZlLzg/UJ2swf2tZ0=";
   };
 
   patches = [
     # https://github.com/capnproto/capnproto/pull/2377
     ./fix-libucontext.patch
-    # https://github.com/capnproto/capnproto/pull/2410
-    ./fix-libatomic.patch
   ];
 
   nativeBuildInputs = [