* Re: [PR PATCH] [Updated] rust-analyzer: update to 2021.04.20.
2021-04-25 11:49 [PR PATCH] rust-analyzer: update to 2021.04.20 Logarithmus
@ 2021-04-25 11:59 ` Logarithmus
2021-04-25 12:23 ` [PR PATCH] [Updated] rust-analyzer: update to 2021.04.20, rust: update to 1.51, cargo: update to 0.51.0 Logarithmus
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Logarithmus @ 2021-04-25 11:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1591 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages rust-analyzer
https://github.com/void-linux/void-packages/pull/30488
rust-analyzer: update to 2021.04.20.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/30488.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rust-analyzer-30488.patch --]
[-- Type: text/x-diff, Size: 3828 bytes --]
From 0c88a8443c305454305e1469ad99338a1089e787 Mon Sep 17 00:00:00 2001
From: Artur Sinila <freesoftware@logarithmus.dev>
Date: Sun, 25 Apr 2021 14:48:42 +0300
Subject: [PATCH 1/3] rust-analyzer: update to 2021.04.20.
---
srcpkgs/rust-analyzer/template | 4 ++--
srcpkgs/rust-analyzer/update | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/rust-analyzer/update
diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index e1c24bfe6959..cf046024be84 100644
--- a/srcpkgs/rust-analyzer/template
+++ b/srcpkgs/rust-analyzer/template
@@ -1,6 +1,6 @@
# Template file for 'rust-analyzer'
pkgname=rust-analyzer
-version=2021.03.08
+version=2021.04.20
revision=1
_ver=${version//./-}
wrksrc="${pkgname}-${_ver}"
@@ -11,7 +11,7 @@ maintainer="Gabriel Sanches <gabriel@gsr.dev>"
license="Apache-2.0, MIT"
homepage="https://rust-analyzer.github.io/"
distfiles="https://github.com/${pkgname}/${pkgname}/archive/${_ver}.tar.gz"
-checksum=75d810a4b3fd08d8d0948186f077b754ab9a2a02af3d3c6947e0baa58576e43d
+checksum=f22fdc42fd72ab67cb32a4ed2d01e8d5e68fe30b3ed04f2c4029c5a7cbe99739
export RUST_ANALYZER_REV=${_ver}
diff --git a/srcpkgs/rust-analyzer/update b/srcpkgs/rust-analyzer/update
new file mode 100644
index 000000000000..436bd841050e
--- /dev/null
+++ b/srcpkgs/rust-analyzer/update
@@ -0,0 +1,3 @@
+site=https://github.com/rust-analyzer/rust-analyzer/tags
+version=${version//./-}
+pattern="/archive/refs/tags/\K[\d\-]+(?=\.tar\.gz)"
From 814d4a92878f6126274f27e83b5faa621a1541b2 Mon Sep 17 00:00:00 2001
From: Artur Sinila <freesoftware@logarithmus.dev>
Date: Sun, 25 Apr 2021 14:59:17 +0300
Subject: [PATCH 2/3] cargo: update to 0.51.0.
---
srcpkgs/cargo/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9c9781d1fc47..4395835d509d 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
-version=0.49.0
-revision=2
+version=0.51.0
+revision=1
wrksrc="cargo-${version}"
build_helper=rust
hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"
@@ -21,14 +21,14 @@ desc_option_bindist="Generate a tarball for bootstrap"
# rust upstream no longer ships cargo-versioned tarballs
# need to use the corresponding rust version instead
_bootstrap_url="https://static.rust-lang.org/dist"
-_cargo_dist_version="1.48.0"
+_cargo_dist_version="1.51.0"
case "$XBPS_MACHINE" in
x86_64*|i686|ppc64le) ;;
ppc*)
# custom bootstrap tarballs still use cargo versioning, so override
_bootstrap_url="https://alpha.de.repo.voidlinux.org/distfiles"
- _cargo_dist_version="0.49.0"
+ _cargo_dist_version="0.51.0"
;;
esac
From deafe3f2f055ec56e6f9d5f51a3248d8ce50e291 Mon Sep 17 00:00:00 2001
From: Artur Sinila <freesoftware@logarithmus.dev>
Date: Sun, 25 Apr 2021 14:59:21 +0300
Subject: [PATCH 3/3] rust: update to 1.51.0.
---
srcpkgs/rust/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 6bb928e14783..3ab5e20cd630 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -8,9 +8,9 @@
# uploaded to https://alpha.de.repo.voidlinux.org/distfiles/
#
pkgname=rust
-version=1.48.0
+version=1.51.0
revision=1
-_rust_dist_version=1.48.0
+_rust_dist_version=1.51.0
wrksrc="rustc-${version}-src"
hostmakedepends="cmake curl pkg-config python3 tar"
makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm11"
@@ -38,7 +38,7 @@ case "$XBPS_MACHINE" in
ppc*)
# custom bootstrap tarballs still use cargo versioning, so override
_bootstrap_url="https://alpha.de.repo.voidlinux.org/distfiles"
- _cargo_dist_version="0.49.0"
+ _cargo_dist_version="0.51.0"
;;
esac
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PR PATCH] [Updated] rust-analyzer: update to 2021.04.20, rust: update to 1.51, cargo: update to 0.51.0
2021-04-25 11:49 [PR PATCH] rust-analyzer: update to 2021.04.20 Logarithmus
2021-04-25 11:59 ` [PR PATCH] [Updated] " Logarithmus
@ 2021-04-25 12:23 ` Logarithmus
2021-04-25 15:31 ` ericonr
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Logarithmus @ 2021-04-25 12:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2123 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages rust-analyzer
https://github.com/void-linux/void-packages/pull/30488
rust-analyzer: update to 2021.04.20, rust: update to 1.51, cargo: update to 0.51.0
It seems that Void uses outdated version of Rust without const generics, that's why new `rust-analyzer` fails to compile.
I suggest updating `rust`, `cargo` & `rust-analyzer`. Unfortunately, I can't do it since `rust`'s package `template` file instructs `xbps-src` to download bootstrap `rustc`, `rust-std` & `cargo` from https://alpha.de.repo.voidlinux.org/distfiles/, and this URL contains `rust-1.48` only. I guess only Void members can add `rust-1.51`
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/30488.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rust-analyzer-30488.patch --]
[-- Type: text/x-diff, Size: 5130 bytes --]
From 0c88a8443c305454305e1469ad99338a1089e787 Mon Sep 17 00:00:00 2001
From: Artur Sinila <freesoftware@logarithmus.dev>
Date: Sun, 25 Apr 2021 14:48:42 +0300
Subject: [PATCH 1/3] rust-analyzer: update to 2021.04.20.
---
srcpkgs/rust-analyzer/template | 4 ++--
srcpkgs/rust-analyzer/update | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/rust-analyzer/update
diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index e1c24bfe6959..cf046024be84 100644
--- a/srcpkgs/rust-analyzer/template
+++ b/srcpkgs/rust-analyzer/template
@@ -1,6 +1,6 @@
# Template file for 'rust-analyzer'
pkgname=rust-analyzer
-version=2021.03.08
+version=2021.04.20
revision=1
_ver=${version//./-}
wrksrc="${pkgname}-${_ver}"
@@ -11,7 +11,7 @@ maintainer="Gabriel Sanches <gabriel@gsr.dev>"
license="Apache-2.0, MIT"
homepage="https://rust-analyzer.github.io/"
distfiles="https://github.com/${pkgname}/${pkgname}/archive/${_ver}.tar.gz"
-checksum=75d810a4b3fd08d8d0948186f077b754ab9a2a02af3d3c6947e0baa58576e43d
+checksum=f22fdc42fd72ab67cb32a4ed2d01e8d5e68fe30b3ed04f2c4029c5a7cbe99739
export RUST_ANALYZER_REV=${_ver}
diff --git a/srcpkgs/rust-analyzer/update b/srcpkgs/rust-analyzer/update
new file mode 100644
index 000000000000..436bd841050e
--- /dev/null
+++ b/srcpkgs/rust-analyzer/update
@@ -0,0 +1,3 @@
+site=https://github.com/rust-analyzer/rust-analyzer/tags
+version=${version//./-}
+pattern="/archive/refs/tags/\K[\d\-]+(?=\.tar\.gz)"
From 814d4a92878f6126274f27e83b5faa621a1541b2 Mon Sep 17 00:00:00 2001
From: Artur Sinila <freesoftware@logarithmus.dev>
Date: Sun, 25 Apr 2021 14:59:17 +0300
Subject: [PATCH 2/3] cargo: update to 0.51.0.
---
srcpkgs/cargo/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9c9781d1fc47..4395835d509d 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
-version=0.49.0
-revision=2
+version=0.51.0
+revision=1
wrksrc="cargo-${version}"
build_helper=rust
hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"
@@ -21,14 +21,14 @@ desc_option_bindist="Generate a tarball for bootstrap"
# rust upstream no longer ships cargo-versioned tarballs
# need to use the corresponding rust version instead
_bootstrap_url="https://static.rust-lang.org/dist"
-_cargo_dist_version="1.48.0"
+_cargo_dist_version="1.51.0"
case "$XBPS_MACHINE" in
x86_64*|i686|ppc64le) ;;
ppc*)
# custom bootstrap tarballs still use cargo versioning, so override
_bootstrap_url="https://alpha.de.repo.voidlinux.org/distfiles"
- _cargo_dist_version="0.49.0"
+ _cargo_dist_version="0.51.0"
;;
esac
From adcd71644275063773ca2ba560a0bbd79479cf44 Mon Sep 17 00:00:00 2001
From: Artur Sinila <freesoftware@logarithmus.dev>
Date: Sun, 25 Apr 2021 14:59:21 +0300
Subject: [PATCH 3/3] rust: update to 1.51.0.
---
srcpkgs/rust/template | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 6bb928e14783..8ff29034b4e8 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -8,9 +8,9 @@
# uploaded to https://alpha.de.repo.voidlinux.org/distfiles/
#
pkgname=rust
-version=1.48.0
+version=1.51.0
revision=1
-_rust_dist_version=1.48.0
+_rust_dist_version=1.51.0
wrksrc="rustc-${version}-src"
hostmakedepends="cmake curl pkg-config python3 tar"
makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm11"
@@ -20,7 +20,10 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT, Apache-2.0"
homepage="https://www.rust-lang.org/"
distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"
-checksum="0e763e6db47d5d6f91583284d2f989eacc49b84794d1443355b85c58d67ae43b"
+checksum="7a6b9bafc8b3d81bbc566e7c0d1f17c9f499fd22b95142f7ea3a8e4d1f9eb847
+
+
+ "
lib32disabled=yes
patch_args="-Np1"
@@ -38,7 +41,7 @@ case "$XBPS_MACHINE" in
ppc*)
# custom bootstrap tarballs still use cargo versioning, so override
_bootstrap_url="https://alpha.de.repo.voidlinux.org/distfiles"
- _cargo_dist_version="0.49.0"
+ _cargo_dist_version="0.51.0"
;;
esac
@@ -49,11 +52,11 @@ distfiles+=" ${_bootstrap_url}/cargo-${_cargo_dist_version}-${RUST_BUILD}.tar.xz
case "$XBPS_MACHINE" in
i686)
checksum+="
- 1eab76df91e87198632605752d0dd66f3d84b502cbd1f982f6db3d0d8d943cdb"
+ 706417391b73a2f8fd90fe664d2dc4003cd623eabcd7805eebcefe56011965a7"
;;
x86_64)
checksum+="
- b11d595581e2580c069b5039214e1031a0e4f87ff6490ac39f92f77857e37055"
+ 2c557e448c145ed773baae0d6533449947bb130f8f8a2a0876d08f55b74a313f"
;;
x86_64-musl)
checksum+="
@@ -109,8 +112,8 @@ else
;;
x86_64)
checksum+="
- fc4d292a52cbb6b84fb9f065d0d7596064a9b957381d639d5a750d6e2bf02483
- 1c00a6a0dabbf6290728b09f9307d9fa6cc985487f727075c68acd4a600ef3f8"
+ feef13f6cd5072f30e2c121b7775d7ac5316998fcf03b68b2537684f3a7fe24a
+ 1199ba8351bb88166050c0fb15a55a23b20b6ead098d7637aaca53b91c5e68ca"
;;
x86_64-musl)
checksum+="
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: rust-analyzer: update to 2021.04.20, rust: update to 1.51, cargo: update to 0.51.0
2021-04-25 11:49 [PR PATCH] rust-analyzer: update to 2021.04.20 Logarithmus
2021-04-25 11:59 ` [PR PATCH] [Updated] " Logarithmus
2021-04-25 12:23 ` [PR PATCH] [Updated] rust-analyzer: update to 2021.04.20, rust: update to 1.51, cargo: update to 0.51.0 Logarithmus
@ 2021-04-25 15:31 ` ericonr
2021-04-27 2:26 ` ericonr
2021-04-27 2:26 ` [PR PATCH] [Closed]: " ericonr
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-04-25 15:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 208 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30488#issuecomment-826343132
Comment:
Duplicate of #30259, make this PR be a no merge with only analyzer.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: rust-analyzer: update to 2021.04.20, rust: update to 1.51, cargo: update to 0.51.0
2021-04-25 11:49 [PR PATCH] rust-analyzer: update to 2021.04.20 Logarithmus
` (2 preceding siblings ...)
2021-04-25 15:31 ` ericonr
@ 2021-04-27 2:26 ` ericonr
2021-04-27 2:26 ` [PR PATCH] [Closed]: " ericonr
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-04-27 2:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 261 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30488#issuecomment-827266943
Comment:
This PR hasn't actually received any testing, given that rust didn't build with our current patches. So closing for now.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PR PATCH] [Closed]: rust-analyzer: update to 2021.04.20, rust: update to 1.51, cargo: update to 0.51.0
2021-04-25 11:49 [PR PATCH] rust-analyzer: update to 2021.04.20 Logarithmus
` (3 preceding siblings ...)
2021-04-27 2:26 ` ericonr
@ 2021-04-27 2:26 ` ericonr
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-04-27 2:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1953 bytes --]
There's a closed pull request on the void-packages repository
rust-analyzer: update to 2021.04.20, rust: update to 1.51, cargo: update to 0.51.0
https://github.com/void-linux/void-packages/pull/30488
Description:
It seems that Void uses outdated version of Rust without const generics, that's why new `rust-analyzer` fails to compile.
I suggest updating `rust`, `cargo` & `rust-analyzer`. Unfortunately, I can't do it since `rust`'s package `template` file instructs `xbps-src` to download bootstrap `rustc`, `rust-std` & `cargo` from https://alpha.de.repo.voidlinux.org/distfiles/, and this URL contains `rust-1.48` only. I guess only Void members can add `rust-1.51`
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 6+ messages in thread