From: tranzystorek-io <tranzystorek-io@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: sheldon-0.6.6
Date: Fri, 05 Aug 2022 20:18:19 +0200 [thread overview]
Message-ID: <20220805181819.pTGrGa2Hu92ar2TlbG2s-V5WEhdYcHZ9ZKUT6ONkUVM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38488@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1235 bytes --]
There is an updated pull request by tranzystorek-io against master on the void-packages repository
https://github.com/tranzystorek-io/void-packages sheldon
https://github.com/void-linux/void-packages/pull/38488
New package: sheldon-0.6.6
<!-- 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**
<!-- 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/38488.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sheldon-38488.patch --]
[-- Type: text/x-diff, Size: 5548 bytes --]
From 85aff1d28eb3b5b888affa3d8c13087b1a50896f Mon Sep 17 00:00:00 2001
From: Marcin Puc <marcin.e.puc@gmail.com>
Date: Tue, 15 Mar 2022 13:25:42 +0100
Subject: [PATCH] New package: sheldon-0.6.6
---
...l-when-building-outside-git-repo-139.patch | 41 ++++++++++++++
srcpkgs/sheldon/patches/0002-Fix-tests.patch | 56 +++++++++++++++++++
srcpkgs/sheldon/template | 38 +++++++++++++
3 files changed, 135 insertions(+)
create mode 100644 srcpkgs/sheldon/patches/0001-Fix-build-fail-when-building-outside-git-repo-139.patch
create mode 100644 srcpkgs/sheldon/patches/0002-Fix-tests.patch
create mode 100644 srcpkgs/sheldon/template
diff --git a/srcpkgs/sheldon/patches/0001-Fix-build-fail-when-building-outside-git-repo-139.patch b/srcpkgs/sheldon/patches/0001-Fix-build-fail-when-building-outside-git-repo-139.patch
new file mode 100644
index 000000000000..9674370eb425
--- /dev/null
+++ b/srcpkgs/sheldon/patches/0001-Fix-build-fail-when-building-outside-git-repo-139.patch
@@ -0,0 +1,41 @@
+From e2f2d86544804e656710834d359d277c07e3f232 Mon Sep 17 00:00:00 2001
+From: Marcin Puc <5671049+tranzystorek-io@users.noreply.github.com>
+Date: Wed, 16 Mar 2022 07:15:48 +0100
+Subject: [PATCH] Fix build fail when building outside git repo (#139)
+
+---
+ tests/lib.rs | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/tests/lib.rs b/tests/lib.rs
+index 2f95b04..59f23d8 100644
+--- a/tests/lib.rs
++++ b/tests/lib.rs
+@@ -663,12 +663,21 @@ fn dirs_xdg_from_env() -> io::Result<()> {
+ #[test]
+ fn version() -> io::Result<()> {
+ let dirs = Directories::default()?;
++
++ let maybe_commit_hash = option_env!("GIT_COMMIT_SHORT_HASH");
++ let maybe_commit_date = option_env!("GIT_COMMIT_DATE");
++ let commit_info =
++ if let (Some(commit_hash), Some(commit_date)) = (maybe_commit_hash, maybe_commit_date) {
++ format!(" ({} {})", commit_hash, commit_date)
++ } else {
++ "".to_string()
++ };
++
+ let expected = format!(
+- "{} {} ({} {})\n{}\n",
++ "{} {}{}\n{}\n",
+ env!("CARGO_PKG_NAME"),
+ env!("CARGO_PKG_VERSION"),
+- env!("GIT_COMMIT_SHORT_HASH"),
+- env!("GIT_COMMIT_DATE"),
++ commit_info,
+ env!("RUSTC_VERSION_SUMMARY")
+ );
+ TestCommand::new(&dirs)
+--
+2.35.1
+
diff --git a/srcpkgs/sheldon/patches/0002-Fix-tests.patch b/srcpkgs/sheldon/patches/0002-Fix-tests.patch
new file mode 100644
index 000000000000..416229bd3438
--- /dev/null
+++ b/srcpkgs/sheldon/patches/0002-Fix-tests.patch
@@ -0,0 +1,56 @@
+From 9aa06fdd5cb284daae8c48648d614e3823f3f9f3 Mon Sep 17 00:00:00 2001
+From: Ross MacArthur <ross@macarthur.io>
+Date: Sat, 29 Jan 2022 22:02:39 +0200
+Subject: [PATCH] Fix tests
+
+---
+ src/cli.rs | 13 ++++++++++++-
+ src/testdata/cli/raw_opt_help.golden | 2 +-
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/src/cli.rs b/src/cli.rs
+index 23c644e..18300fa 100644
+--- a/src/cli.rs
++++ b/src/cli.rs
+@@ -503,6 +503,7 @@ mod tests {
+ use std::iter;
+
+ use pretty_assertions::assert_eq;
++ use serde::Serialize;
+
+ fn setup() {
+ for (k, _) in env::vars() {
+@@ -548,9 +549,19 @@ mod tests {
+ #[test]
+ fn raw_opt_help() {
+ setup();
++
++ #[derive(Serialize)]
++ struct Context {
++ version: &'static str,
++ }
++
++ let ctx = Context {
++ version: build::CRATE_RELEASE,
++ };
++
+ for opt in &["-h", "--help"] {
+ let err = raw_opt_err(&[opt]);
+- goldie::assert!(err.to_string());
++ goldie::assert_template!(&ctx, err.to_string());
+ assert_eq!(err.kind, clap::ErrorKind::DisplayHelp);
+ }
+ }
+diff --git a/src/testdata/cli/raw_opt_help.golden b/src/testdata/cli/raw_opt_help.golden
+index 93c47ce..4b6b19d 100644
+--- a/src/testdata/cli/raw_opt_help.golden
++++ b/src/testdata/cli/raw_opt_help.golden
+@@ -1,4 +1,4 @@
+-sheldon 0.6.5
++sheldon {version}
+ Ross MacArthur <ross@macarthur.io>
+ Fast, configurable, shell plugin manager.
+
+--
+2.35.1
+
diff --git a/srcpkgs/sheldon/template b/srcpkgs/sheldon/template
new file mode 100644
index 000000000000..37202da414eb
--- /dev/null
+++ b/srcpkgs/sheldon/template
@@ -0,0 +1,38 @@
+# Template file for 'sheldon'
+pkgname=sheldon
+version=0.6.6
+revision=1
+build_style=cargo
+build_helper=qemu
+# skip problematic tests
+make_check_args="--
+ --skip lock::tests::locked_config_clean
+ --skip lock::tests::source_lock_git_git_with_checkout
+ --skip lock_and_source_clean_permission_denied
+ --skip lock_and_source_github_git"
+hostmakedepends="pkg-config"
+makedepends="libcurl-devel openssl-devel zlib-devel"
+checkdepends="git"
+short_desc="Fast, configurable shell plugin manager"
+maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
+license="Apache-2.0, MIT"
+homepage="https://sheldon.cli.rs/"
+changelog="https://raw.githubusercontent.com/rossmacarthur/sheldon/trunk/RELEASES.md"
+distfiles="https://github.com/rossmacarthur/sheldon/archive/${version}.tar.gz"
+checksum=9d6cdc8fe011c4defe65fbe1507e48a51f8efdeebb5d5b0b39fbde2c73566973
+
+post_build() {
+ SHELDON=target/${RUST_TARGET}/release/sheldon
+ for shell in bash zsh; do
+ vtargetrun ${SHELDON} completions --shell ${shell} > sheldon.${shell}
+ done
+}
+
+post_install() {
+ for shell in bash zsh; do
+ vcompletion sheldon.${shell} ${shell}
+ done
+
+ vlicense LICENSE-MIT
+ vdoc README.md
+}
next prev parent reply other threads:[~2022-08-05 18:18 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-05 18:03 [PR PATCH] " tranzystorek-io
2022-08-05 18:18 ` tranzystorek-io [this message]
2022-08-13 6:51 ` [PR PATCH] [Updated] " tranzystorek-io
2022-08-24 10:35 ` tranzystorek-io
2022-08-24 22:38 ` tranzystorek-io
2022-09-04 11:56 ` jcgruenhage
2022-09-04 11:59 ` tranzystorek-io
2022-09-04 21:53 ` jcgruenhage
2022-09-04 21:55 ` jcgruenhage
2022-10-13 14:15 ` [PR PATCH] [Updated] " tranzystorek-io
2022-10-13 14:39 ` [PR PATCH] [Updated] New package: sheldon-0.7.0 tranzystorek-io
2022-10-13 15:10 ` tranzystorek-io
2022-10-13 18:21 ` jcgruenhage
2022-11-02 8:47 ` [PR PATCH] [Updated] " tranzystorek-io
2023-02-01 2:07 ` New package: sheldon-0.7.1 github-actions
2023-02-01 15:22 ` [PR PATCH] [Updated] " tranzystorek-io
2023-02-26 16:56 ` tranzystorek-io
2023-02-26 19:33 ` tranzystorek-io
2023-03-05 13:13 ` jcgruenhage
2023-04-02 9:36 ` [PR PATCH] [Updated] " tranzystorek-io
2023-04-21 9:15 ` tranzystorek-io
2023-05-14 7:17 ` tranzystorek-io
2023-05-16 18:03 ` [PR PATCH] [Updated] New package: sheldon-0.7.2 tranzystorek-io
2023-06-09 22:39 ` [PR PATCH] [Updated] New package: sheldon-0.7.3 tranzystorek-io
2023-06-24 12:14 ` [PR PATCH] [Merged]: " Duncaen
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=20220805181819.pTGrGa2Hu92ar2TlbG2s-V5WEhdYcHZ9ZKUT6ONkUVM@z \
--to=tranzystorek-io@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).