Skip to content

Commit 771019b

Browse files
committed
1 parent 161fe1a commit 771019b

File tree

1 file changed

+3
-16
lines changed

1 file changed

+3
-16
lines changed

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

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
stdenv,
33
lib,
44
fetchFromGitHub,
5-
fetchpatch2,
65
coreutils,
76
darwin,
87
glibcLocales,
@@ -153,13 +152,13 @@ let
153152
in
154153
stdenv.mkDerivation (finalAttrs: {
155154
pname = "fish";
156-
version = "4.0.0";
155+
version = "4.0.1";
157156

158157
src = fetchFromGitHub {
159158
owner = "fish-shell";
160159
repo = "fish-shell";
161160
tag = finalAttrs.version;
162-
hash = "sha256-BLbL5Tj3FQQCOeX5TWXMaxCpvdzZtKe5dDQi66uU/BM=";
161+
hash = "sha256-Mj4v2ubYr4ufs7aU/1AdY239byiCJHKXam64af/VO3U=";
163162
};
164163

165164
env = {
@@ -170,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: {
170169

171170
cargoDeps = rustPlatform.fetchCargoVendor {
172171
inherit (finalAttrs) src patches;
173-
hash = "sha256-4ol4LvabhtjiMMWwV1wrcywFePOmU0Jub1sy+Ay7mLA=";
172+
hash = "sha256-4kqBrpeneCpF0WohP1ZArKrV3duHAE01XA5+GT9f56w=";
174173
};
175174

176175
patches = [
@@ -189,18 +188,6 @@ stdenv.mkDerivation (finalAttrs: {
189188
# * <https://github.com/LnL7/nix-darwin/issues/122>
190189
# * <https://github.com/fish-shell/fish-shell/issues/7142>
191190
./nix-darwin-path.patch
192-
193-
(fetchpatch2 {
194-
name = "cargo_version.diff";
195-
url = "https://github.com/fish-shell/fish-shell/commit/1e069b0fff20b153bc7f824f9f9b820ca4117e1e.diff?full_index=1";
196-
hash = "sha256-XFJ0fT2Zanvdqt/iwgyH2IA/kIOcOHMNdsmuzjTX5qs=";
197-
})
198-
199-
# Fixes a build issue in kitty, see https://github.com/fish-shell/fish-shell/commit/97f0809b62a1fa77df1b9fcbbfe623b6187b5013
200-
# The first patch is needed since it introduces the BufferedOutputter type that's
201-
# used by the second one.
202-
./reduce_writes.patch
203-
./osc_133.patch
204191
];
205192

206193
# Fix FHS paths in tests

0 commit comments

Comments
 (0)