From 9acdb8892172f85f7bc40886122d54a20124355b Mon Sep 17 00:00:00 2001
From: Kornelijus Survila <kornholijo@gmail.com>
Date: Wed, 10 Dec 2025 01:02:33 -0700
Subject: [PATCH 1/4] maintainers: add kornholi

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b4ed4ecc2347..bac49b1dcfd9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13958,6 +13958,12 @@
     githubId = 913109;
     name = "Emil Fresk";
   };
+  kornholi = {
+    email = "kornholijo@gmail.com";
+    github = "kornholi";
+    githubId = 659440;
+    name = "Kornelijus";
+  };
   koschi13 = {
     email = "maximilian.konter@protonmail.com";
     github = "koschi13";

From c2645bc8a1f996ca7acaf4f4f4f8aea4d23f8917 Mon Sep 17 00:00:00 2001
From: Kornelijus Survila <kornholijo@gmail.com>
Date: Wed, 10 Dec 2025 01:05:44 -0700
Subject: [PATCH 2/4] foundationdb: add kornholi as maintainer

---
 pkgs/by-name/fo/foundationdb/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/fo/foundationdb/package.nix b/pkgs/by-name/fo/foundationdb/package.nix
index 4e7b7ee201ab..bea37684bd7b 100644
--- a/pkgs/by-name/fo/foundationdb/package.nix
+++ b/pkgs/by-name/fo/foundationdb/package.nix
@@ -171,6 +171,7 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [
       thoughtpolice
       lostnet
+      kornholi
     ];
   };
 }

From 7d831bec51b321f7d875abfcb3440716b909c746 Mon Sep 17 00:00:00 2001
From: Kornelijus Survila <kornholijo@gmail.com>
Date: Wed, 10 Dec 2025 00:41:15 -0700
Subject: [PATCH 3/4] foundationdb: do not statically link
 libcxx/libstdc++/libgcc

FDB defaults to statically linking libcxx, libstdc++, and libgcc. This leads
to non-obvious problems when the dependencies bring in their own copies. Do
not do that as we're not trying to build and package portable binaries.

Fixes #319537.
Fixes #378888.
---
 pkgs/by-name/fo/foundationdb/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/fo/foundationdb/package.nix b/pkgs/by-name/fo/foundationdb/package.nix
index bea37684bd7b..4929c546d61c 100644
--- a/pkgs/by-name/fo/foundationdb/package.nix
+++ b/pkgs/by-name/fo/foundationdb/package.nix
@@ -107,6 +107,12 @@ stdenv.mkDerivation rec {
 
     "-DBUILD_DOCUMENTATION=FALSE"
 
+    # Disable the default static linking to libc++, libstdc++ and libgcc.
+    #
+    # This leads to various, non-obvious problems as our dependencies bring in
+    # their own copies of these libraries.
+    "-DSTATIC_LINK_LIBCXX=FALSE"
+
     # LTO brings up overall build time, but results in much smaller
     # binaries for all users and the cache.
     "-DUSE_LTO=ON"

From 05a0e8615c7597919b9560d9545ae7f48cd9e136 Mon Sep 17 00:00:00 2001
From: Kornelijus Survila <kornholijo@gmail.com>
Date: Wed, 10 Dec 2025 00:52:53 -0700
Subject: [PATCH 4/4] foundationdb: 7.3.42 -> 7.3.68

This is the latest release validated in production.
---
 pkgs/by-name/fo/foundationdb/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fo/foundationdb/package.nix b/pkgs/by-name/fo/foundationdb/package.nix
index 4929c546d61c..dd4cb12813a5 100644
--- a/pkgs/by-name/fo/foundationdb/package.nix
+++ b/pkgs/by-name/fo/foundationdb/package.nix
@@ -15,6 +15,7 @@
   toml11,
   jemalloc,
   doctest,
+  zlib,
 }:
 let
   boost = boost186;
@@ -29,13 +30,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "foundationdb";
-  version = "7.3.42";
+  version = "7.3.68";
 
   src = fetchFromGitHub {
     owner = "apple";
     repo = "foundationdb";
     tag = version;
-    hash = "sha256-jQcm+HLai5da2pZZ7iLdN6fpQZxf5+/kkfv9OSXQ57c=";
+    hash = "sha256-OaV7YyBggeX3vrnI2EYwlWdIGRHOAeP5OZN0Rmd/dnw=";
   };
 
   patches = [
@@ -80,6 +81,7 @@ stdenv.mkDerivation rec {
     msgpack-cxx
     openssl
     toml11
+    zlib
   ];
 
   checkInputs = [ doctest ];