diff --git a/build_patch/starship/0001-Switch-sys-info-to-iOS-compatible-fork.patch b/build_patch/starship/0001-Switch-sys-info-to-iOS-compatible-fork.patch deleted file mode 100644 index 041b39ae2a..0000000000 --- a/build_patch/starship/0001-Switch-sys-info-to-iOS-compatible-fork.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 559eb2437a0119bce242d9946b1d3226196c42e5 Mon Sep 17 00:00:00 2001 -From: aspen -Date: Mon, 10 May 2021 11:30:27 -0400 -Subject: [PATCH] Switch sys-info to iOS-compatible fork - ---- - Cargo.lock | 3 +-- - Cargo.toml | 2 +- - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index ec86491..f42cdc5 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1723,8 +1723,7 @@ dependencies = [ - [[package]] - name = "sys-info" - version = "0.9.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "33fcecee49339531cf6bd84ecf3ed94f9c8ef4a7e700f2a1cac9cc1ca485383a" -+source = "git+https://github.com/aspenluxxxy/sys-info-rs?rev=70a7aed786347bb2e5f7c6eb26efc52ff3328437#70a7aed786347bb2e5f7c6eb26efc52ff3328437" - dependencies = [ - "cc", - "libc", -diff --git a/Cargo.toml b/Cargo.toml -index 6b977cc..37f4a31 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -47,7 +47,7 @@ unicode-segmentation = "1.7.1" - gethostname = "0.2.1" - once_cell = "1.7.2" - chrono = "0.4.19" --sys-info = "0.9.0" -+sys-info = { git = "https://github.com/aspenluxxxy/sys-info-rs", rev = "70a7aed786347bb2e5f7c6eb26efc52ff3328437" } - byte-unit = "4.0.11" - starship_module_config_derive = { version = "0.2.1", path = "starship_module_config_derive" } - yaml-rust = "0.4.5" --- -2.31.1 - diff --git a/makefiles/starship.mk b/makefiles/starship.mk index 4979812105..9a6cb37a0d 100644 --- a/makefiles/starship.mk +++ b/makefiles/starship.mk @@ -3,15 +3,12 @@ $(error Use the main Makefile) endif SUBPROJECTS += starship -STARSHIP_VERSION := 0.53.0 +STARSHIP_VERSION := 1.7.1 DEB_STARSHIP_V ?= $(STARSHIP_VERSION) starship-setup: setup $(call GITHUB_ARCHIVE,starship,starship,$(STARSHIP_VERSION),v$(STARSHIP_VERSION)) $(call EXTRACT_TAR,starship-$(STARSHIP_VERSION).tar.gz,starship-$(STARSHIP_VERSION),starship) - # remove this when the following upstream PRs are merged: - # https://github.com/FillZpp/sys-info-rs/pull/88 - $(call DO_PATCH,starship,starship,-p1) ifneq ($(wildcard $(BUILD_WORK)/starship/.build_complete),) starship: