From: cinerea0 <cinerea0@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] helix: remove conflict with hex
Date: Fri, 01 Apr 2022 00:59:20 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36442@inbox.vuxu.org> (raw)
[-- 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
}
next reply other threads:[~2022-03-31 22:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-31 22:59 cinerea0 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36442@inbox.vuxu.org \
--to=cinerea0@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).