Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] fish-shell: update to 4.0.1
@ 2025-03-13  9:20 tranzystorekk
  2025-03-13 10:21 ` [PR PATCH] [Updated] " tranzystorekk
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: tranzystorekk @ 2025-03-13  9:20 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tranzystorekk/void-packages fish
https://github.com/void-linux/void-packages/pull/54676

fish-shell: update to 4.0.1
<!-- 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/54676.patch is attached

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

From c4187036c5d9e96114d155fd990a87084914c654 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Thu, 13 Mar 2025 10:10:53 +0100
Subject: [PATCH] fish-shell: update to 4.0.1

---
 srcpkgs/fish-shell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template
index 2af39cca523044..55177777387c32 100644
--- a/srcpkgs/fish-shell/template
+++ b/srcpkgs/fish-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'fish-shell'
 pkgname=fish-shell
-version=4.0.0
+version=4.0.1
 revision=1
 build_style=cmake
 build_helper="rust"
@@ -15,7 +15,7 @@ license="GPL-2.0-only"
 homepage="https://fishshell.com/"
 changelog="https://raw.githubusercontent.com/fish-shell/fish-shell/refs/heads/master/CHANGELOG.rst"
 distfiles="https://github.com/fish-shell/fish-shell/releases/download/${version}/fish-${version}.tar.xz"
-checksum=2fda5bd970357064d8d4c896e08285ba59965ca2a8c4829ca8a82bf3b89c69f3
+checksum=4ed63a70207283e15cf21fc5f21db4230421e4f98d4826b5b1c8254d69c762b5
 register_shell="/bin/fish /usr/bin/fish"
 
 post_install() {

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

* Re: [PR PATCH] [Updated] fish-shell: update to 4.0.1
  2025-03-13  9:20 [PR PATCH] fish-shell: update to 4.0.1 tranzystorekk
@ 2025-03-13 10:21 ` tranzystorekk
  2025-03-13 11:14 ` tranzystorekk
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: tranzystorekk @ 2025-03-13 10:21 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tranzystorekk/void-packages fish
https://github.com/void-linux/void-packages/pull/54676

fish-shell: update to 4.0.1
<!-- 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/54676.patch is attached

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

From 096119fcdbc85cfb26f1215fdd4034b0d4128504 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Thu, 13 Mar 2025 10:10:53 +0100
Subject: [PATCH] fish-shell: update to 4.0.1

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

diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template
index 2af39cca523044..a40db6b0691a30 100644
--- a/srcpkgs/fish-shell/template
+++ b/srcpkgs/fish-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'fish-shell'
 pkgname=fish-shell
-version=4.0.0
+version=4.0.1
 revision=1
 build_style=cmake
 build_helper="rust"
@@ -15,9 +15,13 @@ license="GPL-2.0-only"
 homepage="https://fishshell.com/"
 changelog="https://raw.githubusercontent.com/fish-shell/fish-shell/refs/heads/master/CHANGELOG.rst"
 distfiles="https://github.com/fish-shell/fish-shell/releases/download/${version}/fish-${version}.tar.xz"
-checksum=2fda5bd970357064d8d4c896e08285ba59965ca2a8c4829ca8a82bf3b89c69f3
+checksum=4ed63a70207283e15cf21fc5f21db4230421e4f98d4826b5b1c8254d69c762b5
 register_shell="/bin/fish /usr/bin/fish"
 
+if [ "${XBPS_BUILD_ENVIRONMENT}" = "void-packages-ci" ]; then
+	configure_args+=" -DCMAKE_CTEST_ARGUMENTS=-E;cmdsub-limit"
+fi
+
 post_install() {
 	# Starting with fish-3.0.0 this is a skeleton file with only comments
 	rm "${DESTDIR}/etc/fish/config.fish"

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

* Re: [PR PATCH] [Updated] fish-shell: update to 4.0.1
  2025-03-13  9:20 [PR PATCH] fish-shell: update to 4.0.1 tranzystorekk
  2025-03-13 10:21 ` [PR PATCH] [Updated] " tranzystorekk
@ 2025-03-13 11:14 ` tranzystorekk
  2025-03-13 11:29 ` tranzystorekk
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: tranzystorekk @ 2025-03-13 11:14 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tranzystorekk/void-packages fish
https://github.com/void-linux/void-packages/pull/54676

fish-shell: update to 4.0.1
<!-- 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/54676.patch is attached

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

From 3b73025bdd84573d3172f52bd941f4cd5f61524d Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Thu, 13 Mar 2025 10:10:53 +0100
Subject: [PATCH] fish-shell: update to 4.0.1

---
 srcpkgs/fish-shell/patches/test-args.patch | 13 +++++++++++++
 srcpkgs/fish-shell/template                |  8 ++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/fish-shell/patches/test-args.patch

diff --git a/srcpkgs/fish-shell/patches/test-args.patch b/srcpkgs/fish-shell/patches/test-args.patch
new file mode 100644
index 00000000000000..3d2ada24792339
--- /dev/null
+++ b/srcpkgs/fish-shell/patches/test-args.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/Tests.cmake b/cmake/Tests.cmake
+index 5ade407..ae6047c 100644
+--- a/cmake/Tests.cmake
++++ b/cmake/Tests.cmake
+@@ -25,7 +25,7 @@ add_custom_target(fish_run_tests
+   COMMAND env FISH_FORCE_COLOR=1
+           FISH_SOURCE_DIR=${CMAKE_SOURCE_DIR}
+           ${CMAKE_CTEST_COMMAND} --force-new-ctest-process # --verbose
+-          --output-on-failure --progress
++          --output-on-failure --progress ${FISH_CTEST_ARGUMENTS}
+   DEPENDS tests_dir funcs_dir tests_buildroot_target
+   USES_TERMINAL
+ )
diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template
index 2af39cca523044..69c221c44f89a4 100644
--- a/srcpkgs/fish-shell/template
+++ b/srcpkgs/fish-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'fish-shell'
 pkgname=fish-shell
-version=4.0.0
+version=4.0.1
 revision=1
 build_style=cmake
 build_helper="rust"
@@ -15,9 +15,13 @@ license="GPL-2.0-only"
 homepage="https://fishshell.com/"
 changelog="https://raw.githubusercontent.com/fish-shell/fish-shell/refs/heads/master/CHANGELOG.rst"
 distfiles="https://github.com/fish-shell/fish-shell/releases/download/${version}/fish-${version}.tar.xz"
-checksum=2fda5bd970357064d8d4c896e08285ba59965ca2a8c4829ca8a82bf3b89c69f3
+checksum=4ed63a70207283e15cf21fc5f21db4230421e4f98d4826b5b1c8254d69c762b5
 register_shell="/bin/fish /usr/bin/fish"
 
+if [ "${XBPS_BUILD_ENVIRONMENT}" = "void-packages-ci" ]; then
+	configure_args+=" -DFISH_CTEST_ARGUMENTS=-E;cmdsub-limit"
+fi
+
 post_install() {
 	# Starting with fish-3.0.0 this is a skeleton file with only comments
 	rm "${DESTDIR}/etc/fish/config.fish"

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

* Re: [PR PATCH] [Updated] fish-shell: update to 4.0.1
  2025-03-13  9:20 [PR PATCH] fish-shell: update to 4.0.1 tranzystorekk
  2025-03-13 10:21 ` [PR PATCH] [Updated] " tranzystorekk
  2025-03-13 11:14 ` tranzystorekk
@ 2025-03-13 11:29 ` tranzystorekk
  2025-03-13 11:48 ` tranzystorekk
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: tranzystorekk @ 2025-03-13 11:29 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tranzystorekk/void-packages fish
https://github.com/void-linux/void-packages/pull/54676

fish-shell: update to 4.0.1
<!-- 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/54676.patch is attached

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

From e1718da0568d1e406dd2bece94e4b950d14b649c Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Thu, 13 Mar 2025 10:10:53 +0100
Subject: [PATCH] fish-shell: update to 4.0.1

---
 srcpkgs/fish-shell/patches/test-args.patch | 13 +++++++++++++
 srcpkgs/fish-shell/template                |  8 ++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/fish-shell/patches/test-args.patch

diff --git a/srcpkgs/fish-shell/patches/test-args.patch b/srcpkgs/fish-shell/patches/test-args.patch
new file mode 100644
index 00000000000000..3d2ada24792339
--- /dev/null
+++ b/srcpkgs/fish-shell/patches/test-args.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/Tests.cmake b/cmake/Tests.cmake
+index 5ade407..ae6047c 100644
+--- a/cmake/Tests.cmake
++++ b/cmake/Tests.cmake
+@@ -25,7 +25,7 @@ add_custom_target(fish_run_tests
+   COMMAND env FISH_FORCE_COLOR=1
+           FISH_SOURCE_DIR=${CMAKE_SOURCE_DIR}
+           ${CMAKE_CTEST_COMMAND} --force-new-ctest-process # --verbose
+-          --output-on-failure --progress
++          --output-on-failure --progress ${FISH_CTEST_ARGUMENTS}
+   DEPENDS tests_dir funcs_dir tests_buildroot_target
+   USES_TERMINAL
+ )
diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template
index 2af39cca523044..a58c87e8968b3d 100644
--- a/srcpkgs/fish-shell/template
+++ b/srcpkgs/fish-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'fish-shell'
 pkgname=fish-shell
-version=4.0.0
+version=4.0.1
 revision=1
 build_style=cmake
 build_helper="rust"
@@ -15,9 +15,13 @@ license="GPL-2.0-only"
 homepage="https://fishshell.com/"
 changelog="https://raw.githubusercontent.com/fish-shell/fish-shell/refs/heads/master/CHANGELOG.rst"
 distfiles="https://github.com/fish-shell/fish-shell/releases/download/${version}/fish-${version}.tar.xz"
-checksum=2fda5bd970357064d8d4c896e08285ba59965ca2a8c4829ca8a82bf3b89c69f3
+checksum=4ed63a70207283e15cf21fc5f21db4230421e4f98d4826b5b1c8254d69c762b5
 register_shell="/bin/fish /usr/bin/fish"
 
+if [ "${XBPS_BUILD_ENVIRONMENT}" = "void-packages-ci" ]; then
+	configure_args+=" -DFISH_CTEST_ARGUMENTS=-E;cmdsub-limit;-E;pipeline-pgroup;-E;job-control;-E;wait.fish"
+fi
+
 post_install() {
 	# Starting with fish-3.0.0 this is a skeleton file with only comments
 	rm "${DESTDIR}/etc/fish/config.fish"

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

* Re: [PR PATCH] [Updated] fish-shell: update to 4.0.1
  2025-03-13  9:20 [PR PATCH] fish-shell: update to 4.0.1 tranzystorekk
                   ` (2 preceding siblings ...)
  2025-03-13 11:29 ` tranzystorekk
@ 2025-03-13 11:48 ` tranzystorekk
  2025-03-13 11:59 ` tranzystorekk
  2025-03-13 13:53 ` [PR PATCH] [Merged]: " tranzystorekk
  5 siblings, 0 replies; 7+ messages in thread
From: tranzystorekk @ 2025-03-13 11:48 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tranzystorekk/void-packages fish
https://github.com/void-linux/void-packages/pull/54676

fish-shell: update to 4.0.1
<!-- 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/54676.patch is attached

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

From dcb5062d798c7e163844adba4d9b6a40e57b394b Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Thu, 13 Mar 2025 10:10:53 +0100
Subject: [PATCH] fish-shell: update to 4.0.1

---
 srcpkgs/fish-shell/patches/test-args.patch | 13 +++++++++++++
 srcpkgs/fish-shell/template                |  8 ++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/fish-shell/patches/test-args.patch

diff --git a/srcpkgs/fish-shell/patches/test-args.patch b/srcpkgs/fish-shell/patches/test-args.patch
new file mode 100644
index 00000000000000..3d2ada24792339
--- /dev/null
+++ b/srcpkgs/fish-shell/patches/test-args.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/Tests.cmake b/cmake/Tests.cmake
+index 5ade407..ae6047c 100644
+--- a/cmake/Tests.cmake
++++ b/cmake/Tests.cmake
+@@ -25,7 +25,7 @@ add_custom_target(fish_run_tests
+   COMMAND env FISH_FORCE_COLOR=1
+           FISH_SOURCE_DIR=${CMAKE_SOURCE_DIR}
+           ${CMAKE_CTEST_COMMAND} --force-new-ctest-process # --verbose
+-          --output-on-failure --progress
++          --output-on-failure --progress ${FISH_CTEST_ARGUMENTS}
+   DEPENDS tests_dir funcs_dir tests_buildroot_target
+   USES_TERMINAL
+ )
diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template
index 2af39cca523044..8cc5fed960d5d8 100644
--- a/srcpkgs/fish-shell/template
+++ b/srcpkgs/fish-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'fish-shell'
 pkgname=fish-shell
-version=4.0.0
+version=4.0.1
 revision=1
 build_style=cmake
 build_helper="rust"
@@ -15,9 +15,13 @@ license="GPL-2.0-only"
 homepage="https://fishshell.com/"
 changelog="https://raw.githubusercontent.com/fish-shell/fish-shell/refs/heads/master/CHANGELOG.rst"
 distfiles="https://github.com/fish-shell/fish-shell/releases/download/${version}/fish-${version}.tar.xz"
-checksum=2fda5bd970357064d8d4c896e08285ba59965ca2a8c4829ca8a82bf3b89c69f3
+checksum=4ed63a70207283e15cf21fc5f21db4230421e4f98d4826b5b1c8254d69c762b5
 register_shell="/bin/fish /usr/bin/fish"
 
+if [ "${XBPS_BUILD_ENVIRONMENT}" = "void-packages-ci" ]; then
+	configure_args+=" -DFISH_CTEST_ARGUMENTS=-E;cmdsub-limit\|pipeline-pgroup\|job-control\|wait.fish"
+fi
+
 post_install() {
 	# Starting with fish-3.0.0 this is a skeleton file with only comments
 	rm "${DESTDIR}/etc/fish/config.fish"

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

* Re: [PR PATCH] [Updated] fish-shell: update to 4.0.1
  2025-03-13  9:20 [PR PATCH] fish-shell: update to 4.0.1 tranzystorekk
                   ` (3 preceding siblings ...)
  2025-03-13 11:48 ` tranzystorekk
@ 2025-03-13 11:59 ` tranzystorekk
  2025-03-13 13:53 ` [PR PATCH] [Merged]: " tranzystorekk
  5 siblings, 0 replies; 7+ messages in thread
From: tranzystorekk @ 2025-03-13 11:59 UTC (permalink / raw)
  To: ml

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

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

https://github.com/tranzystorekk/void-packages fish
https://github.com/void-linux/void-packages/pull/54676

fish-shell: update to 4.0.1
<!-- 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/54676.patch is attached

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

From 3a440727c1ec48d7cefe399ba3d400cd93163fd8 Mon Sep 17 00:00:00 2001
From: tranzystorekk <tranzystorek.io@protonmail.com>
Date: Thu, 13 Mar 2025 10:10:53 +0100
Subject: [PATCH] fish-shell: update to 4.0.1

---
 srcpkgs/fish-shell/patches/test-args.patch | 13 +++++++++++++
 srcpkgs/fish-shell/template                |  9 +++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/fish-shell/patches/test-args.patch

diff --git a/srcpkgs/fish-shell/patches/test-args.patch b/srcpkgs/fish-shell/patches/test-args.patch
new file mode 100644
index 00000000000000..3d2ada24792339
--- /dev/null
+++ b/srcpkgs/fish-shell/patches/test-args.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/Tests.cmake b/cmake/Tests.cmake
+index 5ade407..ae6047c 100644
+--- a/cmake/Tests.cmake
++++ b/cmake/Tests.cmake
+@@ -25,7 +25,7 @@ add_custom_target(fish_run_tests
+   COMMAND env FISH_FORCE_COLOR=1
+           FISH_SOURCE_DIR=${CMAKE_SOURCE_DIR}
+           ${CMAKE_CTEST_COMMAND} --force-new-ctest-process # --verbose
+-          --output-on-failure --progress
++          --output-on-failure --progress ${FISH_CTEST_ARGUMENTS}
+   DEPENDS tests_dir funcs_dir tests_buildroot_target
+   USES_TERMINAL
+ )
diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template
index 2af39cca523044..2f628d7d5ffeff 100644
--- a/srcpkgs/fish-shell/template
+++ b/srcpkgs/fish-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'fish-shell'
 pkgname=fish-shell
-version=4.0.0
+version=4.0.1
 revision=1
 build_style=cmake
 build_helper="rust"
@@ -15,9 +15,14 @@ license="GPL-2.0-only"
 homepage="https://fishshell.com/"
 changelog="https://raw.githubusercontent.com/fish-shell/fish-shell/refs/heads/master/CHANGELOG.rst"
 distfiles="https://github.com/fish-shell/fish-shell/releases/download/${version}/fish-${version}.tar.xz"
-checksum=2fda5bd970357064d8d4c896e08285ba59965ca2a8c4829ca8a82bf3b89c69f3
+checksum=4ed63a70207283e15cf21fc5f21db4230421e4f98d4826b5b1c8254d69c762b5
 register_shell="/bin/fish /usr/bin/fish"
 
+# skip problematic tests in ci
+if [ "${XBPS_BUILD_ENVIRONMENT}" = "void-packages-ci" ]; then
+	configure_args+=" -DFISH_CTEST_ARGUMENTS=-E;cmdsub-limit\|pipeline-pgroup\|job-control\|wait.fish\|cargo-test"
+fi
+
 post_install() {
 	# Starting with fish-3.0.0 this is a skeleton file with only comments
 	rm "${DESTDIR}/etc/fish/config.fish"

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

* Re: [PR PATCH] [Merged]: fish-shell: update to 4.0.1
  2025-03-13  9:20 [PR PATCH] fish-shell: update to 4.0.1 tranzystorekk
                   ` (4 preceding siblings ...)
  2025-03-13 11:59 ` tranzystorekk
@ 2025-03-13 13:53 ` tranzystorekk
  5 siblings, 0 replies; 7+ messages in thread
From: tranzystorekk @ 2025-03-13 13:53 UTC (permalink / raw)
  To: ml

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

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

fish-shell: update to 4.0.1
https://github.com/void-linux/void-packages/pull/54676

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 [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] 7+ messages in thread

end of thread, other threads:[~2025-03-13 13:53 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-03-13  9:20 [PR PATCH] fish-shell: update to 4.0.1 tranzystorekk
2025-03-13 10:21 ` [PR PATCH] [Updated] " tranzystorekk
2025-03-13 11:14 ` tranzystorekk
2025-03-13 11:29 ` tranzystorekk
2025-03-13 11:48 ` tranzystorekk
2025-03-13 11:59 ` tranzystorekk
2025-03-13 13:53 ` [PR PATCH] [Merged]: " tranzystorekk

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