diff --git a/anda/langs/rust/starship/0001-gix-0.61.1-0.61.0.patch b/anda/langs/rust/starship/0001-gix-0.61.1-0.61.0.patch
deleted file mode 100644
index 5d61cce573..0000000000
--- a/anda/langs/rust/starship/0001-gix-0.61.1-0.61.0.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b62e3879abe83e0b879421a023d8e944e31f00cb Mon Sep 17 00:00:00 2001
-From: madomado <madonuko@outlook.com>
-Date: Mon, 25 Mar 2024 18:33:25 +0800
-Subject: [PATCH] gix 0.61.1 -> 0.61.0
-
----
- Cargo.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Cargo.toml b/Cargo.toml
-index d98ba90..c3059c9 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -82,7 +82,7 @@ version = "1.0.4"
- version = "0.4.3"
- 
- [dependencies.gix]
--version = "0.61.1"
-+version = "0.61.0"
- features = [
-     "max-performance-safe",
-     "revision",
--- 
-2.44.0
-
diff --git a/anda/langs/rust/starship/rust-starship.spec b/anda/langs/rust/starship/rust-starship.spec
index 47517be24f..476004b035 100644
--- a/anda/langs/rust/starship/rust-starship.spec
+++ b/anda/langs/rust/starship/rust-starship.spec
@@ -20,6 +20,12 @@ BuildRequires:  cmake
 BuildRequires:  mold
 BuildRequires:  git-core
 
+# Old devel packages
+Obsoletes:      %{name}+gix-faster-devel < 1.23.0
+Obsoletes:      %{name}+gix-features-devel < 1.23.0
+Obsoletes:      %{name}+gix-max-perf-devel < 1.23.0
+Obsoletes:      %{name}+libz-ng-sys-devel < 1.23.0
+
 %global _description %{expand:
 The minimal, blazing-fast, and infinitely customizable prompt for any
 shell! ☄🌌️.}
@@ -88,54 +94,6 @@ use the "config-schema" feature of the "%{crate}" crate.
 %files       -n %{name}+config-schema-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+gix-faster-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+gix-faster-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "gix-faster" feature of the "%{crate}" crate.
-
-%files       -n %{name}+gix-faster-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+gix-features-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+gix-features-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "gix-features" feature of the "%{crate}" crate.
-
-%files       -n %{name}+gix-features-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+gix-max-perf-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+gix-max-perf-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "gix-max-perf" feature of the "%{crate}" crate.
-
-%files       -n %{name}+gix-max-perf-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+libz-ng-sys-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+libz-ng-sys-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "libz-ng-sys" feature of the "%{crate}" crate.
-
-%files       -n %{name}+libz-ng-sys-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %package     -n %{name}+notify-devel
 Summary:        %{summary}
 BuildArch:      noarch
diff --git a/anda/langs/rust/starship/starship-fix-metadata-auto.diff b/anda/langs/rust/starship/starship-fix-metadata-auto.diff
index 18e975f69b..ce9f689d72 100644
--- a/anda/langs/rust/starship/starship-fix-metadata-auto.diff
+++ b/anda/langs/rust/starship/starship-fix-metadata-auto.diff
@@ -1,6 +1,6 @@
---- starship-1.22.1/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ starship-1.22.1/Cargo.toml	2025-01-12T14:01:45.200436+00:00
-@@ -273,18 +273,3 @@
+--- a/Cargo.toml	2025-04-27 10:52:14.000000000 -0500
++++ b/Cargo.toml	2025-04-27 12:39:59.385400385 -0500
+@@ -265,22 +265,6 @@
  ]
  default-features = false
  
@@ -8,7 +8,7 @@
 -version = "0.2.0"
 -
 -[target."cfg(windows)".dependencies.windows]
--version = "0.59.0"
+-version = "0.61.0"
 -features = [
 -    "Win32_Foundation",
 -    "Win32_UI_Shell",
@@ -19,3 +19,11 @@
 -
 -[target."cfg(windows)".build-dependencies.winres]
 -version = "0.1.12"
+-
+ [profile.bench]
+ lto = "thin"
+ codegen-units = 16
+ [dev-dependencies]
+ mockall = "0.13.1"
+ tempfile = "3.19.1"
+