diff --git a/var/spack/repos/builtin/packages/libluv/package.py b/var/spack/repos/builtin/packages/libluv/package.py
index 2f04376a308..85f12e9769a 100644
--- a/var/spack/repos/builtin/packages/libluv/package.py
+++ b/var/spack/repos/builtin/packages/libluv/package.py
@@ -15,6 +15,8 @@ class Libluv(CMakePackage):
 
     license("Apache-2.0")
 
+    version("1.50.0-1", sha256="d867c3024d9c981d54f2edd83e13fd6dc1158f0608635f7b1c0f6b5586b5bc34")
+    version("1.48.0-2", sha256="2c3a1ddfebb4f6550293a40ee789f7122e97647eede51511f57203de48c03b7a")
     version("1.48.0-2", sha256="2c3a1ddfebb4f6550293a40ee789f7122e97647eede51511f57203de48c03b7a")
     version("1.45.0-0", sha256="fa6c46fb09f88320afa7f88017efd7b0d2b3a0158c5ba5b6851340b0332a2b81")
     version("1.44.2-1", sha256="3eb5c7bc44f61fbc4148ea30e3221d410263e0ffa285672851fc19debf9e5c30")
diff --git a/var/spack/repos/builtin/packages/tree-sitter/package.py b/var/spack/repos/builtin/packages/tree-sitter/package.py
index d4ae97486b3..4ffe6aadba0 100644
--- a/var/spack/repos/builtin/packages/tree-sitter/package.py
+++ b/var/spack/repos/builtin/packages/tree-sitter/package.py
@@ -18,6 +18,16 @@ class TreeSitter(MakefilePackage):
 
     license("MIT")
 
+    version("0.25.3", sha256="862fac52653bc7bc9d2cd0630483e6bdf3d02bcd23da956ca32663c4798a93e3")
+    version("0.25.2", sha256="26791f69182192fef179cd58501c3226011158823557a86fe42682cb4a138523")
+    version("0.25.1", sha256="99a2446075c2edf60e82755c48415d5f6e40f2d9aacb3423c6ca56809b70fe59")
+    version("0.25.0", sha256="3729e98e54a41a4c03f4f6c0be580d14ed88c113d75acf15397b16e05cf91129")
+    version("0.24.7", sha256="7cbc13c974d6abe978cafc9da12d1e79e07e365c42af75e43ec1b5cdc03ed447")
+    version("0.24.6", sha256="03c7ee1e6f9f4f3821fd4af0ae06e1da60433b304a73ff92ee9694933009121a")
+    version("0.24.5", sha256="b5ac48acf5a04fd82ccd4246ad46354d9c434be26c9606233917549711e4252c")
+    version("0.24.4", sha256="d704832a6bfaac8b3cbca3b5d773cad613183ba8c04166638af2c6e5dfb9e2d2")
+    version("0.24.3", sha256="0a8d0cf8e09caba22ed0d8439f7fa1e3d8453800038e43ccad1f34ef29537da1")
+    version("0.24.2", sha256="199da041ac7ef62bccdda9b7bec28aafa073f7eea2677680aa7992d503c9cc64")
     version("0.22.6", sha256="e2b687f74358ab6404730b7fb1a1ced7ddb3780202d37595ecd7b20a8f41861f")
     version("0.22.5", sha256="6bc22ca7e0f81d77773462d922cf40b44bfd090d92abac75cb37dbae516c2417")
     version("0.22.4", sha256="919b750da9af1260cd989498bc84c63391b72ee2aa2ec20fc84882544eb7a229")
@@ -40,3 +50,10 @@ class TreeSitter(MakefilePackage):
 
     def edit(self, spec, prefix):
         env["PREFIX"] = prefix
+
+        # Starting from 0.25.0 endianness is taken into account using system headers
+        #   https://github.com/tree-sitter/tree-sitter/pull/3740
+        # but GLIBC provides them according to some defines that changed over time.
+        #   https://www.sourceware.org/glibc/wiki/Release/2.20#Deprecation_of__BSD_SOURCE_and__SVID_SOURCE_feature_macros
+        if spec.satisfies("@0.25: ^glibc@:2.19"):
+            filter_file("-D_DEFAULT_SOURCE", "-D_BSD_SOURCE", "Makefile")
diff --git a/var/spack/repos/builtin/packages/unibilium/package.py b/var/spack/repos/builtin/packages/unibilium/package.py
index 27983984fac..6e9df57159f 100644
--- a/var/spack/repos/builtin/packages/unibilium/package.py
+++ b/var/spack/repos/builtin/packages/unibilium/package.py
@@ -5,24 +5,37 @@
 from spack.package import *
 
 
-class Unibilium(Package):
+class Unibilium(MakefilePackage, AutotoolsPackage):
     """A terminfo parsing library"""
 
-    homepage = "https://github.com/mauke/unibilium"
-    url = "https://github.com/mauke/unibilium/archive/v2.0.0.tar.gz"
+    homepage = "https://github.com/neovim/unibilium/"
+    url = "https://github.com/neovim/unibilium/archive/v2.1.2.tar.gz"
 
     license("LGPL-3.0-or-later")
 
+    version("2.1.2", sha256="370ecb07fbbc20d91d1b350c55f1c806b06bf86797e164081ccc977fc9b3af7a")
+    version("2.1.1", sha256="6f0ee21c8605340cfbb458cbd195b4d074e6d16dd0c0e12f2627ca773f3cabf1")
+    version("2.1.0", sha256="05bf97e357615e218126f7ac086e7056a23dc013cfac71643b50a18ad390c7d4")
     version("2.0.0", sha256="78997d38d4c8177c60d3d0c1aa8c53fd0806eb21825b7b335b1768d7116bc1c1")
     version("1.2.0", sha256="623af1099515e673abfd3cae5f2fa808a09ca55dda1c65a7b5c9424eb304ead8")
 
-    depends_on("c", type="build")  # generated
+    depends_on("c", type="build")
+
+    build_system(
+        conditional("makefile", when="@:2.1.1"),
+        conditional("autotools", when="@2.1.2:"),
+        default="autotools",
+    )
 
     depends_on("gmake", type="build")
     depends_on("libtool", type="build")
     depends_on("perl", type="build")
     depends_on("gzip", type="build")
 
+    with when("build_system=autotools"):
+        depends_on("autoconf", when="@2.1.2:", type="build")
+        depends_on("automake", when="@2.1.2:", type="build")
+
     def install(self, spec, prefix):
         make("PREFIX=" + prefix)
         make("install", "PREFIX=" + prefix)
diff --git a/var/spack/repos/builtin/packages/utf8proc/package.py b/var/spack/repos/builtin/packages/utf8proc/package.py
index c3600c9bc71..4e32e9c320f 100644
--- a/var/spack/repos/builtin/packages/utf8proc/package.py
+++ b/var/spack/repos/builtin/packages/utf8proc/package.py
@@ -12,6 +12,7 @@ class Utf8proc(CMakePackage):
     homepage = "https://juliastrings.github.io/utf8proc/"
     url = "https://github.com/JuliaStrings/utf8proc/archive/v2.4.0.tar.gz"
 
+    version("2.10.0", sha256="6f4f1b639daa6dca9f80bc5db1233e9cbaa31a67790887106160b33ef743f136")
     version("2.9.0", sha256="18c1626e9fc5a2e192311e36b3010bfc698078f692888940f1fa150547abb0c1")
     version("2.8.0", sha256="a0a60a79fe6f6d54e7d411facbfcc867a6e198608f2cd992490e46f04b1bcecc")
     version("2.7.0", sha256="4bb121e297293c0fd55f08f83afab6d35d48f0af4ecc07523ad8ec99aa2b12a1")