summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Gjengset2016-06-14 21:12:56 -0400
committerJon Gjengset2016-06-14 21:13:24 -0400
commitea727bd54f27db30408110d0283f3075906f4a92 (patch)
tree39c1d402242139f0efc6f0c83a99b67fc7c92ff9
parent8515a009276f6d6ac16f6187a0c1862347f0723c (diff)
downloadaur-ea727bd54f27db30408110d0283f3075906f4a92.tar.gz
Build with stable
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD17
2 files changed, 13 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f88cf9bd966..54ec1add375 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue May 31 20:05:39 UTC 2016
+# Wed Jun 15 01:13:05 UTC 2016
pkgbase = rustup-git
pkgdesc = The Rust toolchain installer
pkgver = 0.1.11.r35.gba855de
@@ -25,10 +25,10 @@ pkgbase = rustup-git
replaces = multirust
replaces = multirust-git
source = rustup-git::git+https://github.com/rust-lang-nursery/rustup.rs.git
- source = rust-nightly--unknown-linux-gnu-2016-05-10.tar.gz::https://static.rust-lang.org/dist/2016-05-10/rust-nightly--unknown-linux-gnu.tar.gz
- source = rust-nightly--unknown-linux-gnu-2016-05-10.tar.gz.asc::https://static.rust-lang.org/dist/2016-05-10/rust-nightly--unknown-linux-gnu.tar.gz.asc
+ source = rust-1.9.0--unknown-linux-gnu.tar.gz::https://static.rust-lang.org/dist/rust-1.9.0--unknown-linux-gnu.tar.gz
+ source = rust-1.9.0--unknown-linux-gnu.tar.gz.asc::https://static.rust-lang.org/dist/rust-1.9.0--unknown-linux-gnu.tar.gz.asc
md5sums = SKIP
- md5sums = 009ccdef55366033a1db0f74762a7fa3
+ md5sums = dc994c38b56c97081a5006c7553a55e1
md5sums = SKIP
pkgname = rustup-git
diff --git a/PKGBUILD b/PKGBUILD
index 15a476eba6c..2321f640e43 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,14 @@ pkgname=rustup-git
pkgver=0.1.11.r35.gba855de
pkgrel=1
-# we (currently) need to build using nightly
-# this can hopefully go away eventually
-# also doesn't build with current nightly:
-# https://github.com/rust-lang-nursery/rustup.rs/commit/76849ce0b78a67ba157eb18fe55e6ff49a380942
-rustv="nightly-2016-05-10"
+rustv="1.9.0"
chn=$(echo "$rustv" | tr '-' ' ' | cut -d' ' -f1)
date=$(echo "$rustv" | tr '-' ' ' | cut -d' ' -f2- | tr ' ' '-')
+sep="/"
+if [ "$date" == "$rustv" ]; then
+ date=""
+ sep=""
+fi
if test -n "$date"; then
date="-$date"
fi
@@ -26,13 +27,13 @@ replaces=('multirust' 'multirust-git')
install='post.install'
source=(
"${pkgname}::git+https://github.com/rust-lang-nursery/rustup.rs.git"
- "$target$date.tar.gz::https://static.rust-lang.org/dist/${date#-}/${target}.tar.gz"
- "$target$date.tar.gz.asc::https://static.rust-lang.org/dist/${date#-}/${target}.tar.gz.asc"
+ "$target$date.tar.gz::https://static.rust-lang.org/dist/${date#-}${sep}${target}.tar.gz"
+ "$target$date.tar.gz.asc::https://static.rust-lang.org/dist/${date#-}${sep}${target}.tar.gz.asc"
)
# The Rust GPG Key: https://keybase.io/rust
validpgpkeys=("108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE")
md5sums=('SKIP'
- '009ccdef55366033a1db0f74762a7fa3'
+ 'dc994c38b56c97081a5006c7553a55e1'
'SKIP')
pkgver() {