fish: 4.7.0 -> 4.7.1

[ddogfoodd]

Changelog: https://github.com/fish-shell/fish-shell/releases/tag/4.7.1
Diff: fish-shell/fish-shell@4.7.0...4.7.1

Things done

• Built on platform:
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• Tested, as applicable:
  • NixOS tests in nixos/tests.
  • Package tests at passthru.tests.
  • Tests in lib/tests or pkgs/test for functions and "core" functionality.
• Ran nixpkgs-review on this PR. See nixpkgs-review usage.
• Tested basic functionality of all binary files, usually in ./result/bin/.
• Nixpkgs Release Notes
  • Package update: when the change is major or breaking.
• NixOS Release Notes
  • Module addition: when adding a new NixOS module.
  • Module update: when the change is significant.
• Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

[cole-h]

The 4.7.0 update went directly to master, so I think this one is probably safe to do the same? #517366

I don't mind too much, but I think most of the rebuilds are caused by needing to rebuild neovim because of tests (at least, that's what was mentioned in that prior PR).

[winterqt]

We should probably think about skipping the fish tests for nvim.

[winterqt]

Let's send this to master.

(Also, just fwiw, staging-nixos wouldn't be the right place for this, either.)

[nixpkgs-branch-check]

The PR's base branch is set to master, but 7 commits from the staging-nixos branch are included. Make sure you know the right base branch for your changes, then:

• If the changes should go to the staging-nixos branch, change the base branch.
• If the changes should go to the master branch, rebase your PR onto the correct merge-base:

  # git rebase --onto $(git merge-base upstream/master HEAD) $(git merge-base upstream/staging-nixos HEAD)
  git rebase --onto 2dcd9a3fb47210b2fff8350496b7c3fee7007da0 622ac2c5622e73a1f66142f81b74bea481c48c1e
  git push --force-with-lease

[ddogfoodd]

Alright will re-open on master. How do I skip the nvim tests?

[r-vdp]

You can just rebase and retarget this PR, fwiw.

You can remove the 7 extra commits with an interactive rebase.