From 4f99d4b1aa526f7e6eb91453793c19aa1b441f00 Mon Sep 17 00:00:00 2001 From: loner <2788892716@qq.com> Date: Mon, 10 Nov 2025 20:14:51 +0800 Subject: [PATCH 1/5] fish: 4.1.2 -> 4.2.0 --- pkgs/by-name/fi/fish/nix-darwin-path.patch | 10 +++++----- pkgs/by-name/fi/fish/package.nix | 19 ++++++++----------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/fi/fish/nix-darwin-path.patch b/pkgs/by-name/fi/fish/nix-darwin-path.patch index 0c9ef7f2701a9..8e92dcf1e9ceb 100644 --- a/pkgs/by-name/fi/fish/nix-darwin-path.patch +++ b/pkgs/by-name/fi/fish/nix-darwin-path.patch @@ -1,12 +1,12 @@ diff --git a/share/config.fish b/share/config.fish -index d85fd1e185..c564e45b27 100644 +index 73148ac25..1964e30be 100644 --- a/share/config.fish +++ b/share/config.fish -@@ -158,6 +158,7 @@ +@@ -175,6 +175,7 @@ and __fish_set_locale # if status --is-login if command -sq /usr/libexec/path_helper + and not set -q __NIX_DARWIN_SET_ENVIRONMENT_DONE - # Adapt construct_path from the macOS /usr/libexec/path_helper - # executable for fish; see - # https://opensource.apple.com/source/shell_cmds/shell_cmds-203/path_helper/path_helper.c.auto.html . + __fish_macos_set_env PATH /etc/paths '/etc/paths.d' + if test -n "$MANPATH" + __fish_macos_set_env MANPATH /etc/manpaths '/etc/manpaths.d' diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix index 217c4ae371ff0..62d97dd940269 100644 --- a/pkgs/by-name/fi/fish/package.nix +++ b/pkgs/by-name/fi/fish/package.nix @@ -7,7 +7,6 @@ glibcLocales, gnused, gnugrep, - groff, gawk, man-db, ninja, @@ -152,13 +151,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fish"; - version = "4.1.2"; + version = "4.2.0"; src = fetchFromGitHub { owner = "fish-shell"; repo = "fish-shell"; tag = finalAttrs.version; - hash = "sha256-oNRC1NWYE0LEK2a/7nHtlmp20f8hn/1FZgaySqzwSbg="; + hash = "sha256-t5whU+byERJ+nDLigJ5IznvEg3MUsVqhpGdWFzF+T4Q="; }; env = { @@ -169,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src patches; - hash = "sha256-7mYWCHH6DBWTIJV8GPRjjf6QulwlYjwv0slablDvBF8="; + hash = "sha256-4pDbD7hetN7wGdPr2csgVWsqtYKMj6jpYm7zBKra+bU="; }; patches = [ @@ -192,13 +191,15 @@ stdenv.mkDerivation (finalAttrs: { # Fix FHS paths in tests postPatch = '' - substituteInPlace src/builtins/tests/test_tests.rs \ + substituteInPlace src/builtins/test.rs \ --replace-fail '"/bin/ls"' '"${lib.getExe' coreutils "ls"}"' - substituteInPlace src/highlight/tests.rs \ + substituteInPlace src/highlight/highlight.rs \ --replace-fail '"/bin/echo"' '"${lib.getExe' coreutils "echo"}"' \ --replace-fail '"/bin/c"' '"${lib.getExe' coreutils "c"}"' \ - --replace-fail '"/bin/ca"' '"${lib.getExe' coreutils "ca"}"' \ + --replace-fail '"/bin/ca"' '"${lib.getExe' coreutils "ca"}"' + + substituteInPlace src/highlight/file_tester.rs \ --replace-fail '/usr' '/' substituteInPlace tests/checks/cd.fish \ @@ -296,7 +297,6 @@ stdenv.mkDerivation (finalAttrs: { coreutils gnugrep gnused - groff gettext ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) man-db; @@ -342,9 +342,6 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace "$out/share/fish/functions/grep.fish" \ --replace-fail "command grep" "command ${lib.getExe gnugrep}" - substituteInPlace "$out/share/fish/functions/__fish_print_help.fish" \ - --replace-fail "nroff" "${lib.getExe' groff "nroff"}" - substituteInPlace $out/share/fish/completions/{sudo.fish,doas.fish} \ --replace-fail "/usr/local/sbin /sbin /usr/sbin" "" '' From c74faa8b19407cf7fc069b1a161c6739fa19a9f2 Mon Sep 17 00:00:00 2001 From: loner <2788892716@qq.com> Date: Tue, 11 Nov 2025 02:37:07 +0800 Subject: [PATCH 2/5] nixos/fish: Remove redundant deroff.py script --- nixos/modules/programs/fish.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index 903752bc9a54d..fcec77aaf417f 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -259,7 +259,6 @@ in name = "fish_patched-completion-generator"; srcs = [ "${cfg.package}/share/fish/tools/create_manpage_completions.py" - "${cfg.package}/share/fish/tools/deroff.py" ]; unpackCmd = "cp $curSrc $(basename $curSrc)"; sourceRoot = "."; From 454d683fcaa7da575d43f1a4cf843adbe9830d0f Mon Sep 17 00:00:00 2001 From: loner <2788892716@qq.com> Date: Tue, 11 Nov 2025 02:54:56 +0800 Subject: [PATCH 3/5] fish: Add lonerOrz to the maintainer list --- pkgs/by-name/fi/fish/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix index 62d97dd940269..30973f400d7d1 100644 --- a/pkgs/by-name/fi/fish/package.nix +++ b/pkgs/by-name/fi/fish/package.nix @@ -383,6 +383,7 @@ stdenv.mkDerivation (finalAttrs: { winter sigmasquadron rvdp + lonerOrz ]; mainProgram = "fish"; }; From 1c628eb11c2c43b111ac138aaf8d8ac7cc2f809b Mon Sep 17 00:00:00 2001 From: loner <2788892716@qq.com> Date: Tue, 11 Nov 2025 17:50:08 +0800 Subject: [PATCH 4/5] kitty: Fix timeout issue in Fish integration tests after recent Fish release --- pkgs/by-name/ki/kitty/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix index 95dcc43a47c94..9f09158758ae1 100644 --- a/pkgs/by-name/ki/kitty/package.nix +++ b/pkgs/by-name/ki/kitty/package.nix @@ -45,6 +45,7 @@ makeBinaryWrapper, autoSignDarwinBinariesHook, cairo, + fetchpatch, }: with python3Packages; @@ -141,6 +142,12 @@ buildPythonApplication rec { # Skip `test_ssh_bootstrap_with_different_launchers` when launcher is `zsh` since it causes: # OSError: master_fd is in error condition ./disable-test_ssh_bootstrap_with_different_launchers.patch + + # Fix timeout issue in Fish integration tests after recent Fish release + (fetchpatch { + url = "https://github.com/kovidgoyal/kitty/commit/456fa8691a94f99fae0cef7f19dd2c85c208445a.patch"; + hash = "sha256-WLPodki5cA9Y3pcVwSV7EUmLEGGXkJDYX1MsHIzPk2s="; + }) ]; hardeningDisable = [ From a92b1a2d2126b8a74df19107b5be8dd4def1e860 Mon Sep 17 00:00:00 2001 From: loner <2788892716@qq.com> Date: Tue, 11 Nov 2025 17:53:31 +0800 Subject: [PATCH 5/5] test/fish: update fish_complete_path test for standalone mode --- nixos/tests/fish.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/fish.nix b/nixos/tests/fish.nix index 84ffd71f7ddc3..84de7f061752f 100644 --- a/nixos/tests/fish.nix +++ b/nixos/tests/fish.nix @@ -22,7 +22,7 @@ machine.wait_for_file("/etc/fish/generated_completions/coreutils.fish") machine.wait_for_file("/etc/fish/generated_completions/kill.fish") machine.succeed( - "fish -ic 'echo $fish_complete_path' | grep -q '/share/fish/completions /etc/fish/generated_completions /root/.cache/fish/generated_completions$'" + "fish -ic 'echo $fish_complete_path' | grep -q '/share/fish/vendor_completions.d /etc/fish/generated_completions /root/.cache/fish/generated_completions$'" ) ''; }