fish: 4.1.2 -> 4.2.0 by lonerOrz · Pull Request #460330 · NixOS/nixpkgs

lonerOrz · 2025-11-10T12:18:59Z

Things done

Add a 👍 reaction to pull requests you find important.

lonerOrz · 2025-11-10T12:25:39Z

This package has 5 listed maintainers, not sure why you request me for review.

github's default recommendation, I don't know why

DieracDelta · 2025-11-10T14:19:00Z

`nixpkgs-review` result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 460330
Commit: c00a6c1634012a9b1f7d35199912073386d42959

`x86_64-linux`

❌ 4 packages failed to build:

kitty
kitty.kitten
kitty.shell_integration
kitty.terminfo

✅ 28 packages built:

bat-extras.batdiff
bat-extras.batgrep
bat-extras.batman
bat-extras.batpipe
bat-extras.batwatch
bat-extras.core
bat-extras.prettybat
direnv
fish
fish-lsp
fish.doc
fishMinimal
fishMinimal.doc
fishPlugins.bass
fishPlugins.done
fishPlugins.fishtape
fishPlugins.fishtape_3
fishPlugins.fzf-fish
fishPlugins.humantime-fish
fishPlugins.pure
fzf-git-sh
mise
nixpkgs-manual
oh-my-fish
swaynotificationcenter
tests.writers.bin.fish
tests.writers.simple.fish
vimPlugins.direnv-vim

Error logs: `x86_64-linux`

kitty

    end_time = 499882.467813835
    msg = 'The condition was not met'
    q = <function ShellIntegration.test_fish_integration.<locals>.redrawn at 0x7fffcb236980>
    self = <kitty_tests.PTY object at 0x7fffcb0614f0>
    timeout = 10
    timeout_msg = None
TimeoutError: Timed out after 10 seconds: The condition was not met. Screen contents as repr:
'[?200_test_comp_path              <right\nok\nleft>echo $COLUMNS                <right\n\n\n\n\n\n\n\n\n\n\n\n\n'
Screen contents:
[?200_test_comp_path              <right
ok
left>echo $COLUMNS                <right

Ran 158 tests in 32.842s
FAILED (errors=2, skipped=2)

All Go tests succeeded, ran in 33.1 seconds

Error: Some tests failed!

make: *** [Makefile:16: test] Error 1

SigmaSquadron · 2025-11-10T16:36:46Z

I think we can ignore Kitty's failure. It probably just needs an update to fix the test.

adamcstephens

In general there's no need to use github's review request. The CI jobs will properly request review from the maintainers of a package.

pkgs/by-name/fi/fish/package.nix

adamcstephens · 2025-11-10T17:19:47Z

@rvolosatovs @Luflosi @kashw2 @leiserfg fyi this latest fish looks like it's going to break kitty tests. I did a quick look upstream but didn't see a fix yet.

alois31

This breaks fish_patched-completion-generator (from nixos/modules/programs/fish.nix) with the following error due to a file being gone:

Running phase: unpackPhase
@nix { "action": "setPhase", "phase": "unpackPhase" }
unpacking source archive /nix/store/yijnd98rbb77vx0ll37ajwfaalkvbrkk-fish-4.2.0/share/fish/tools/create_manpage_completions.py
unpacking source archive /nix/store/yijnd98rbb77vx0ll37ajwfaalkvbrkk-fish-4.2.0/share/fish/tools/deroff.py
cp: cannot stat '/nix/store/yijnd98rbb77vx0ll37ajwfaalkvbrkk-fish-4.2.0/share/fish/tools/deroff.py': No such file or directory
do not know how to unpack source archive /nix/store/yijnd98rbb77vx0ll37ajwfaalkvbrkk-fish-4.2.0/share/fish/tools/deroff.py

Some adjustment will be needed to not render the module essentially unusable.

lonerOrz · 2025-11-10T18:34:04Z

Running phase: unpackPhase
@nix { "action": "setPhase", "phase": "unpackPhase" }
unpacking source archive /nix/store/yijnd98rbb77vx0ll37ajwfaalkvbrkk-fish-4.2.0/share/fish/tools/create_manpage_completions.py
unpacking source archive /nix/store/yijnd98rbb77vx0ll37ajwfaalkvbrkk-fish-4.2.0/share/fish/tools/deroff.py
cp: cannot stat '/nix/store/yijnd98rbb77vx0ll37ajwfaalkvbrkk-fish-4.2.0/share/fish/tools/deroff.py': No such file or directory
do not know how to unpack source archive /nix/store/yijnd98rbb77vx0ll37ajwfaalkvbrkk-fish-4.2.0/share/fish/tools/deroff.py

The create_manpage_completions.py already includes deroff.py, so deroff.py is no longer needed separately.

adamcstephens · 2025-11-10T19:07:43Z

The tests are failing. If you run nix-build -A fish.tests you will likely see:

vm-test-run-fish-x86_64-linux> machine: output:
vm-test-run-fish-x86_64-linux> !!! Traceback (most recent call last):
vm-test-run-fish-x86_64-linux> !!!   File "<string>", line 4, in <module>
vm-test-run-fish-x86_64-linux> !!!     machine.succeed(
vm-test-run-fish-x86_64-linux> !!!
vm-test-run-fish-x86_64-linux> !!! RequestedAssertionFailed: command `fish -ic 'echo $fish_complete_path' | grep -q '/share/fish/completions /etc/fish/generated_completions /root/.cache/fish/generated_completions$'` failed (exit code 1)
vm-test-run-fish-x86_64-linux> cleanup
vm-test-run-fish-x86_64-linux> kill machine (pid 9)
vm-test-run-fish-x86_64-linux> qemu-system-x86_64: terminating on signal 15 from pid 6 (/nix/store/cfapjd2rvqrpry4grb0kljnp8bvnvfxz-python3-3.13.8/bin/python3.13)
vm-test-run-fish-x86_64-linux> kill vlan (pid 7)
vm-test-run-fish-x86_64-linux> (finished: cleanup, in 0.00 seconds)

leiserfg · 2025-11-10T19:41:58Z

this latest fish looks like it's going to break kitty tests. I did a quick look upstream but didn't see a fix yet.

What and where have you seen?

adamcstephens · 2025-11-10T19:49:32Z

What and where have you seen?

see logs in:
#460330 (comment)

leiserfg · 2025-11-11T06:25:46Z

What and where have you seen?

see logs in: #460330 (comment)

Kovid fixed it upstream, I think the patch can be added in this PR.

lonerOrz · 2025-11-11T09:23:25Z

The tests are failing. If you run nix-build -A fish.tests you will likely see:

vm-test-run-fish-x86_64-linux> machine: output:
vm-test-run-fish-x86_64-linux> !!! Traceback (most recent call last):
vm-test-run-fish-x86_64-linux> !!!   File "<string>", line 4, in <module>
vm-test-run-fish-x86_64-linux> !!!     machine.succeed(
vm-test-run-fish-x86_64-linux> !!!
vm-test-run-fish-x86_64-linux> !!! RequestedAssertionFailed: command `fish -ic 'echo $fish_complete_path' | grep -q '/share/fish/completions /etc/fish/generated_completions /root/.cache/fish/generated_completions$'` failed (exit code 1)
vm-test-run-fish-x86_64-linux> cleanup
vm-test-run-fish-x86_64-linux> kill machine (pid 9)
vm-test-run-fish-x86_64-linux> qemu-system-x86_64: terminating on signal 15 from pid 6 (/nix/store/cfapjd2rvqrpry4grb0kljnp8bvnvfxz-python3-3.13.8/bin/python3.13)
vm-test-run-fish-x86_64-linux> kill vlan (pid 7)
vm-test-run-fish-x86_64-linux> (finished: cleanup, in 0.00 seconds)

Perhaps we need to modify the test code; should /share/fish/completions be replaced with /share/fish/vendor_completions.d?
fish-shell/fish-shell@c409e81

leiserfg · 2025-11-11T10:09:52Z

@lonerOrz the patch is merged upstream already,IMHO it's better to use fetchpatch pointing to the commit instead of vendoring the patch file.

…release

pkgs/by-name/fi/fish/package.nix

jonhermansen · 2025-11-13T20:22:15Z

Not sure if it's just me, but some of the fish tests might be a bit flaky (no pun intended) on master branch

I didn't capture a log but somehow after a few nixos-rebuilds the problem went away, making me think there is either something wrong with my setup or the test suite

EDIT: Seems it was fixed in #461243 or #461265 and I must have updated my flake input around the time it was merged

lonerOrz requested review from r-vdp and wolfgangwalther and removed request for r-vdp November 10, 2025 12:21

This comment was marked as resolved.

Sign in to view

wolfgangwalther removed their request for review November 10, 2025 12:23

nixpkgs-ci bot requested review from SigmaSquadron, adamcstephens, cole-h, r-vdp and winterqt November 10, 2025 12:24

nixpkgs-ci bot added 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. labels Nov 10, 2025

SigmaSquadron approved these changes Nov 10, 2025

View reviewed changes

adamcstephens requested changes Nov 10, 2025

View reviewed changes

pkgs/by-name/fi/fish/package.nix Show resolved Hide resolved

fish: 4.1.2 -> 4.2.0

4f99d4b

lonerOrz force-pushed the update/fish branch from c00a6c1 to 4f99d4b Compare November 10, 2025 17:23

nixpkgs-ci bot removed the 2.status: merge-bot eligible This PR can be merged by commenting "@NixOS/nixpkgs-merge-bot merge". label Nov 10, 2025

alois31 suggested changes Nov 10, 2025

View reviewed changes

nixos/fish: Remove redundant deroff.py script

c74faa8

nixpkgs-ci bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Nov 10, 2025

lonerOrz force-pushed the update/fish branch from 7305bbb to c74faa8 Compare November 10, 2025 18:49

fish: Add lonerOrz to the maintainer list

454d683

leiserfg mentioned this pull request Nov 10, 2025

Fish integration tests timeout after latest fish release kovidgoyal/kitty#9211

Closed

nixpkgs-ci bot requested review from Luflosi, SigmaSquadron, adamcstephens, kashw2, leiserfg and rvolosatovs November 11, 2025 10:02

lonerOrz added 2 commits November 11, 2025 18:22

kitty: Fix timeout issue in Fish integration tests after recent Fish …

1c628eb

…release

test/fish: update fish_complete_path test for standalone mode

a92b1a2

lonerOrz force-pushed the update/fish branch from 671498e to a92b1a2 Compare November 11, 2025 10:22

leiserfg approved these changes Nov 11, 2025

View reviewed changes

nixpkgs-ci bot added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Nov 11, 2025

lonerOrz requested a review from alois31 November 12, 2025 05:38

adamcstephens approved these changes Nov 12, 2025

View reviewed changes

adamcstephens added this pull request to the merge queue Nov 12, 2025

Merged via the queue into NixOS:master with commit 26a29d1 Nov 12, 2025
30 of 32 checks passed

lonerOrz deleted the update/fish branch November 12, 2025 17:50

gravndal reviewed Nov 13, 2025

View reviewed changes

pkgs/by-name/fi/fish/package.nix Show resolved Hide resolved

Uh oh!

Conversation

lonerOrz commented Nov 10, 2025

Things done

Uh oh!

This comment was marked as resolved.

lonerOrz commented Nov 10, 2025

Uh oh!

DieracDelta commented Nov 10, 2025

nixpkgs-review result

x86_64-linux

Uh oh!

SigmaSquadron commented Nov 10, 2025

Uh oh!

adamcstephens left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

adamcstephens commented Nov 10, 2025

Uh oh!

alois31 left a comment

Choose a reason for hiding this comment

Uh oh!

lonerOrz commented Nov 10, 2025

Uh oh!

adamcstephens commented Nov 10, 2025

Uh oh!

leiserfg commented Nov 10, 2025

Uh oh!

adamcstephens commented Nov 10, 2025

Uh oh!

leiserfg commented Nov 11, 2025

Uh oh!

lonerOrz commented Nov 11, 2025

Uh oh!

leiserfg commented Nov 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jonhermansen commented Nov 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

`nixpkgs-review` result

`x86_64-linux`

leiserfg commented Nov 11, 2025 •

edited

Loading

jonhermansen commented Nov 13, 2025 •

edited

Loading