From b38a2502a769e86df1b8911ecef5688054cba41f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 5 Feb 2026 09:51:10 +0000 Subject: [PATCH] kea: backport boost-1.89 fix Without the chnage `kea` fails the build on `staging` as: kea> ../src/lib/asiolink/interval_timer.cc:91:18: error: 'deadline_timer' in namespace 'boost::asio' does not name a type kea> 91 | boost::asio::deadline_timer timer_; kea> | ^~~~~~~~~~~~~~ Can't download the patch as is at it fails to fetch over http/2 as: $ curl -L https://gitlab.isc.org/isc-projects/kea/-/commit/b03071ba6912a08e4cc4cb4db50d9624ce86f41e.patch curl: (92) HTTP/2 stream 1 was not closed cleanly: PROTOCOL_ERROR (err 1) --- pkgs/by-name/ke/kea/boost-1.89.patch | 61 ++++++++++++++++++++++++++++ pkgs/by-name/ke/kea/package.nix | 3 ++ 2 files changed, 64 insertions(+) create mode 100644 pkgs/by-name/ke/kea/boost-1.89.patch diff --git a/pkgs/by-name/ke/kea/boost-1.89.patch b/pkgs/by-name/ke/kea/boost-1.89.patch new file mode 100644 index 000000000000..b8bba747075f --- /dev/null +++ b/pkgs/by-name/ke/kea/boost-1.89.patch @@ -0,0 +1,61 @@ +https://gitlab.isc.org/isc-projects/kea/-/commit/b03071ba6912a08e4cc4cb4db50d9624ce86f41e + +From b03071ba6912a08e4cc4cb4db50d9624ce86f41e Mon Sep 17 00:00:00 2001 +From: Francis Dupont +Date: Fri, 29 Aug 2025 00:40:03 +0200 +Subject: [PATCH] [#4085] Proposed update + +--- + meson.build | 3 ++- + src/lib/asiodns/io_fetch.h | 1 + + src/lib/asiolink/interval_timer.h | 1 + + 3 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 434abf58313..fbd76dce5e5 100644 +--- a/meson.build ++++ b/meson.build +@@ -189,7 +189,7 @@ message(f'Detected system "@SYSTEM@".') + + #### Dependencies + +-boost_dep = dependency('boost', version: '>=1.66', modules: ['system']) ++boost_dep = dependency('boost', version: '>=1.66') + dl_dep = dependency('dl') + threads_dep = dependency('threads') + add_project_dependencies(boost_dep, dl_dep, threads_dep, language: ['cpp']) +@@ -200,6 +200,7 @@ boost_headers = [ + 'boost/asio/coroutine.hpp', + 'boost/asio/io_context.hpp', + 'boost/asio/ip/address.hpp', ++ 'boost/asio/deadline_timer.hpp', + 'boost/asio/signal_set.hpp', + 'boost/circular_buffer.hpp', + 'boost/date_time/posix_time/posix_time_types.hpp', +diff --git a/src/lib/asiodns/io_fetch.h b/src/lib/asiodns/io_fetch.h +index 6fcbb78abb0..3053cc2e0a2 100644 +--- a/src/lib/asiodns/io_fetch.h ++++ b/src/lib/asiodns/io_fetch.h +@@ -16,6 +16,7 @@ + #include + + #include ++#include + #include + #include + #include +diff --git a/src/lib/asiolink/interval_timer.h b/src/lib/asiolink/interval_timer.h +index 0b1c10c7882..790d132b42a 100644 +--- a/src/lib/asiolink/interval_timer.h ++++ b/src/lib/asiolink/interval_timer.h +@@ -7,6 +7,7 @@ + #ifndef ASIOLINK_INTERVAL_TIMER_H + #define ASIOLINK_INTERVAL_TIMER_H 1 + ++#include + #include + #include + +-- +GitLab + diff --git a/pkgs/by-name/ke/kea/package.nix b/pkgs/by-name/ke/kea/package.nix index c2017262a9e5..3acec26710ae 100644 --- a/pkgs/by-name/ke/kea/package.nix +++ b/pkgs/by-name/ke/kea/package.nix @@ -38,6 +38,9 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./dont-create-system-paths.patch + # backport of an upstream fix for boost-1.89: + # https://gitlab.isc.org/isc-projects/kea/-/merge_requests/2771 + ./boost-1.89.patch ]; postPatch = ''