From: TinfoilSubmarine <TinfoilSubmarine@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] conduit: update to 0.4.0.
Date: Fri, 22 Jul 2022 22:39:19 +0200 [thread overview]
Message-ID: <20220722203919.B2O2oERZyg6ihpQV-RqsIR88otRzWh-6M5DBfmkDQPo@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37655@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1260 bytes --]
There is an updated pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/conduit
https://github.com/void-linux/void-packages/pull/37655
conduit: update to 0.4.0.
<!-- 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/37655.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/conduit-37655.patch --]
[-- Type: text/x-diff, Size: 2231 bytes --]
From 2fa57df0ae64739c8dfdfafcbd5fda42d3110589 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 23 Jun 2022 08:56:23 -0400
Subject: [PATCH] conduit: update to 0.4.0.
---
srcpkgs/conduit/patches/config.patch | 13 +++++++++++++
srcpkgs/conduit/template | 9 +++++++--
2 files changed, 20 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/conduit/patches/config.patch
diff --git a/srcpkgs/conduit/patches/config.patch b/srcpkgs/conduit/patches/config.patch
new file mode 100644
index 000000000000..eb55886069ff
--- /dev/null
+++ b/srcpkgs/conduit/patches/config.patch
@@ -0,0 +1,13 @@
+diff --git a/conduit-example.toml b/conduit-example.toml
+index 5eed070..bee1ded 100644
+--- a/conduit-example.toml
++++ b/conduit-example.toml
+@@ -23,7 +23,7 @@
+ #server_name = "your.server.name"
+
+ # This is the only directory where Conduit will save its data
+-database_path = "/var/lib/matrix-conduit/"
++database_path = "/var/lib/conduit/"
+ database_backend = "rocksdb"
+
+ # The port Conduit will be running on. You need to set up a reverse proxy in
diff --git a/srcpkgs/conduit/template b/srcpkgs/conduit/template
index cf972b13e25c..bfea4cb3b003 100644
--- a/srcpkgs/conduit/template
+++ b/srcpkgs/conduit/template
@@ -1,6 +1,6 @@
# Template file for 'conduit'
pkgname=conduit
-version=0.3.0
+version=0.4.0
revision=1
# needs ring/rustls
archs="x86_64* i686* aarch64* armv[67]*"
@@ -12,7 +12,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="Apache-2.0"
homepage="https://conduit.rs/"
distfiles="https://gitlab.com/famedly/conduit/-/archive/v${version}/conduit-v${version}.tar.gz"
-checksum=9e750ed2b8d0e986b1cdc02278124b39c11fa785f2763914836978a5a79863e3
+checksum=0d62cdd3f97e181ed98cff3a1e6c15d61358c01eeac4b5af686e5f650e77cc3f
system_accounts="_conduit"
_conduit_homedir="/var/lib/conduit"
@@ -25,6 +25,11 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
XBPS_CROSS_RUSTFLAGS+=" -latomic"
fi
+if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+ # doctests fail on x86_64 -> i686 chroot, so run everything *but* them
+ make_check_args+=" --lib --bins --tests --benches --examples"
+fi
+
post_install() {
vsconf conduit-example.toml conduit.toml
vsv conduit
next prev parent reply other threads:[~2022-07-22 20:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-23 13:25 [PR PATCH] " TinfoilSubmarine
2022-07-22 20:39 ` TinfoilSubmarine [this message]
2022-07-22 20:40 ` TinfoilSubmarine
2022-08-03 22:55 ` [PR PATCH] [Merged]: " paper42
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=20220722203919.B2O2oERZyg6ihpQV-RqsIR88otRzWh-6M5DBfmkDQPo@z \
--to=tinfoilsubmarine@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).