summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO19
-rw-r--r--PKGBUILD49
-rw-r--r--list-proxy-names.rs5
3 files changed, 50 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c59820c86e33..a720a11a72e6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
pkgbase = rustup-git
pkgdesc = The Rust toolchain installer
- pkgver = 1.19.0.r70.gfbcc6720
+ pkgver = 1.27.0.r15.g6e8769c7
pkgrel = 1
- url = https://github.com/rust-lang/rustup.rs
+ url = https://github.com/rust-lang/rustup
install = post.install
arch = x86_64
license = MIT
- license = Apache
+ license = Apache-2.0
makedepends = git
makedepends = cargo
+ depends = curl
optdepends = lldb: rust-lldb script
optdepends = gdb: rust-gdb script
provides = rust
@@ -16,15 +17,23 @@ pkgbase = rustup-git
provides = rust-nightly
provides = cargo-nightly
provides = rustfmt
+ provides = rust-src
+ provides = lib32-rust-libs
+ provides = rust-musl
+ provides = rust-wasm
provides = rustup
+ provides = rust-analyzer
conflicts = rust
conflicts = cargo
conflicts = rustfmt
conflicts = rust-nightly
conflicts = rust-nightly-bin
conflicts = rustup
- source = rustup-git::git+https://github.com/rust-lang-nursery/rustup.rs.git
+ conflicts = rust-analyzer
+ options = !lto
+ source = rustup-git::git+https://github.com/rust-lang/rustup.git
+ source = list-proxy-names.rs
sha512sums = SKIP
+ sha512sums = fdc9750850e8265409f2fcacf3c7f59e82b619ed40cef0c82944e08c17266107327813fb283c909b3b0821501fac064d9e3618060d688aa7c76cf16a36244626
pkgname = rustup-git
-
diff --git a/PKGBUILD b/PKGBUILD
index cd3ffd80f3b7..5c5394a09bef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,63 @@
-# Maintainer: Jon Gjengset <jon@tsp.io>
+# Maintainer: Ilaï Deutel <PlMWPh1WSmypRv0JQljz> (echo ... | tr 'A-Za-z' 'l-za-kL-ZA-K' | base64 -d)
+# Contributor: Jon Gjengset <jon@tsp.io>
# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Jonathon Fernyhough <jonathon_at_manjaro_dot_org>
pkgname=rustup-git
-pkgver=1.19.0.r70.gfbcc6720
+pkgver=1.27.0.r15.g6e8769c7
pkgrel=1
pkgdesc="The Rust toolchain installer"
arch=('x86_64')
-url="https://github.com/rust-lang/rustup.rs"
-license=('MIT' 'Apache')
+url="https://github.com/rust-lang/rustup"
+license=('MIT' 'Apache-2.0')
+depends=('curl')
makedepends=('git' 'cargo')
optdepends=('lldb: rust-lldb script'
'gdb: rust-gdb script')
-provides=('rust' 'cargo' 'rust-nightly' 'cargo-nightly' 'rustfmt' 'rustup')
-conflicts=('rust' 'cargo' 'rustfmt' 'rust-nightly' 'rust-nightly-bin' 'rustup')
+provides=('rust' 'cargo' 'rust-nightly' 'cargo-nightly' 'rustfmt' 'rust-src'
+ 'lib32-rust-libs' 'rust-musl' 'rust-wasm' 'rustup' 'rust-analyzer')
+conflicts=('rust' 'cargo' 'rustfmt' 'rust-nightly' 'rust-nightly-bin' 'rustup' 'rust-analyzer')
install='post.install'
-source=("${pkgname}::git+https://github.com/rust-lang-nursery/rustup.rs.git")
-sha512sums=('SKIP')
-_binlinks=('cargo' 'rustc' 'rustdoc' 'rust-gdb' 'rust-lldb' 'rls' 'rustfmt' 'cargo-fmt' 'cargo-clippy' 'clippy-driver')
+source=("${pkgname}::git+https://github.com/rust-lang/rustup.git" "list-proxy-names.rs")
+sha512sums=('SKIP'
+ 'fdc9750850e8265409f2fcacf3c7f59e82b619ed40cef0c82944e08c17266107327813fb283c909b3b0821501fac064d9e3618060d688aa7c76cf16a36244626')
+options=(!lto)
pkgver() {
cd "$srcdir/${pkgname}"
git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
+prepare() {
+ cd "$srcdir/$pkgname"
+ cp ../list-proxy-names.rs src/bin
+ export RUSTUP_TOOLCHAIN=stable
+ cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
+}
+
build() {
cd "$srcdir/$pkgname"
- cargo build --release --features no-self-update --bin rustup-init
+ export RUSTUP_TOOLCHAIN=stable
+ export CARGO_TARGET_DIR=target
+ cargo build --frozen --release --features no-self-update --bin rustup-init --bin list-proxy-names
}
package() {
cd "$srcdir/$pkgname"
install -Dm755 "target/release/rustup-init" "${pkgdir}/usr/bin/rustup"
- for link in "${_binlinks[@]}"; do
- ln -s /usr/bin/rustup "${pkgdir}/usr/bin/${link}"
+ for proxy in $(target/release/list-proxy-names); do
+ ln -s /usr/bin/rustup "${pkgdir}/usr/bin/${proxy}"
done
# Generate completion files.
mkdir -p "$pkgdir/usr/share/bash-completion/completions"
- $pkgdir/usr/bin/rustup completions bash > "$pkgdir/usr/share/bash-completion/completions/rustup"
- mkdir -p "$pkgdir/usr/share/fish/completions"
- $pkgdir/usr/bin/rustup completions fish > "$pkgdir/usr/share/fish/completions/rustup.fish"
+ "$pkgdir"/usr/bin/rustup completions bash > "$pkgdir/usr/share/bash-completion/completions/rustup"
+ "$pkgdir"/usr/bin/rustup completions bash cargo > "$pkgdir/usr/share/bash-completion/completions/cargo"
+ mkdir -p "$pkgdir/usr/share/fish/vendor_completions.d"
+ "$pkgdir"/usr/bin/rustup completions fish > "$pkgdir/usr/share/fish/vendor_completions.d/rustup.fish"
mkdir -p "$pkgdir/usr/share/zsh/site-functions"
- $pkgdir/usr/bin/rustup completions zsh > "$pkgdir/usr/share/zsh/site-functions/_rustup"
+ "$pkgdir"/usr/bin/rustup completions zsh > "$pkgdir/usr/share/zsh/site-functions/_rustup"
+ "$pkgdir"/usr/bin/rustup completions zsh cargo > "$pkgdir/usr/share/zsh/site-functions/_cargo"
install -Dm644 LICENSE-MIT "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE-MIT
- install -Dm644 LICENSE-APACHE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE-APACHE
}
-# vim:filetype=sh:
diff --git a/list-proxy-names.rs b/list-proxy-names.rs
new file mode 100644
index 000000000000..3d5ea7ae52e8
--- /dev/null
+++ b/list-proxy-names.rs
@@ -0,0 +1,5 @@
+use rustup::{TOOLS, DUP_TOOLS};
+
+fn main() {
+ TOOLS.iter().chain(DUP_TOOLS).for_each(|s|print!("{s} "));
+}