Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] bottom: update to 0.8.0.
@ 2023-04-02 14:26 jcgruenhage
  2023-04-03  7:05 ` [PR PATCH] [Updated] " jcgruenhage
  2023-04-03 20:39 ` [PR PATCH] [Merged]: " leahneukirchen
  0 siblings, 2 replies; 3+ messages in thread
From: jcgruenhage @ 2023-04-02 14:26 UTC (permalink / raw)
  To: ml

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

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

https://github.com/jcgruenhage/void-packages bottom-0.8.0_1
https://github.com/void-linux/void-packages/pull/43212

bottom: update to 0.8.0.
- common/build-style/cargo.sh: use --locked for build and check as well
- bottom: update to 0.8.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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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/43212.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bottom-0.8.0_1-43212.patch --]
[-- Type: text/x-diff, Size: 2415 bytes --]

From 90bdbe610067a4bff648267dbf62c12ba13ccac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 2 Apr 2023 16:25:24 +0200
Subject: [PATCH 1/2] common/build-style/cargo.sh: use --locked for build and
 check as well

---
 common/build-style/cargo.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/build-style/cargo.sh b/common/build-style/cargo.sh
index 9f30a1e5c2d5..6bf060c43090 100644
--- a/common/build-style/cargo.sh
+++ b/common/build-style/cargo.sh
@@ -5,13 +5,13 @@
 do_build() {
 	: ${make_cmd:=cargo auditable}
 
-	${make_cmd} --config 'registries.crates-io.protocol="sparse"' build --release --target ${RUST_TARGET} ${configure_args}
+	${make_cmd} --config 'registries.crates-io.protocol="sparse"' build --release --locked --target ${RUST_TARGET} ${configure_args}
 }
 
 do_check() {
 	: ${make_cmd:=cargo auditable}
 
-	${make_check_pre} ${make_cmd} --config 'registries.crates-io.protocol="sparse"' test --release --target ${RUST_TARGET} ${configure_args} \
+	${make_check_pre} ${make_cmd} --config 'registries.crates-io.protocol="sparse"' test --release --locked --target ${RUST_TARGET} ${configure_args} \
 		${make_check_args}
 }
 

From 065f92b729995fce554a6ee46714adf5b75f7337 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 2 Apr 2023 16:22:43 +0200
Subject: [PATCH 2/2] bottom: update to 0.8.0.

---
 srcpkgs/bottom/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bottom/template b/srcpkgs/bottom/template
index 4721e6d6073b..5f613bf1ae8e 100644
--- a/srcpkgs/bottom/template
+++ b/srcpkgs/bottom/template
@@ -1,6 +1,6 @@
 # Template file for 'bottom'
 pkgname=bottom
-version=0.6.8
+version=0.8.0
 revision=1
 build_style=cargo
 short_desc="Yet another cross-platform graphical process/system monitor"
@@ -9,7 +9,11 @@ license="MIT"
 homepage="https://github.com/ClementTsang/bottom"
 changelog="https://raw.githubusercontent.com/ClementTsang/bottom/master/CHANGELOG.md"
 distfiles="https://github.com/ClementTsang/bottom/archive/${version}.tar.gz"
-checksum=4e4eb251972a7af8c46dd36bcf1335fea334fb670569434fbfd594208905b2d9
+checksum=0fe6a826d18570ab33b2af3b26ce28c61e3aa830abb2b622f2c3b81da802437a
+
+pre_build() {
+	export BTM_GENERATE=true
+}
 
 post_install() {
 	vdoc README.md

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

* Re: [PR PATCH] [Updated] bottom: update to 0.8.0.
  2023-04-02 14:26 [PR PATCH] bottom: update to 0.8.0 jcgruenhage
@ 2023-04-03  7:05 ` jcgruenhage
  2023-04-03 20:39 ` [PR PATCH] [Merged]: " leahneukirchen
  1 sibling, 0 replies; 3+ messages in thread
From: jcgruenhage @ 2023-04-03  7:05 UTC (permalink / raw)
  To: ml

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

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

https://github.com/jcgruenhage/void-packages bottom-0.8.0_1
https://github.com/void-linux/void-packages/pull/43212

bottom: update to 0.8.0.
- common/build-style/cargo.sh: use --locked for build and check as well
- bottom: update to 0.8.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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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/43212.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bottom-0.8.0_1-43212.patch --]
[-- Type: text/x-diff, Size: 1165 bytes --]

From d14dfde9714f042074c43e7a60cf2caf444d0ab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 2 Apr 2023 16:22:43 +0200
Subject: [PATCH] bottom: update to 0.8.0.

---
 srcpkgs/bottom/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bottom/template b/srcpkgs/bottom/template
index 4721e6d6073b..5f613bf1ae8e 100644
--- a/srcpkgs/bottom/template
+++ b/srcpkgs/bottom/template
@@ -1,6 +1,6 @@
 # Template file for 'bottom'
 pkgname=bottom
-version=0.6.8
+version=0.8.0
 revision=1
 build_style=cargo
 short_desc="Yet another cross-platform graphical process/system monitor"
@@ -9,7 +9,11 @@ license="MIT"
 homepage="https://github.com/ClementTsang/bottom"
 changelog="https://raw.githubusercontent.com/ClementTsang/bottom/master/CHANGELOG.md"
 distfiles="https://github.com/ClementTsang/bottom/archive/${version}.tar.gz"
-checksum=4e4eb251972a7af8c46dd36bcf1335fea334fb670569434fbfd594208905b2d9
+checksum=0fe6a826d18570ab33b2af3b26ce28c61e3aa830abb2b622f2c3b81da802437a
+
+pre_build() {
+	export BTM_GENERATE=true
+}
 
 post_install() {
 	vdoc README.md

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

* Re: [PR PATCH] [Merged]: bottom: update to 0.8.0.
  2023-04-02 14:26 [PR PATCH] bottom: update to 0.8.0 jcgruenhage
  2023-04-03  7:05 ` [PR PATCH] [Updated] " jcgruenhage
@ 2023-04-03 20:39 ` leahneukirchen
  1 sibling, 0 replies; 3+ messages in thread
From: leahneukirchen @ 2023-04-03 20:39 UTC (permalink / raw)
  To: ml

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

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

bottom: update to 0.8.0.
https://github.com/void-linux/void-packages/pull/43212

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

#### Testing the changes
- I tested the changes in this PR: **YES**

When building locally, this failed due to dependency resolution problems, which are caused by our inconsistent use of the `--locked` and `--offline` flags for cargo. Once we've got #43233 in, this will build just fine though.

EDIT: heh, I'm confused. Now this built just fine in CI without `--locked`, maybe this was just a random local failure.

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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
-->


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

end of thread, other threads:[~2023-04-03 20:39 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-02 14:26 [PR PATCH] bottom: update to 0.8.0 jcgruenhage
2023-04-03  7:05 ` [PR PATCH] [Updated] " jcgruenhage
2023-04-03 20:39 ` [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).