diff --git a/mingw-w64-jsonnet/001-jsonnet-0.20.0-cxx17.patch b/mingw-w64-jsonnet/001-jsonnet-0.20.0-cxx17.patch
deleted file mode 100644
index 29c5f9a32d6eb..0000000000000
--- a/mingw-w64-jsonnet/001-jsonnet-0.20.0-cxx17.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- jsonnet-0.20.0-orig/CMakeLists.txt	2023-11-09 23:22:54.373562500 +0300
-+++ jsonnet-0.20.0/CMakeLists.txt	2023-11-09 23:23:23.024372200 +0300
-@@ -37,7 +37,7 @@
-         ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
-     set(OPT "-O3")
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -Wextra -pedantic -std=c99 -O3 ${OPT}")
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wextra -Woverloaded-virtual -pedantic -std=c++11 -fPIC ${OPT}")
-+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wextra -Woverloaded-virtual -pedantic -std=c++17 -fPIC ${OPT}")
- else()
-     # TODO: Windows support.
-     message(FATAL_ERROR "Compiler ${CMAKE_CXX_COMPILER_ID} not supported")
diff --git a/mingw-w64-jsonnet/002-jsonnet-0.20.0-include-nlohmann-json.patch b/mingw-w64-jsonnet/002-jsonnet-0.20.0-include-nlohmann-json.patch
deleted file mode 100644
index d614656a68558..0000000000000
--- a/mingw-w64-jsonnet/002-jsonnet-0.20.0-include-nlohmann-json.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- jsonnet-0.20.0-orig/core/vm.cpp	2023-11-09 23:20:08.670809500 +0300
-+++ jsonnet-0.20.0/core/vm.cpp	2023-11-09 23:27:29.455113900 +0300
-@@ -23,7 +23,7 @@
- 
- #include "desugarer.h"
- #include "json.h"
--#include "json.hpp"
-+#include <nlohmann/json.hpp>
- #include "md5.h"
- #include "parser.h"
- #include "ryml_std.hpp" // include this before any other ryml header
diff --git a/mingw-w64-jsonnet/003-jsonnet-0.20.0-link-libraries.patch b/mingw-w64-jsonnet/003-jsonnet-0.20.0-link-libraries.patch
deleted file mode 100644
index 1a661161e4093..0000000000000
--- a/mingw-w64-jsonnet/003-jsonnet-0.20.0-link-libraries.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- jsonnet-0.20.0-orig/cpp/CMakeLists.txt	2023-11-09 23:22:54.154599300 +0300
-+++ jsonnet-0.20.0/cpp/CMakeLists.txt	2023-11-10 00:33:05.848102600 +0300
-@@ -10,7 +10,7 @@
- 
- add_library(libjsonnet++ SHARED ${LIBJSONNETPP_HEADERS} ${LIBJSONNETPP_SOURCE})
- add_dependencies(libjsonnet++ jsonnet)
--# target_link_libraries(libjsonnet libjsonnet)
-+target_link_libraries(libjsonnet++ libjsonnet)
- 
- # CMake prepends CMAKE_SHARED_LIBRARY_PREFIX to shared libraries, so without
- # this step the output would be |liblibjsonnet|.
diff --git a/mingw-w64-jsonnet/004-jsonnet-0.20.0-core-runtime.patch b/mingw-w64-jsonnet/004-jsonnet-0.20.0-core-runtime.patch
deleted file mode 100644
index 0c848f357ccf8..0000000000000
--- a/mingw-w64-jsonnet/004-jsonnet-0.20.0-core-runtime.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- jsonnet-0.20.0-orig/core/CMakeLists.txt	2023-11-09 23:20:08.530186400 +0300
-+++ jsonnet-0.20.0/core/CMakeLists.txt	2023-11-10 01:14:37.031174800 +0300
-@@ -45,6 +45,7 @@
- 	SOVERSION   "0"
- 	PUBLIC_HEADER "${LIB_HEADER}")
- install(TARGETS libjsonnet
-+	RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
- 	LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- 	ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- 	PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
diff --git a/mingw-w64-jsonnet/005-jsonnet-0.20.0-cpp-runtime.patch b/mingw-w64-jsonnet/005-jsonnet-0.20.0-cpp-runtime.patch
deleted file mode 100644
index 3fd5754eb539f..0000000000000
--- a/mingw-w64-jsonnet/005-jsonnet-0.20.0-cpp-runtime.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- jsonnet-0.20.0-orig/cpp/CMakeLists.txt	2023-11-09 23:22:54.154599300 +0300
-+++ jsonnet-0.20.0/cpp/CMakeLists.txt	2023-11-10 01:15:00.186669800 +0300
-@@ -19,6 +19,7 @@
- 	SOVERSION   "0"
- 	PUBLIC_HEADER "${LIB_HEADER}")
- install(TARGETS libjsonnet++
-+	RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
- 	LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- 	ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- 	PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
diff --git a/mingw-w64-jsonnet/006-jsonnet-0.20.0-c4core-nopack.patch b/mingw-w64-jsonnet/006-jsonnet-0.20.0-c4core-nopack.patch
deleted file mode 100644
index 963ba0816d8e2..0000000000000
--- a/mingw-w64-jsonnet/006-jsonnet-0.20.0-c4core-nopack.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- jsonnet-0.20.0-orig/third_party/rapidyaml/rapidyaml/ext/c4core/CMakeLists.txt	2023-11-09 23:20:06.514630800 +0300
-+++ jsonnet-0.20.0/third_party/rapidyaml/rapidyaml/ext/c4core/CMakeLists.txt	2023-11-10 01:41:36.746706300 +0300
-@@ -77,11 +77,11 @@
- 
- #-------------------------------------------------------
- 
--c4_install_target(c4core)
--c4_install_exports()
--c4_pack_project()
-+#c4_install_target(c4core)
-+#c4_install_exports()
-+#c4_pack_project()
- 
--c4_add_dev_targets()
-+#c4_add_dev_targets()
- 
--c4_set_default_pack_properties(TYPE LIBRARY)
--include(CPack)
-+#c4_set_default_pack_properties(TYPE LIBRARY)
-+#include(CPack)
diff --git a/mingw-w64-jsonnet/007-jsonnet-0.20.0-rapidyaml-aarch64.patch b/mingw-w64-jsonnet/007-jsonnet-0.20.0-rapidyaml-aarch64.patch
index 89c5252d192a5..1a3a162ec42f6 100644
--- a/mingw-w64-jsonnet/007-jsonnet-0.20.0-rapidyaml-aarch64.patch
+++ b/mingw-w64-jsonnet/007-jsonnet-0.20.0-rapidyaml-aarch64.patch
@@ -1,24 +1,20 @@
-diff -bur jsonnet-0.20.0-o/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float/include/fast_float/float_common.h jsonnet-0.20.0/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float/include/fast_float/float_common.h
---- jsonnet-0.20.0-o/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float/include/fast_float/float_common.h	2025-04-26 15:36:14.324363700 -0600
-+++ jsonnet-0.20.0/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/ext/fast_float/include/fast_float/float_common.h	2025-04-26 15:37:59.341711900 -0600
-@@ -161,8 +161,13 @@
+--- jsonnet-0.21.0/third_party/rapidyaml/ryml_all.hpp.orig	2025-05-07 14:28:56.000000000 +0200
++++ jsonnet-0.21.0/third_party/rapidyaml/ryml_all.hpp	2026-01-09 15:50:47.657489300 +0100
+@@ -7670,11 +7670,11 @@
+ fastfloat_really_inline value128 full_multiplication(uint64_t a,
                                                       uint64_t b) {
    value128 answer;
- #ifdef _M_ARM64
-+#ifdef __GNUC__
-+  __uint128_t mul = ((__uint128_t)a) * b;
-+  answer.high = mul >> 64;
-+#else
+-#ifdef _M_ARM64
++#if defined(_M_ARM64) && !defined(__GNUC__)
    // ARM64 has native support for 64-bit multiplications, no need to emulate
    answer.high = __umulh(a, b);
-+#endif 
    answer.low = a * b;
- #elif defined(FASTFLOAT_32BIT) || (defined(_WIN64) && !defined(__clang__))
+-#elif defined(FASTFLOAT_32BIT) || (defined(_WIN64) && !defined(__clang__))
++#elif defined(FASTFLOAT_32BIT) || (defined(_WIN64) && !defined(__clang__) && defined(_MSC_VER))
    answer.low = _umul128(a, b, &answer.high); // _umul128 not available on ARM64
-diff -bur jsonnet-0.20.0-o/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/windows_pop.hpp jsonnet-0.20.0/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/windows_pop.hpp
---- jsonnet-0.20.0-o/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/windows_pop.hpp	2025-04-26 15:36:14.304344400 -0600
-+++ jsonnet-0.20.0/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/windows_pop.hpp	2025-04-26 15:36:38.916843100 -0600
-@@ -13,6 +13,10 @@
+ #elif defined(FASTFLOAT_64BIT)
+   __uint128_t r = ((__uint128_t)a) * b;
+@@ -18140,6 +18140,10 @@
  #    undef _c4_ARM_
  #    undef _ARM_
  #endif
@@ -29,20 +25,3 @@ diff -bur jsonnet-0.20.0-o/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/win
  
  #ifdef _c4_NOMINMAX
  #    undef _c4_NOMINMAX
-diff -bur jsonnet-0.20.0-o/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/windows_push.hpp jsonnet-0.20.0/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/windows_push.hpp
---- jsonnet-0.20.0-o/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/windows_push.hpp	2025-04-26 15:36:14.332363500 -0600
-+++ jsonnet-0.20.0/third_party/rapidyaml/rapidyaml/ext/c4core/src/c4/windows_push.hpp	2025-04-26 15:37:10.262450900 -0600
-@@ -8,7 +8,12 @@
-  *
-  * @see https://aras-p.info/blog/2018/01/12/Minimizing-windows.h/ */
- 
--#if defined(_WIN64)
-+#if defined(_M_ARM64)
-+#   ifndef _ARM64_
-+#       define _c4_ARM64_
-+#       define _ARM64_
-+#   endif
-+#elif defined(_WIN64)
- #   ifndef _AMD64_
- #       define _c4_AMD64_
- #       define _AMD64_
diff --git a/mingw-w64-jsonnet/PKGBUILD b/mingw-w64-jsonnet/PKGBUILD
index 11cde59276022..7cac55ed97c21 100644
--- a/mingw-w64-jsonnet/PKGBUILD
+++ b/mingw-w64-jsonnet/PKGBUILD
@@ -4,8 +4,8 @@ _realname=jsonnet
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-python-${_realname}")
-pkgver=0.20.0
-pkgrel=6
+pkgver=0.21.0
+pkgrel=1
 pkgdesc="The data templating language (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -24,21 +24,9 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-python-setuptools")
 options=('!strip')
 source=("${url}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
-        '001-jsonnet-0.20.0-cxx17.patch'
-        '002-jsonnet-0.20.0-include-nlohmann-json.patch'
-        '003-jsonnet-0.20.0-link-libraries.patch'
-        '004-jsonnet-0.20.0-core-runtime.patch'
-        '005-jsonnet-0.20.0-cpp-runtime.patch'
-        '006-jsonnet-0.20.0-c4core-nopack.patch'
         '007-jsonnet-0.20.0-rapidyaml-aarch64.patch')
-sha256sums=('77bd269073807731f6b11ff8d7c03e9065aafb8e4d038935deb388325e52511b'
-            '83dc8dabde1caa87a5d59f945952f61fb1b7d77079d3c849772464674eef6c6d'
-            '606fa576a6ad4c71ce5c3bfd5ab6dc9461ccfc36e959830e133123a0cb652c93'
-            'e2ea63010cbe37296715139878393d26c5b3c04ca1f3cd8cb60bc6a2ec8e9402'
-            'dfe3393b4eb6a3f4d0b18b683970bb50d8267d8041221beeb4a8e9386f7f4ce2'
-            'f75f4330f6b18219a01660a4f4d4b3cb9928441def0a0e739c2503870363ca40'
-            '38dfe387e68d67ac85c21a19ae8ec5e6af18fbd3649b44f3ddde1866bea3b974'
-            '9be36ff6405ee9dbe868654f1cdd2e38527ca8cde7bc357711109b47b3c05de5')
+sha256sums=('a12ebca72e43e7061ffe4ef910e572b95edd7778a543d6bf85f6355bd290300e'
+            'f80ffb6cb68e53489e20a1c87c33133d0d9b36d3097ee0dbc37d203bf2c8a8ce')
 
 apply_patch_with_msg() {
   for _patch in "$@"
@@ -52,12 +40,6 @@ prepare() {
   cd "${srcdir}"/${_realname}-${pkgver}
 
   apply_patch_with_msg \
-    001-jsonnet-0.20.0-cxx17.patch \
-    002-jsonnet-0.20.0-include-nlohmann-json.patch \
-    003-jsonnet-0.20.0-link-libraries.patch \
-    004-jsonnet-0.20.0-core-runtime.patch \
-    005-jsonnet-0.20.0-cpp-runtime.patch \
-    006-jsonnet-0.20.0-c4core-nopack.patch \
     007-jsonnet-0.20.0-rapidyaml-aarch64.patch
 }