Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 13 additions & 21 deletions user/fish-shell/patches/none-profile.patch
Original file line number Diff line number Diff line change
@@ -1,23 +1,15 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c40c82d31..cd2737829 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,18 +57,18 @@ if(NOT "${CMAKE_BUILD_TYPE}" IN_LIST build_types)
endif()

add_custom_target(
fish ALL
COMMAND
"${CMAKE_COMMAND}" -E
env ${VARS_FOR_CARGO}
${Rust_CARGO}
- build --bin fish
- $<$<CONFIG:Release>:--release>
+ auditable build --bin fish
+ $<$<CONFIG:None>:--release>
$<$<CONFIG:RelWithDebInfo>:--profile=release-with-debug>
--target ${Rust_CARGO_TARGET}
--no-default-features
--features=${FISH_CARGO_FEATURES}
${CARGO_FLAGS}
&&
"${CMAKE_COMMAND}" -E
copy "${rust_target_dir}/${rust_profile}/fish" "${CMAKE_CURRENT_BINARY_DIR}"
@@ -62,8 +62,8 @@ add_custom_target(
"${CMAKE_COMMAND}" -E
env ${VARS_FOR_CARGO}
${Rust_CARGO}
- build --bin fish
- $<$<CONFIG:Release>:--release>
+ auditable build --bin fish
+ $<$<CONFIG:None>:--release>
$<$<CONFIG:RelWithDebInfo>:--profile=release-with-debug>
--target ${Rust_CARGO_TARGET}
--no-default-features
4 changes: 2 additions & 2 deletions user/fish-shell/template.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pkgname = "fish-shell"
pkgver = "4.5.0"
pkgver = "4.7.1"
pkgrel = 0
build_style = "cmake"
make_check_target = "fish_run_tests"
Expand All @@ -17,7 +17,7 @@
license = "GPL-2.0-only"
url = "https://fishshell.com"
source = f"https://github.com/fish-shell/fish-shell/releases/download/{pkgver}/fish-{pkgver}.tar.xz"
sha256 = "89151f8cf14b634e080226fe696f9ce7d4d153c77629996ca4431c80482c64ed"
sha256 = "6f4d5b438a6338e3f5dcda19a28261e2ece7a9b7ff97686685e6abdc31dbb7df"
# uses a compiled binary to build docs
options = ["!cross"]

Expand Down