Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] rust-analyzer: update to 2022.06.06
@ 2022-06-06 15:37 jawadcode
  2022-06-06 15:42 ` [PR REVIEW] " classabbyamp
                   ` (16 more replies)
  0 siblings, 17 replies; 18+ messages in thread
From: jawadcode @ 2022-06-06 15:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]

There is a new pull request by jawadcode against master on the void-packages repository

https://github.com/jawadcode/void-packages master
https://github.com/void-linux/void-packages/pull/37423

rust-analyzer: update to 2022.06.06
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
YES

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/37423.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37423.patch --]
[-- Type: text/x-diff, Size: 1086 bytes --]

From 97708f12311f5d62aa6506d461a0c49fd1c51d26 Mon Sep 17 00:00:00 2001
From: Jawad Ahmed <jawad.w.ahmed@gmail.com>
Date: Mon, 6 Jun 2022 16:32:01 +0100
Subject: [PATCH] Updated rust-analyzer to 2022.06.06

---
 srcpkgs/rust-analyzer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index b41a84aab5ea..c1788601606e 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.08.30
+version=2022.06.06
 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=a5c791cd660b46e8fc20c1b268cb25c33658fcd593d81b278c34c97efccddbde
+checksum=0757e82175133223fa1cb71837ef7f9ce5f7f47cd5dec219ea2b41a42bead8cd
 # tests require Rust source code
 make_check=no
 

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR REVIEW] rust-analyzer: update to 2022.06.06
  2022-06-06 15:37 [PR PATCH] rust-analyzer: update to 2022.06.06 jawadcode
@ 2022-06-06 15:42 ` classabbyamp
  2022-06-06 15:45 ` classabbyamp
                   ` (15 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: classabbyamp @ 2022-06-06 15:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 288 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/37423#discussion_r890283732

Comment:
```suggestion
distfiles="https://github.com/rust-lang/rust-analyzer/archive/${_ver}.tar.gz"
```
r-a is part of the rust namespace now

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: rust-analyzer: update to 2022.06.06
  2022-06-06 15:37 [PR PATCH] rust-analyzer: update to 2022.06.06 jawadcode
  2022-06-06 15:42 ` [PR REVIEW] " classabbyamp
@ 2022-06-06 15:45 ` classabbyamp
  2022-06-06 15:45 ` classabbyamp
                   ` (14 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: classabbyamp @ 2022-06-06 15:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 371 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/37423#issuecomment-1147597763

Comment:
> error: package `xshell-macros v0.2.1` cannot be built because it requires rustc 1.59 or newer, while the currently active rustc version is 1.57.0

did you actually test this? it will fail to build until #37232 is merged.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: rust-analyzer: update to 2022.06.06
  2022-06-06 15:37 [PR PATCH] rust-analyzer: update to 2022.06.06 jawadcode
  2022-06-06 15:42 ` [PR REVIEW] " classabbyamp
  2022-06-06 15:45 ` classabbyamp
@ 2022-06-06 15:45 ` classabbyamp
  2022-06-06 16:50 ` jawadcode
                   ` (13 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: classabbyamp @ 2022-06-06 15:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 429 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/37423#issuecomment-1147597763

Comment:
> I tested the changes in this PR: YES|briefly|NO
YES

> error: package `xshell-macros v0.2.1` cannot be built because it requires rustc 1.59 or newer, while the currently active rustc version is 1.57.0

did you actually test this? it will fail to build until #37232 is merged.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: rust-analyzer: update to 2022.06.06
  2022-06-06 15:37 [PR PATCH] rust-analyzer: update to 2022.06.06 jawadcode
                   ` (2 preceding siblings ...)
  2022-06-06 15:45 ` classabbyamp
@ 2022-06-06 16:50 ` jawadcode
  2022-06-06 18:55 ` classabbyamp
                   ` (12 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: jawadcode @ 2022-06-06 16:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 611 bytes --]

New comment by jawadcode on void-packages repository

https://github.com/void-linux/void-packages/pull/37423#issuecomment-1147662089

Comment:
> > I tested the changes in this PR: YES|briefly|NO
> YES
> 
> > error: package `xshell-macros v0.2.1` cannot be built because it requires rustc 1.59 or newer, while the currently active rustc version is 1.57.0
> 
> did you actually test this? it will fail to build until #37232 is merged.

Apologies, I misunderstood the question and tested by compiling that version of rust-analyzer from source manually instead of using the xbps tools.

Sorry for wasting your time

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: rust-analyzer: update to 2022.06.06
  2022-06-06 15:37 [PR PATCH] rust-analyzer: update to 2022.06.06 jawadcode
                   ` (3 preceding siblings ...)
  2022-06-06 16:50 ` jawadcode
@ 2022-06-06 18:55 ` classabbyamp
  2022-06-06 19:23 ` jawadcode
                   ` (11 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: classabbyamp @ 2022-06-06 18:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 225 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/37423#issuecomment-1147781116

Comment:
it's fine, it can still get merged but it will have to wait on the rust update

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: rust-analyzer: update to 2022.06.06
  2022-06-06 15:37 [PR PATCH] rust-analyzer: update to 2022.06.06 jawadcode
                   ` (4 preceding siblings ...)
  2022-06-06 18:55 ` classabbyamp
@ 2022-06-06 19:23 ` jawadcode
  2022-06-07 17:01 ` [PR PATCH] [Updated] " jawadcode
                   ` (10 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: jawadcode @ 2022-06-06 19:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 272 bytes --]

New comment by jawadcode on void-packages repository

https://github.com/void-linux/void-packages/pull/37423#issuecomment-1147815453

Comment:
> it's fine, it can still get merged but it will have to wait on the rust update

Yeah I'll just leave it open in the meanwhile 

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] rust-analyzer: update to 2022.06.06
  2022-06-06 15:37 [PR PATCH] rust-analyzer: update to 2022.06.06 jawadcode
                   ` (5 preceding siblings ...)
  2022-06-06 19:23 ` jawadcode
@ 2022-06-07 17:01 ` jawadcode
  2022-06-07 18:21 ` tranzystorek-io
                   ` (9 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: jawadcode @ 2022-06-07 17:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1267 bytes --]

There is an updated pull request by jawadcode against master on the void-packages repository

https://github.com/jawadcode/void-packages master
https://github.com/void-linux/void-packages/pull/37423

rust-analyzer: update to 2022.06.06
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
YES

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/37423.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37423.patch --]
[-- Type: text/x-diff, Size: 1086 bytes --]

From 97708f12311f5d62aa6506d461a0c49fd1c51d26 Mon Sep 17 00:00:00 2001
From: Jawad Ahmed <jawad.w.ahmed@gmail.com>
Date: Mon, 6 Jun 2022 16:32:01 +0100
Subject: [PATCH] Updated rust-analyzer to 2022.06.06

---
 srcpkgs/rust-analyzer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index b41a84aab5ea..c1788601606e 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.08.30
+version=2022.06.06
 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=a5c791cd660b46e8fc20c1b268cb25c33658fcd593d81b278c34c97efccddbde
+checksum=0757e82175133223fa1cb71837ef7f9ce5f7f47cd5dec219ea2b41a42bead8cd
 # tests require Rust source code
 make_check=no
 

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: rust-analyzer: update to 2022.06.06
  2022-06-06 15:37 [PR PATCH] rust-analyzer: update to 2022.06.06 jawadcode
                   ` (6 preceding siblings ...)
  2022-06-07 17:01 ` [PR PATCH] [Updated] " jawadcode
@ 2022-06-07 18:21 ` tranzystorek-io
  2022-06-08 23:31 ` jawadcode
                   ` (8 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: tranzystorek-io @ 2022-06-07 18:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 206 bytes --]

New comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/37423#issuecomment-1149017333

Comment:
Rust 1.61 is there, I think this PR is good to go ☺️

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: rust-analyzer: update to 2022.06.06
  2022-06-06 15:37 [PR PATCH] rust-analyzer: update to 2022.06.06 jawadcode
                   ` (7 preceding siblings ...)
  2022-06-07 18:21 ` tranzystorek-io
@ 2022-06-08 23:31 ` jawadcode
  2022-06-09  0:11 ` classabbyamp
                   ` (7 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: jawadcode @ 2022-06-08 23:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 313 bytes --]

New comment by jawadcode on void-packages repository

https://github.com/void-linux/void-packages/pull/37423#issuecomment-1150514266

Comment:
> it's fine, it can still get merged but it will have to wait on the rust update

@classabbyamp Would it be possible to merge this PR now since #37232 has been merged?

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: rust-analyzer: update to 2022.06.06
  2022-06-06 15:37 [PR PATCH] rust-analyzer: update to 2022.06.06 jawadcode
                   ` (8 preceding siblings ...)
  2022-06-08 23:31 ` jawadcode
@ 2022-06-09  0:11 ` classabbyamp
  2022-06-09  0:12 ` classabbyamp
                   ` (6 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: classabbyamp @ 2022-06-09  0:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 614 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/37423#issuecomment-1150534796

Comment:
it should build now, yes, but there's still some work to be done with this PR before it can be merged (and I can't merge it anyways, I'm not a maintainer). The things I can see are:

- the comment I made earlier about the distfiles url
- one commit per package (you can use `git squash` and `git push --force`) to fix this, (and in the future merge from master by using `git pull --rebase upstream master` to avoid the merge commit)
- testing what xbps-src builds

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: rust-analyzer: update to 2022.06.06
  2022-06-06 15:37 [PR PATCH] rust-analyzer: update to 2022.06.06 jawadcode
                   ` (9 preceding siblings ...)
  2022-06-09  0:11 ` classabbyamp
@ 2022-06-09  0:12 ` classabbyamp
  2022-06-09  0:40 ` [PR PATCH] [Updated] " jawadcode
                   ` (5 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: classabbyamp @ 2022-06-09  0:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 657 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/37423#issuecomment-1150534796

Comment:
it should build now, yes, but there's still some work to be done with this PR before it can be merged (and I can't merge it anyways, I'm not a maintainer). The things I can see are:

- the comment I made earlier about the distfiles url
- one commit per package (you can use `git squash` and `git push --force`) to fix this, (and in the future merge from master by using `git pull --rebase upstream master` to avoid the merge commit)
- testing what xbps-src builds (I can help with this, I use this package)

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] rust-analyzer: update to 2022.06.06
  2022-06-06 15:37 [PR PATCH] rust-analyzer: update to 2022.06.06 jawadcode
                   ` (10 preceding siblings ...)
  2022-06-09  0:12 ` classabbyamp
@ 2022-06-09  0:40 ` jawadcode
  2022-06-10 17:58 ` jawadcode
                   ` (4 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: jawadcode @ 2022-06-09  0:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1267 bytes --]

There is an updated pull request by jawadcode against master on the void-packages repository

https://github.com/jawadcode/void-packages master
https://github.com/void-linux/void-packages/pull/37423

rust-analyzer: update to 2022.06.06
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
YES

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/37423.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37423.patch --]
[-- Type: text/x-diff, Size: 2181 bytes --]

From 97708f12311f5d62aa6506d461a0c49fd1c51d26 Mon Sep 17 00:00:00 2001
From: Jawad Ahmed <jawad.w.ahmed@gmail.com>
Date: Mon, 6 Jun 2022 16:32:01 +0100
Subject: [PATCH 1/2] Updated rust-analyzer to 2022.06.06

---
 srcpkgs/rust-analyzer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index b41a84aab5ea..c1788601606e 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.08.30
+version=2022.06.06
 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=a5c791cd660b46e8fc20c1b268cb25c33658fcd593d81b278c34c97efccddbde
+checksum=0757e82175133223fa1cb71837ef7f9ce5f7f47cd5dec219ea2b41a42bead8cd
 # tests require Rust source code
 make_check=no
 

From 330fa3e24151297c6d37ac0a8b226ba3e0dfab60 Mon Sep 17 00:00:00 2001
From: jawadcode <Jawad.W.Ahmed@gmail.com>
Date: Thu, 9 Jun 2022 01:40:25 +0100
Subject: [PATCH 2/2] Update srcpkgs/rust-analyzer/template

rust-analyzer is part of the rust-lang organisation now

Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
 srcpkgs/rust-analyzer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index c1788601606e..861b2371181d 100644
--- a/srcpkgs/rust-analyzer/template
+++ b/srcpkgs/rust-analyzer/template
@@ -10,7 +10,7 @@ short_desc="Rust compiler front-end for IDEs"
 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"
+distfiles="https://github.com/rust-lang/rust-analyzer/archive/${_ver}.tar.gz"
 checksum=0757e82175133223fa1cb71837ef7f9ce5f7f47cd5dec219ea2b41a42bead8cd
 # tests require Rust source code
 make_check=no

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] rust-analyzer: update to 2022.06.06
  2022-06-06 15:37 [PR PATCH] rust-analyzer: update to 2022.06.06 jawadcode
                   ` (11 preceding siblings ...)
  2022-06-09  0:40 ` [PR PATCH] [Updated] " jawadcode
@ 2022-06-10 17:58 ` jawadcode
  2022-06-10 18:15 ` jawadcode
                   ` (3 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: jawadcode @ 2022-06-10 17:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1267 bytes --]

There is an updated pull request by jawadcode against master on the void-packages repository

https://github.com/jawadcode/void-packages master
https://github.com/void-linux/void-packages/pull/37423

rust-analyzer: update to 2022.06.06
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
YES

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/37423.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37423.patch --]
[-- Type: text/x-diff, Size: 3564 bytes --]

From 97708f12311f5d62aa6506d461a0c49fd1c51d26 Mon Sep 17 00:00:00 2001
From: Jawad Ahmed <jawad.w.ahmed@gmail.com>
Date: Mon, 6 Jun 2022 16:32:01 +0100
Subject: [PATCH 1/3] Updated rust-analyzer to 2022.06.06

---
 srcpkgs/rust-analyzer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index b41a84aab5ea..c1788601606e 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.08.30
+version=2022.06.06
 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=a5c791cd660b46e8fc20c1b268cb25c33658fcd593d81b278c34c97efccddbde
+checksum=0757e82175133223fa1cb71837ef7f9ce5f7f47cd5dec219ea2b41a42bead8cd
 # tests require Rust source code
 make_check=no
 

From 330fa3e24151297c6d37ac0a8b226ba3e0dfab60 Mon Sep 17 00:00:00 2001
From: jawadcode <Jawad.W.Ahmed@gmail.com>
Date: Thu, 9 Jun 2022 01:40:25 +0100
Subject: [PATCH 2/3] Update srcpkgs/rust-analyzer/template

rust-analyzer is part of the rust-lang organisation now

Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
 srcpkgs/rust-analyzer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index c1788601606e..861b2371181d 100644
--- a/srcpkgs/rust-analyzer/template
+++ b/srcpkgs/rust-analyzer/template
@@ -10,7 +10,7 @@ short_desc="Rust compiler front-end for IDEs"
 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"
+distfiles="https://github.com/rust-lang/rust-analyzer/archive/${_ver}.tar.gz"
 checksum=0757e82175133223fa1cb71837ef7f9ce5f7f47cd5dec219ea2b41a42bead8cd
 # tests require Rust source code
 make_check=no

From f26f39640fcc75516e4e37cb1f4d47f14f27d4e0 Mon Sep 17 00:00:00 2001
From: Jawad Ahmed <jawad.w.ahmed@gmail.com>
Date: Fri, 10 Jun 2022 18:57:50 +0100
Subject: [PATCH 3/3] Revert "Updated rust-analyzer to 2022.06.06"

This reverts commit 97708f12311f5d62aa6506d461a0c49fd1c51d26.
---
 srcpkgs/rust-analyzer/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index 861b2371181d..997b4eb81b15 100644
--- a/srcpkgs/rust-analyzer/template
+++ b/srcpkgs/rust-analyzer/template
@@ -1,6 +1,6 @@
 # Template file for 'rust-analyzer'
 pkgname=rust-analyzer
-version=2022.06.06
+version=2021.08.30
 revision=1
 _ver=${version//./-}
 wrksrc="${pkgname}-${_ver}"
@@ -10,8 +10,13 @@ short_desc="Rust compiler front-end for IDEs"
 maintainer="Gabriel Sanches <gabriel@gsr.dev>"
 license="Apache-2.0, MIT"
 homepage="https://rust-analyzer.github.io/"
+<<<<<<< HEAD
 distfiles="https://github.com/rust-lang/rust-analyzer/archive/${_ver}.tar.gz"
 checksum=0757e82175133223fa1cb71837ef7f9ce5f7f47cd5dec219ea2b41a42bead8cd
+=======
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/${_ver}.tar.gz"
+checksum=a5c791cd660b46e8fc20c1b268cb25c33658fcd593d81b278c34c97efccddbde
+>>>>>>> parent of 97708f1231 (Updated rust-analyzer to 2022.06.06)
 # tests require Rust source code
 make_check=no
 

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] rust-analyzer: update to 2022.06.06
  2022-06-06 15:37 [PR PATCH] rust-analyzer: update to 2022.06.06 jawadcode
                   ` (12 preceding siblings ...)
  2022-06-10 17:58 ` jawadcode
@ 2022-06-10 18:15 ` jawadcode
  2022-06-12  4:06 ` classabbyamp
                   ` (2 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: jawadcode @ 2022-06-10 18:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1267 bytes --]

There is an updated pull request by jawadcode against master on the void-packages repository

https://github.com/jawadcode/void-packages master
https://github.com/void-linux/void-packages/pull/37423

rust-analyzer: update to 2022.06.06
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
YES

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/37423.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37423.patch --]
[-- Type: text/x-diff, Size: 4650 bytes --]

From 97708f12311f5d62aa6506d461a0c49fd1c51d26 Mon Sep 17 00:00:00 2001
From: Jawad Ahmed <jawad.w.ahmed@gmail.com>
Date: Mon, 6 Jun 2022 16:32:01 +0100
Subject: [PATCH 1/4] Updated rust-analyzer to 2022.06.06

---
 srcpkgs/rust-analyzer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index b41a84aab5ea..c1788601606e 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.08.30
+version=2022.06.06
 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=a5c791cd660b46e8fc20c1b268cb25c33658fcd593d81b278c34c97efccddbde
+checksum=0757e82175133223fa1cb71837ef7f9ce5f7f47cd5dec219ea2b41a42bead8cd
 # tests require Rust source code
 make_check=no
 

From 330fa3e24151297c6d37ac0a8b226ba3e0dfab60 Mon Sep 17 00:00:00 2001
From: jawadcode <Jawad.W.Ahmed@gmail.com>
Date: Thu, 9 Jun 2022 01:40:25 +0100
Subject: [PATCH 2/4] Update srcpkgs/rust-analyzer/template

rust-analyzer is part of the rust-lang organisation now

Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
 srcpkgs/rust-analyzer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index c1788601606e..861b2371181d 100644
--- a/srcpkgs/rust-analyzer/template
+++ b/srcpkgs/rust-analyzer/template
@@ -10,7 +10,7 @@ short_desc="Rust compiler front-end for IDEs"
 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"
+distfiles="https://github.com/rust-lang/rust-analyzer/archive/${_ver}.tar.gz"
 checksum=0757e82175133223fa1cb71837ef7f9ce5f7f47cd5dec219ea2b41a42bead8cd
 # tests require Rust source code
 make_check=no

From f26f39640fcc75516e4e37cb1f4d47f14f27d4e0 Mon Sep 17 00:00:00 2001
From: Jawad Ahmed <jawad.w.ahmed@gmail.com>
Date: Fri, 10 Jun 2022 18:57:50 +0100
Subject: [PATCH 3/4] Revert "Updated rust-analyzer to 2022.06.06"

This reverts commit 97708f12311f5d62aa6506d461a0c49fd1c51d26.
---
 srcpkgs/rust-analyzer/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index 861b2371181d..997b4eb81b15 100644
--- a/srcpkgs/rust-analyzer/template
+++ b/srcpkgs/rust-analyzer/template
@@ -1,6 +1,6 @@
 # Template file for 'rust-analyzer'
 pkgname=rust-analyzer
-version=2022.06.06
+version=2021.08.30
 revision=1
 _ver=${version//./-}
 wrksrc="${pkgname}-${_ver}"
@@ -10,8 +10,13 @@ short_desc="Rust compiler front-end for IDEs"
 maintainer="Gabriel Sanches <gabriel@gsr.dev>"
 license="Apache-2.0, MIT"
 homepage="https://rust-analyzer.github.io/"
+<<<<<<< HEAD
 distfiles="https://github.com/rust-lang/rust-analyzer/archive/${_ver}.tar.gz"
 checksum=0757e82175133223fa1cb71837ef7f9ce5f7f47cd5dec219ea2b41a42bead8cd
+=======
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/${_ver}.tar.gz"
+checksum=a5c791cd660b46e8fc20c1b268cb25c33658fcd593d81b278c34c97efccddbde
+>>>>>>> parent of 97708f1231 (Updated rust-analyzer to 2022.06.06)
 # tests require Rust source code
 make_check=no
 

From 8056c19706352de821fdebe2a0864b0481250d29 Mon Sep 17 00:00:00 2001
From: Jawad Ahmed <jawad.w.ahmed@gmail.com>
Date: Fri, 10 Jun 2022 19:14:56 +0100
Subject: [PATCH 4/4] oopsie

---
 srcpkgs/rust-analyzer/template | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/srcpkgs/rust-analyzer/template b/srcpkgs/rust-analyzer/template
index 997b4eb81b15..571b279fe2ce 100644
--- a/srcpkgs/rust-analyzer/template
+++ b/srcpkgs/rust-analyzer/template
@@ -10,13 +10,8 @@ short_desc="Rust compiler front-end for IDEs"
 maintainer="Gabriel Sanches <gabriel@gsr.dev>"
 license="Apache-2.0, MIT"
 homepage="https://rust-analyzer.github.io/"
-<<<<<<< HEAD
 distfiles="https://github.com/rust-lang/rust-analyzer/archive/${_ver}.tar.gz"
-checksum=0757e82175133223fa1cb71837ef7f9ce5f7f47cd5dec219ea2b41a42bead8cd
-=======
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/${_ver}.tar.gz"
 checksum=a5c791cd660b46e8fc20c1b268cb25c33658fcd593d81b278c34c97efccddbde
->>>>>>> parent of 97708f1231 (Updated rust-analyzer to 2022.06.06)
 # tests require Rust source code
 make_check=no
 

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: rust-analyzer: update to 2022.06.06
  2022-06-06 15:37 [PR PATCH] rust-analyzer: update to 2022.06.06 jawadcode
                   ` (13 preceding siblings ...)
  2022-06-10 18:15 ` jawadcode
@ 2022-06-12  4:06 ` classabbyamp
  2022-06-15 21:18 ` [PR PATCH] [Closed]: " classabbyamp
  2022-06-15 21:18 ` classabbyamp
  16 siblings, 0 replies; 18+ messages in thread
From: classabbyamp @ 2022-06-12  4:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/37423#issuecomment-1153065252

Comment:
It seems that f26f39640fcc75516e4e37cb1f4d47f14f27d4e0 undid the version and checksum changes. Can you fix that and squash (as mentioned in my previous comment).

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: rust-analyzer: update to 2022.06.06
  2022-06-06 15:37 [PR PATCH] rust-analyzer: update to 2022.06.06 jawadcode
                   ` (15 preceding siblings ...)
  2022-06-15 21:18 ` [PR PATCH] [Closed]: " classabbyamp
@ 2022-06-15 21:18 ` classabbyamp
  16 siblings, 0 replies; 18+ messages in thread
From: classabbyamp @ 2022-06-15 21:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 168 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/37423#issuecomment-1156956212

Comment:
superceded by #37566 

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Closed]: rust-analyzer: update to 2022.06.06
  2022-06-06 15:37 [PR PATCH] rust-analyzer: update to 2022.06.06 jawadcode
                   ` (14 preceding siblings ...)
  2022-06-12  4:06 ` classabbyamp
@ 2022-06-15 21:18 ` classabbyamp
  2022-06-15 21:18 ` classabbyamp
  16 siblings, 0 replies; 18+ messages in thread
From: classabbyamp @ 2022-06-15 21:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1108 bytes --]

There's a closed pull request on the void-packages repository

rust-analyzer: update to 2022.06.06
https://github.com/void-linux/void-packages/pull/37423

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
YES

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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] 18+ messages in thread

end of thread, other threads:[~2022-06-15 21:18 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-06 15:37 [PR PATCH] rust-analyzer: update to 2022.06.06 jawadcode
2022-06-06 15:42 ` [PR REVIEW] " classabbyamp
2022-06-06 15:45 ` classabbyamp
2022-06-06 15:45 ` classabbyamp
2022-06-06 16:50 ` jawadcode
2022-06-06 18:55 ` classabbyamp
2022-06-06 19:23 ` jawadcode
2022-06-07 17:01 ` [PR PATCH] [Updated] " jawadcode
2022-06-07 18:21 ` tranzystorek-io
2022-06-08 23:31 ` jawadcode
2022-06-09  0:11 ` classabbyamp
2022-06-09  0:12 ` classabbyamp
2022-06-09  0:40 ` [PR PATCH] [Updated] " jawadcode
2022-06-10 17:58 ` jawadcode
2022-06-10 18:15 ` jawadcode
2022-06-12  4:06 ` classabbyamp
2022-06-15 21:18 ` [PR PATCH] [Closed]: " classabbyamp
2022-06-15 21:18 ` classabbyamp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).