From bb727c3566cd119cb85b56c84a3c9d07bc1abaa6 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Sun, 2 Nov 2025 17:59:11 +0700 Subject: [PATCH 1/2] Remove cargo-config from cargo install --- native_bootstrap.sh | 1 - podman/rustinstall.sh | 1 - 2 files changed, 2 deletions(-) diff --git a/native_bootstrap.sh b/native_bootstrap.sh index 0b348ce90..a4dda84dd 100755 --- a/native_bootstrap.sh +++ b/native_bootstrap.sh @@ -1116,7 +1116,6 @@ else fi fi -cargoInstall cargo-config 0.1.1 cargoInstall just 1.42.4 cargoInstall cbindgen 0.29.0 diff --git a/podman/rustinstall.sh b/podman/rustinstall.sh index 3730d04db..d4ae427a9 100755 --- a/podman/rustinstall.sh +++ b/podman/rustinstall.sh @@ -9,4 +9,3 @@ curl -sSLf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/inst cargo +stable binstall --no-confirm --force --version 0.10.0 sccache cargo +stable binstall --no-confirm --force --version 1.42.4 just cargo +stable binstall --no-confirm --force --version 0.29.0 cbindgen -cargo +stable install --force --version 0.1.1 cargo-config # TODO: Remove From 4b6d5db26ef0f8f1ead9ccb0d619b7c96c90b847 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Sun, 2 Nov 2025 18:16:05 +0700 Subject: [PATCH 2/2] Release cargo-config requirement from depends.mk --- mk/depends.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/mk/depends.mk b/mk/depends.mk index 68ed63b30..2c9746284 100644 --- a/mk/depends.mk +++ b/mk/depends.mk @@ -24,11 +24,4 @@ ifeq ($(shell which just),) $(error 'just' not found, install from crates.io or from your package manager) endif -ifneq ($(NIX_SHELL_BUILD),1) -CARGO_CONFIG_VERSION=0.1.1 -ifeq ($(shell env -u RUSTUP_TOOLCHAIN cargo install --list | grep '^cargo-config v$(CARGO_CONFIG_VERSION):$$'),) -$(error cargo-config $(CARGO_CONFIG_VERSION) not found, run "cargo install --force --version $(CARGO_CONFIG_VERSION) cargo-config") -endif -endif - endif