From 5d3eb08673c3ef26ad1e0344f0fe1dcdd31e7d34 Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Fri, 3 Feb 2023 20:12:53 +0530 Subject: [PATCH] some pkgs have rust/rustup as their dependency, so switch back to using rustup via pacman --- scripts/install-packages.sh | 2 +- scripts/pratham-setup.sh | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/scripts/install-packages.sh b/scripts/install-packages.sh index 5e14445..7a92766 100644 --- a/scripts/install-packages.sh +++ b/scripts/install-packages.sh @@ -41,7 +41,7 @@ PKGS_TO_INSTALL+=(hd-idle hdparm mlocate smartmontools usbutils wol) PKGS_TO_INSTALL+=(tar unrar unzip xz zip) # software devel -PKGS_TO_INSTALL+=(cargo-audit cargo-auditable cargo-bloat cargo-depgraph cargo-outdated cargo-spellcheck cargo-update cargo-watch) +PKGS_TO_INSTALL+=(cargo-audit cargo-auditable cargo-bloat cargo-depgraph cargo-outdated cargo-spellcheck cargo-update cargo-watch rustup) # cross compilation PKGS_TO_INSTALL+=(aarch64-linux-gnu-gcc riscv64-elf-gcc riscv64-linux-gnu-gcc) diff --git a/scripts/pratham-setup.sh b/scripts/pratham-setup.sh index 0d91d60..ecb7959 100755 --- a/scripts/pratham-setup.sh +++ b/scripts/pratham-setup.sh @@ -126,12 +126,6 @@ function git_repo_check() doas pacman --sync --refresh --refresh --sysupgrade # rust-lang -if ! command -v rustup > /dev/null; then - pushd /tmp - curl --proto '=https' --tlsv1.3 -sSf https://sh.rustup.rs -o rust.sh - bash rust.sh - popd -fi rustup default stable rustup update stable rustup component add rust-src rust-analyzer rust-analysis