Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] rustup: install completions for Cargo.
@ 2021-05-27 15:40 gbrlsnchs
  2021-05-27 15:43 ` [PR PATCH] [Updated] " gbrlsnchs
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: gbrlsnchs @ 2021-05-27 15:40 UTC (permalink / raw)
  To: ml

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

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

https://github.com/gbrlsnchs/void-packages rustup
https://github.com/void-linux/void-packages/pull/31150

rustup: install completions for Cargo.
<!-- 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/31150.patch is attached

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

From 58ab9c16d9621facb8a109c153061b5542ebfbdc Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Thu, 27 May 2021 11:35:07 -0300
Subject: [PATCH] rustup: install completions for Cargo.

---
 srcpkgs/rustup/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index e4f985f74ec4..870f3eccf241 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.23.1
-revision=3
+revision=4
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
@@ -24,6 +24,10 @@ post_build() {
 	vtargetrun ./rustup completions zsh >rustup.zsh
 	vtargetrun ./rustup completions bash >rustup.bash
 	vtargetrun ./rustup completions fish >rustup.fish
+
+	# add completion for Cargo (which isn't available for fish)
+	vtargetrun ./rustup completions zsh cargo >cargo.zsh
+	vtargetrun ./rustup completions bash cargo >cargo.bash
 }
 
 do_install() {
@@ -33,6 +37,9 @@ do_install() {
 	vcompletion rustup.fish fish
 	vcompletion rustup.zsh zsh
 
+	vcompletion cargo.bash bash cargo
+	vcompletion cargo.zsh zsh cargo
+
 	vdoc README.md
 	vlicense LICENSE-APACHE
 	vlicense LICENSE-MIT

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

* Re: [PR PATCH] [Updated] rustup: install completions for Cargo.
  2021-05-27 15:40 [PR PATCH] rustup: install completions for Cargo gbrlsnchs
@ 2021-05-27 15:43 ` gbrlsnchs
  2021-05-27 18:14 ` ericonr
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: gbrlsnchs @ 2021-05-27 15:43 UTC (permalink / raw)
  To: ml

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

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

https://github.com/gbrlsnchs/void-packages rustup
https://github.com/void-linux/void-packages/pull/31150

rustup: install completions for Cargo.
<!-- 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/31150.patch is attached

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

From 9892e1258b1f962916e613f376c27ba1a74275d8 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Thu, 27 May 2021 11:35:07 -0300
Subject: [PATCH] rustup: install completions for Cargo.

---
 srcpkgs/rustup/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index e4f985f74ec4..3096350e6eb8 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
 # Template file for 'rustup'
 pkgname=rustup
 version=1.23.1
-revision=3
+revision=4
 # rustup doesn't recognize this target
 archs="~armv*-musl"
 build_style=cargo
@@ -24,6 +24,10 @@ post_build() {
 	vtargetrun ./rustup completions zsh >rustup.zsh
 	vtargetrun ./rustup completions bash >rustup.bash
 	vtargetrun ./rustup completions fish >rustup.fish
+
+	# install completions for Cargo (which aren't available for fish)
+	vtargetrun ./rustup completions zsh cargo >cargo.zsh
+	vtargetrun ./rustup completions bash cargo >cargo.bash
 }
 
 do_install() {
@@ -33,6 +37,9 @@ do_install() {
 	vcompletion rustup.fish fish
 	vcompletion rustup.zsh zsh
 
+	vcompletion cargo.bash bash cargo
+	vcompletion cargo.zsh zsh cargo
+
 	vdoc README.md
 	vlicense LICENSE-APACHE
 	vlicense LICENSE-MIT

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

* Re: rustup: install completions for Cargo.
  2021-05-27 15:40 [PR PATCH] rustup: install completions for Cargo gbrlsnchs
  2021-05-27 15:43 ` [PR PATCH] [Updated] " gbrlsnchs
@ 2021-05-27 18:14 ` ericonr
  2021-05-27 18:18 ` gbrlsnchs
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-05-27 18:14 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31150#issuecomment-849839740

Comment:
This makes the `rustup` package conflict with `cargo`, which isn't ideal.

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

* Re: rustup: install completions for Cargo.
  2021-05-27 15:40 [PR PATCH] rustup: install completions for Cargo gbrlsnchs
  2021-05-27 15:43 ` [PR PATCH] [Updated] " gbrlsnchs
  2021-05-27 18:14 ` ericonr
@ 2021-05-27 18:18 ` gbrlsnchs
  2021-05-27 22:09 ` ericonr
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: gbrlsnchs @ 2021-05-27 18:18 UTC (permalink / raw)
  To: ml

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

New comment by gbrlsnchs on void-packages repository

https://github.com/void-linux/void-packages/pull/31150#issuecomment-849842045

Comment:
> This makes the `rustup` package conflict with `cargo`, which isn't ideal.

Is there a useful use case where one installs both `cargo` and `rustup`?

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

* Re: rustup: install completions for Cargo.
  2021-05-27 15:40 [PR PATCH] rustup: install completions for Cargo gbrlsnchs
                   ` (2 preceding siblings ...)
  2021-05-27 18:18 ` gbrlsnchs
@ 2021-05-27 22:09 ` ericonr
  2021-05-28 13:21 ` gbrlsnchs
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-05-27 22:09 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31150#issuecomment-849974101

Comment:
There can be, I don't think we should make it impossible to install them together...

To be fair, I don't feel this as much because fish has built in completions already, but still.

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

* Re: rustup: install completions for Cargo.
  2021-05-27 15:40 [PR PATCH] rustup: install completions for Cargo gbrlsnchs
                   ` (3 preceding siblings ...)
  2021-05-27 22:09 ` ericonr
@ 2021-05-28 13:21 ` gbrlsnchs
  2021-06-01  1:22 ` ericonr
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: gbrlsnchs @ 2021-05-28 13:21 UTC (permalink / raw)
  To: ml

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

New comment by gbrlsnchs on void-packages repository

https://github.com/void-linux/void-packages/pull/31150#issuecomment-850414909

Comment:
> There can be, I don't think we should make it impossible to install them together...
> 
> To be fair, I don't feel this as much because fish has built in completions already, but still.

I agree. The reason I opened this PR is because I switched from manually installed rustup to the one packaged by Void, and the first thing I noticed was my Cargo completion wasn't working anymore. What do you think is the best solution for this case? Should I keep my rustup template patched locally only? I wouldn't mind, really.

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

* Re: rustup: install completions for Cargo.
  2021-05-27 15:40 [PR PATCH] rustup: install completions for Cargo gbrlsnchs
                   ` (4 preceding siblings ...)
  2021-05-28 13:21 ` gbrlsnchs
@ 2021-06-01  1:22 ` ericonr
  2021-06-12  3:09 ` ericonr
  2021-06-12  3:09 ` [PR PATCH] [Closed]: " ericonr
  7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-06-01  1:22 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31150#issuecomment-851741530

Comment:
I'm really not sure... The final version of this PR, if merged, should also remove installation of these files from the `cargo` package, but I'm mostly against changing this. There isn't an ideal solution, I *think*.

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

* Re: rustup: install completions for Cargo.
  2021-05-27 15:40 [PR PATCH] rustup: install completions for Cargo gbrlsnchs
                   ` (5 preceding siblings ...)
  2021-06-01  1:22 ` ericonr
@ 2021-06-12  3:09 ` ericonr
  2021-06-12  3:09 ` [PR PATCH] [Closed]: " ericonr
  7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-06-12  3:09 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31150#issuecomment-859988857

Comment:
Ok, I'm closing this for now.

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

* Re: [PR PATCH] [Closed]: rustup: install completions for Cargo.
  2021-05-27 15:40 [PR PATCH] rustup: install completions for Cargo gbrlsnchs
                   ` (6 preceding siblings ...)
  2021-06-12  3:09 ` ericonr
@ 2021-06-12  3:09 ` ericonr
  7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-06-12  3:09 UTC (permalink / raw)
  To: ml

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

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

rustup: install completions for Cargo.
https://github.com/void-linux/void-packages/pull/31150

Description:
<!-- 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] 9+ messages in thread

end of thread, other threads:[~2021-06-12  3:09 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-27 15:40 [PR PATCH] rustup: install completions for Cargo gbrlsnchs
2021-05-27 15:43 ` [PR PATCH] [Updated] " gbrlsnchs
2021-05-27 18:14 ` ericonr
2021-05-27 18:18 ` gbrlsnchs
2021-05-27 22:09 ` ericonr
2021-05-28 13:21 ` gbrlsnchs
2021-06-01  1:22 ` ericonr
2021-06-12  3:09 ` ericonr
2021-06-12  3:09 ` [PR PATCH] [Closed]: " ericonr

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).