Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] helix: remove conflict with hex
@ 2022-03-31 22:59 cinerea0
  2022-03-31 23:04 ` leahneukirchen
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: cinerea0 @ 2022-03-31 22:59 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages helix
https://github.com/void-linux/void-packages/pull/36442

helix: remove conflict with hex
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **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**
-->

<!-- 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
-->
This removes the conflict with `hex` by renaming the binary and wrapper script to the project's full name.

A patch file from https://github.com/void-linux/void-packages/pull/36442.patch is attached

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

From 5d619cd8f04db91b40b87302cc2167d2acf12616 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 31 Mar 2022 18:54:39 -0400
Subject: [PATCH] helix: remove conflict with hex

---
 srcpkgs/helix/files/helix | 2 ++
 srcpkgs/helix/files/hx    | 2 --
 srcpkgs/helix/template    | 7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/helix/files/helix
 delete mode 100644 srcpkgs/helix/files/hx

diff --git a/srcpkgs/helix/files/helix b/srcpkgs/helix/files/helix
new file mode 100644
index 000000000000..26605825df71
--- /dev/null
+++ b/srcpkgs/helix/files/helix
@@ -0,0 +1,2 @@
+#!/bin/sh
+HELIX_RUNTIME=/usr/lib/helix/runtime exec /usr/lib/helix/_helix "$@"
diff --git a/srcpkgs/helix/files/hx b/srcpkgs/helix/files/hx
deleted file mode 100644
index a43e49fadc5b..000000000000
--- a/srcpkgs/helix/files/hx
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-HELIX_RUNTIME=/usr/lib/helix/runtime exec /usr/lib/helix/hx "$@"
diff --git a/srcpkgs/helix/template b/srcpkgs/helix/template
index 961a894092b7..399f31d40e03 100644
--- a/srcpkgs/helix/template
+++ b/srcpkgs/helix/template
@@ -1,7 +1,7 @@
 # Template file for 'helix'
 pkgname=helix
 version=22.03
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path helix-term"
 hostmakedepends="git"
@@ -12,7 +12,6 @@ homepage="https://helix-editor.com/"
 changelog="https://github.com/helix-editor/helix/blob/master/CHANGELOG.md"
 distfiles="https://github.com/helix-editor/helix/archive/${version}.tar.gz"
 checksum=a21f4d7b6390930a89b59567909ad7c613a1eeeafc813167ff7bc3be603997f4
-conflicts="hex>=0"
 
 # skip problematic doctests on i686
 case "$XBPS_TARGET_MACHINE" in
@@ -26,7 +25,7 @@ post_install() {
 	rm -rf runtime/grammars/sources
 
 	vmkdir usr/lib/helix
-	mv ${DESTDIR}/usr/bin/hx ${DESTDIR}/usr/lib/helix/
+	mv ${DESTDIR}/usr/bin/hx ${DESTDIR}/usr/lib/helix/_helix
 	vcopy runtime usr/lib/helix
-	vbin ${FILESDIR}/hx
+	vbin ${FILESDIR}/helix
 }

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

* Re: helix: remove conflict with hex
  2022-03-31 22:59 [PR PATCH] helix: remove conflict with hex cinerea0
@ 2022-03-31 23:04 ` leahneukirchen
  2022-03-31 23:23 ` cinerea0
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: leahneukirchen @ 2022-03-31 23:04 UTC (permalink / raw)
  To: ml

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/36442#issuecomment-1085215268

Comment:
I don't think changing the upstream name will reduce confusion among users...

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

* Re: helix: remove conflict with hex
  2022-03-31 22:59 [PR PATCH] helix: remove conflict with hex cinerea0
  2022-03-31 23:04 ` leahneukirchen
@ 2022-03-31 23:23 ` cinerea0
  2022-04-01  0:37 ` [PR PATCH] [Updated] " cinerea0
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: cinerea0 @ 2022-03-31 23:23 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/36442#issuecomment-1085225465

Comment:
I think slight doc confusion is worth avoiding a collision between a hex viewer and a text editor.

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

* Re: [PR PATCH] [Updated] helix: remove conflict with hex
  2022-03-31 22:59 [PR PATCH] helix: remove conflict with hex cinerea0
  2022-03-31 23:04 ` leahneukirchen
  2022-03-31 23:23 ` cinerea0
@ 2022-04-01  0:37 ` cinerea0
  2022-04-01 14:06 ` hex: change binary name to avoid conflict with helix leahneukirchen
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: cinerea0 @ 2022-04-01  0:37 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages helix
https://github.com/void-linux/void-packages/pull/36442

helix: remove conflict with hex
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **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**
-->

<!-- 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
-->
This removes the conflict with `hex` by renaming the binary and wrapper script to the project's full name.

A patch file from https://github.com/void-linux/void-packages/pull/36442.patch is attached

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

From ab9c9e01f3cd485c142930d1cb9bdb08cf4a1234 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 31 Mar 2022 20:36:55 -0400
Subject: [PATCH] hex: change binary name to avoid conflict

---
 srcpkgs/helix/template | 3 +--
 srcpkgs/hex/template   | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/helix/template b/srcpkgs/helix/template
index 961a894092b7..6f9d581de694 100644
--- a/srcpkgs/helix/template
+++ b/srcpkgs/helix/template
@@ -1,7 +1,7 @@
 # Template file for 'helix'
 pkgname=helix
 version=22.03
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path helix-term"
 hostmakedepends="git"
@@ -12,7 +12,6 @@ homepage="https://helix-editor.com/"
 changelog="https://github.com/helix-editor/helix/blob/master/CHANGELOG.md"
 distfiles="https://github.com/helix-editor/helix/archive/${version}.tar.gz"
 checksum=a21f4d7b6390930a89b59567909ad7c613a1eeeafc813167ff7bc3be603997f4
-conflicts="hex>=0"
 
 # skip problematic doctests on i686
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/hex/template b/srcpkgs/hex/template
index 6295e03ddffe..07bf3c269d26 100644
--- a/srcpkgs/hex/template
+++ b/srcpkgs/hex/template
@@ -1,7 +1,7 @@
 # Template file for 'hex'
 pkgname=hex
 version=0.4.2
-revision=1
+revision=2
 build_style=cargo
 short_desc="Futuristic take on hexdump"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -11,5 +11,7 @@ distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=a7cc1ece337fc19e77fbbbca145001bc5d447bde4118eb6de2c99407eb1a3b74
 
 post_install() {
+	# avoid conflict with helix
+	mv ${DESTDIR}/usr/bin/hx ${DESTDIR}/usr/bin/hex
 	vlicense LICENSE
 }

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

* Re: hex: change binary name to avoid conflict with helix
  2022-03-31 22:59 [PR PATCH] helix: remove conflict with hex cinerea0
                   ` (2 preceding siblings ...)
  2022-04-01  0:37 ` [PR PATCH] [Updated] " cinerea0
@ 2022-04-01 14:06 ` leahneukirchen
  2022-04-01 14:18 ` SolitudeSF
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: leahneukirchen @ 2022-04-01 14:06 UTC (permalink / raw)
  To: ml

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/36442#issuecomment-1085947158

Comment:
cc @SolitudeSF 

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

* Re: hex: change binary name to avoid conflict with helix
  2022-03-31 22:59 [PR PATCH] helix: remove conflict with hex cinerea0
                   ` (3 preceding siblings ...)
  2022-04-01 14:06 ` hex: change binary name to avoid conflict with helix leahneukirchen
@ 2022-04-01 14:18 ` SolitudeSF
  2022-04-01 14:30 ` leahneukirchen
  2022-04-02 15:36 ` [PR PATCH] [Merged]: " leahneukirchen
  6 siblings, 0 replies; 8+ messages in thread
From: SolitudeSF @ 2022-04-01 14:18 UTC (permalink / raw)
  To: ml

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

New comment by SolitudeSF on void-packages repository

https://github.com/void-linux/void-packages/pull/36442#issuecomment-1085961667

Comment:
amazing. do we have package download stats, because i can bet that not a single person uses that package and it can be safely removed.

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

* Re: hex: change binary name to avoid conflict with helix
  2022-03-31 22:59 [PR PATCH] helix: remove conflict with hex cinerea0
                   ` (4 preceding siblings ...)
  2022-04-01 14:18 ` SolitudeSF
@ 2022-04-01 14:30 ` leahneukirchen
  2022-04-02 15:36 ` [PR PATCH] [Merged]: " leahneukirchen
  6 siblings, 0 replies; 8+ messages in thread
From: leahneukirchen @ 2022-04-01 14:30 UTC (permalink / raw)
  To: ml

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/36442#issuecomment-1085975421

Comment:
> 20 downloads since jan

I think renaming is acceptable.

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

* Re: [PR PATCH] [Merged]: hex: change binary name to avoid conflict with helix
  2022-03-31 22:59 [PR PATCH] helix: remove conflict with hex cinerea0
                   ` (5 preceding siblings ...)
  2022-04-01 14:30 ` leahneukirchen
@ 2022-04-02 15:36 ` leahneukirchen
  6 siblings, 0 replies; 8+ messages in thread
From: leahneukirchen @ 2022-04-02 15:36 UTC (permalink / raw)
  To: ml

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

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

hex: change binary name to avoid conflict with helix
https://github.com/void-linux/void-packages/pull/36442

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

#### Testing the changes
- I tested the changes in this PR: **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**
-->

<!-- 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
-->
This removes the conflict with `helix` by renaming the binary to the project's name.

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

end of thread, other threads:[~2022-04-02 15:36 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-31 22:59 [PR PATCH] helix: remove conflict with hex cinerea0
2022-03-31 23:04 ` leahneukirchen
2022-03-31 23:23 ` cinerea0
2022-04-01  0:37 ` [PR PATCH] [Updated] " cinerea0
2022-04-01 14:06 ` hex: change binary name to avoid conflict with helix leahneukirchen
2022-04-01 14:18 ` SolitudeSF
2022-04-01 14:30 ` leahneukirchen
2022-04-02 15:36 ` [PR PATCH] [Merged]: " leahneukirchen

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