diff --git a/devel/nanobind/Makefile b/devel/nanobind/Makefile
index a66823ddd61e..1d065ad43448 100644
--- a/devel/nanobind/Makefile
+++ b/devel/nanobind/Makefile
@@ -1,46 +1,48 @@
 PORTNAME=	nanobind
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.1.0
+DISTVERSION=	2.2.0
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Tiny and efficient C++/Python bindings (C++ version)
 WWW=		https://github.com/wjakob/nanobind
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	robin-map>0:devel/robin-map
 RUN_DEPENDS=	robin-map>0:devel/robin-map
 
 USES=		localbase python
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wjakob
 
 CXXFLAGS+=	-I${WRKSRC}/include \
 		-I${PYTHON_INCLUDEDIR}
 
 do-build: # cmake scripts don't build the shared library
 	@cd ${WRKSRC}/src && \
 		${SETENV} ${MAKE_ENV} ${CXX} \
 			${CXXFLAGS} ${LDFLAGS} \
 			-fPIC \
 			-shared \
 			-Wl,-soname=libnanobind.so \
 			-o libnanobind.so \
 			nb_combined.cpp
 
 do-install:
 	# install headers
 	cd ${WRKSRC}/include && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include
 	# install shared library
 	${INSTALL_LIB} ${WRKSRC}/src/libnanobind.so ${STAGEDIR}${PREFIX}/lib
 
 do-test: # test fails because it doesn't create the PyInit_xx function
 	@cd ${WRKSRC} && \
-		${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${FILESDIR}/myext.cpp -o myext${PYTHON_EXT_SUFFIX}.so -L${LOCALBASE}/lib -lnanobind && \
+		${SETENV} ${MAKE_ENV} ${CXX} ${CXXFLAGS} \
+			${LDFLAGS} -shared -o ${FILESDIR}/myext.cpp -o myext${PYTHON_EXT_SUFFIX}.so \
+			-L${LOCALBASE}/lib -L${STAGEDIR}${PREFIX}/lib -lnanobind && \
 		${CP} ${FILESDIR}/test.py . && \
 		${PYTHON_CMD} ${FILESDIR}/test.py
 
 .include <bsd.port.mk>
diff --git a/devel/nanobind/distinfo b/devel/nanobind/distinfo
index 544977c86605..738bcdae1111 100644
--- a/devel/nanobind/distinfo
+++ b/devel/nanobind/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1723358161
-SHA256 (wjakob-nanobind-v2.1.0_GH0.tar.gz) = c37c53c60ada5fe1c956e24bd4b83af669a2309bf952bd251f36a7d2fa3bacf0
-SIZE (wjakob-nanobind-v2.1.0_GH0.tar.gz) = 850714
-SHA256 (Tessil-robin-map-188c455_GH0.tar.gz) = c3f05ed8933a1f9aa57295c8ad17bd44756cf5cf030a95325c61aa862fa19680
-SIZE (Tessil-robin-map-188c455_GH0.tar.gz) = 70577
+TIMESTAMP = 1728016125
+SHA256 (wjakob-nanobind-v2.2.0_GH0.tar.gz) = bfbfc7e5759f1669e4ddb48752b1ddc5647d1430e94614d6f8626df1d508e65a
+SIZE (wjakob-nanobind-v2.2.0_GH0.tar.gz) = 881024
diff --git a/devel/nanobind/pkg-plist b/devel/nanobind/pkg-plist
index 401fdc113df1..4e8fca35917e 100644
--- a/devel/nanobind/pkg-plist
+++ b/devel/nanobind/pkg-plist
@@ -1,57 +1,58 @@
 include/nanobind/eigen/dense.h
 include/nanobind/eigen/sparse.h
 include/nanobind/eval.h
 include/nanobind/intrusive/counter.h
 include/nanobind/intrusive/counter.inl
 include/nanobind/intrusive/ref.h
 include/nanobind/make_iterator.h
 include/nanobind/nanobind.h
 include/nanobind/nb_accessor.h
 include/nanobind/nb_attr.h
 include/nanobind/nb_call.h
 include/nanobind/nb_cast.h
 include/nanobind/nb_class.h
 include/nanobind/nb_defs.h
 include/nanobind/nb_descr.h
 include/nanobind/nb_enums.h
 include/nanobind/nb_error.h
 include/nanobind/nb_func.h
 include/nanobind/nb_lib.h
 include/nanobind/nb_misc.h
 include/nanobind/nb_python.h
 include/nanobind/nb_traits.h
 include/nanobind/nb_tuple.h
 include/nanobind/nb_types.h
 include/nanobind/ndarray.h
 include/nanobind/operators.h
 include/nanobind/stl/array.h
 include/nanobind/stl/bind_map.h
 include/nanobind/stl/bind_vector.h
 include/nanobind/stl/chrono.h
 include/nanobind/stl/complex.h
 include/nanobind/stl/detail/chrono.h
 include/nanobind/stl/detail/nb_array.h
 include/nanobind/stl/detail/nb_dict.h
 include/nanobind/stl/detail/nb_list.h
+include/nanobind/stl/detail/nb_optional.h
 include/nanobind/stl/detail/nb_set.h
 include/nanobind/stl/detail/traits.h
 include/nanobind/stl/filesystem.h
 include/nanobind/stl/function.h
 include/nanobind/stl/list.h
 include/nanobind/stl/map.h
 include/nanobind/stl/optional.h
 include/nanobind/stl/pair.h
 include/nanobind/stl/set.h
 include/nanobind/stl/shared_ptr.h
 include/nanobind/stl/string.h
 include/nanobind/stl/string_view.h
 include/nanobind/stl/tuple.h
 include/nanobind/stl/unique_ptr.h
 include/nanobind/stl/unordered_map.h
 include/nanobind/stl/unordered_set.h
 include/nanobind/stl/variant.h
 include/nanobind/stl/vector.h
 include/nanobind/stl/wstring.h
 include/nanobind/trampoline.h
 include/nanobind/typing.h
 lib/libnanobind.so
diff --git a/devel/py-nanobind/Makefile b/devel/py-nanobind/Makefile
index 58849c461a80..c58140941774 100644
--- a/devel/py-nanobind/Makefile
+++ b/devel/py-nanobind/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	nanobind
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.1.0
+DISTVERSION=	2.2.0
 CATEGORIES=	devel python
 #MASTER_SITES=	PYPI # no tarball
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Tiny and efficient C++/Python bindings
 WWW=		https://github.com/wjakob/nanobind
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scikit-build-core>0:devel/py-scikit-build-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
 		cmake:devel/cmake-core
 TEST_DEPENDS=	cmake:devel/cmake-core
 
 USES=		python
 USE_PYTHON=	pep517 autoplist pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wjakob
 GH_TUPLE=	Tessil:robin-map:188c455:robin_map/ext/robin_map
 
 TEST_WRKSRC=	${WRKSRC}/tests
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 NO_ARCH=	yes
 
 pre-test: # build test extensions
 	@cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} cmake . && \
 		${SETENV} ${MAKE_ENV} ${MAKE} -j${MAKE_JOBS_NUMBER}
 
 .include <bsd.port.mk>
diff --git a/devel/py-nanobind/distinfo b/devel/py-nanobind/distinfo
index 68f6a68dfd47..a7f9d6161492 100644
--- a/devel/py-nanobind/distinfo
+++ b/devel/py-nanobind/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1723358895
-SHA256 (wjakob-nanobind-v2.1.0_GH0.tar.gz) = c37c53c60ada5fe1c956e24bd4b83af669a2309bf952bd251f36a7d2fa3bacf0
-SIZE (wjakob-nanobind-v2.1.0_GH0.tar.gz) = 850714
+TIMESTAMP = 1728016362
+SHA256 (wjakob-nanobind-v2.2.0_GH0.tar.gz) = bfbfc7e5759f1669e4ddb48752b1ddc5647d1430e94614d6f8626df1d508e65a
+SIZE (wjakob-nanobind-v2.2.0_GH0.tar.gz) = 881024
 SHA256 (Tessil-robin-map-188c455_GH0.tar.gz) = c3f05ed8933a1f9aa57295c8ad17bd44756cf5cf030a95325c61aa862fa19680
 SIZE (Tessil-robin-map-188c455_GH0.tar.gz) = 70577