From 16526b204c2dfb5499de631079d7e8dfbd1cc1f5 Mon Sep 17 00:00:00 2001
From: Vincent Haupert <vincent.haupert@yaxi.tech>
Date: Wed, 7 May 2025 10:48:13 +0200
Subject: [PATCH 1/2] haproxy: add support for `aws-lc`

---
 pkgs/by-name/ha/haproxy/package.nix | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix
index 25c1962cc517..df8aa4939295 100644
--- a/pkgs/by-name/ha/haproxy/package.nix
+++ b/pkgs/by-name/ha/haproxy/package.nix
@@ -9,23 +9,30 @@
   nixosTests,
   zlib,
   libxcrypt,
-  wolfssl,
+  aws-lc,
   libressl,
-  quictls,
   openssl,
+  quictls,
+  wolfssl,
   lua5_4,
   pcre2,
 }:
 
 assert lib.assertOneOf "sslLibrary" sslLibrary [
-  "quictls"
-  "openssl"
+  "aws-lc"
   "libressl"
+  "openssl"
+  "quictls"
   "wolfssl"
 ];
 let
   sslPkgs = {
-    inherit quictls openssl libressl;
+    inherit
+      aws-lc
+      libressl
+      openssl
+      quictls
+      ;
     wolfssl = wolfssl.override {
       variant = "haproxy";
       extraConfigureFlags = [ "--enable-quic" ];
@@ -77,6 +84,9 @@ stdenv.mkDerivation (finalAttrs: {
       "SSL_LIB=${lib.getDev sslPkg}/lib"
       "USE_QUIC=yes"
     ]
+    ++ lib.optionals (sslLibrary == "aws-lc") [
+      "USE_OPENSSL_AWSLC=true"
+    ]
     ++ lib.optionals (sslLibrary == "openssl") [
       "USE_QUIC_OPENSSL_COMPAT=yes"
     ]

From 16b5e60e13eb6042b36ac84cd8f8688e130be732 Mon Sep 17 00:00:00 2001
From: Vincent Haupert <vincent.haupert@yaxi.tech>
Date: Wed, 7 May 2025 10:54:22 +0200
Subject: [PATCH 2/2] haproxy: remove `USE_SYSTEMD` flag

---
 pkgs/by-name/ha/haproxy/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix
index df8aa4939295..68b49fbc45e6 100644
--- a/pkgs/by-name/ha/haproxy/package.nix
+++ b/pkgs/by-name/ha/haproxy/package.nix
@@ -104,7 +104,6 @@ stdenv.mkDerivation (finalAttrs: {
       "LUA_INC=${lua5_4}/include"
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
-      "USE_SYSTEMD=yes"
       "USE_GETADDRINFO=1"
     ]
     ++ lib.optionals withPrometheusExporter [