diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-01-22 15:26:58 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-01-22 16:56:33 +0000 |
| commit | 542f80867c380b0ac79250b6e5358dda8bc49e0d (patch) | |
| tree | aa5903f228b2f32c524a9a6e4f6dd94f8c5b869e /nixpkgs/pkgs/shells/fish | |
| parent | f69898c7d5b757342e6ab90d5fcc7c9aea9f5ff4 (diff) | |
| parent | 90441b4b47fc7280de6a5bd1a228017caaa0f97f (diff) | |
| download | nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar.gz nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar.bz2 nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar.lz nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar.xz nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar.zst nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.zip | |
Merge commit '90441b4b47fc7280de6a5bd1a228017caaa0f97f'
Diffstat (limited to 'nixpkgs/pkgs/shells/fish')
| -rw-r--r-- | nixpkgs/pkgs/shells/fish/default.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/shells/fish/default.nix b/nixpkgs/pkgs/shells/fish/default.nix index 1ef3c4b6fd9a..5f59c33af0d1 100644 --- a/nixpkgs/pkgs/shells/fish/default.nix +++ b/nixpkgs/pkgs/shells/fish/default.nix @@ -3,6 +3,7 @@ groff, man-db, getent, libiconv, pcre2, gettext, ncurses, python3, cmake + , fetchpatch , writeText @@ -107,6 +108,15 @@ let patchShebangs ./build_tools/git_version_gen.sh ''; + patches = [ + # Fixes "Integer 243 in '243 (243)' followed by non-digit" error with systemctl completion. + # https://github.com/fish-shell/fish-shell/issues/5689 (will be included in fish 3.1.0) + (fetchpatch { + url = "https://github.com/fish-shell/fish-shell/commit/c6ec4235136e82c709e8d7b455f7c463f9714b48.patch"; + sha256 = "02m6pkhhx6y21csydznsxkbpnwhcpzyz99xgd9ryh7s03v7wbigw"; + }) + ]; + # Required binaries during execution # Python: Autocompletion generated from manpages and config editing propagatedBuildInputs = [ |