From 3d30652a22190d531ba5b98eda0e36aa0732cf7c Mon Sep 17 00:00:00 2001 From: tranzystorekk 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 00000000000..3d2ada24792 --- /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 2af39cca523..2f628d7d5ff 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"