diff --git a/pkgs/applications/editors/zee/default.nix b/pkgs/applications/editors/zee/default.nix index 9442044a16971..8de11fd5d59c2 100644 --- a/pkgs/applications/editors/zee/default.nix +++ b/pkgs/applications/editors/zee/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, Security }: +{ lib, rustPlatform, fetchFromGitHub, fetchpatch, pkg-config, openssl, stdenv, Security }: rustPlatform.buildRustPackage rec { pname = "zee"; @@ -11,6 +11,11 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-/9SogKOaXdFDB+e0//lrenTTbfmXqNFGr23L+6Pnm8w="; }; + cargoPatches = [ + # fixed upstream but unreleased + ./update-ropey-for-rust-1.65.diff + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; @@ -20,7 +25,7 @@ rustPlatform.buildRustPackage rec { # see https://github.com/zee-editor/zee#syntax-highlighting ZEE_DISABLE_GRAMMAR_BUILD=1; - cargoSha256 = "sha256-mbqI1csnU95VWgax4GjIxB+nhMtmpaeJ8QQ3qb0hY4c="; + cargoHash = "sha256-fBBjtjM7AnyAL6EOFstL4h6yS+UoLgxck6Mc0tJcXaI="; meta = with lib; { description = "A modern text editor for the terminal written in Rust"; diff --git a/pkgs/applications/editors/zee/update-ropey-for-rust-1.65.diff b/pkgs/applications/editors/zee/update-ropey-for-rust-1.65.diff new file mode 100644 index 0000000000000..edc3f6baa4b70 --- /dev/null +++ b/pkgs/applications/editors/zee/update-ropey-for-rust-1.65.diff @@ -0,0 +1,28 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 7159c28..0fa43c2 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1248,9 +1248,9 @@ dependencies = [ + + [[package]] + name = "ropey" +-version = "1.4.1" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fa0dd9b26e2a102b33d400b7b7d196c81a4014eb96eda90b1c5b48d7215d9633" ++checksum = "bbd22239fafefc42138ca5da064f3c17726a80d2379d817a3521240e78dd0064" + dependencies = [ + "smallvec", + "str_indices", +@@ -1408,9 +1408,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + + [[package]] + name = "str_indices" +-version = "0.3.2" ++version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "adfad63a1b47951101cd667a85b2959a62910cf03f814fff25df89c460b873f8" ++checksum = "9d9199fa80c817e074620be84374a520062ebac833f358d74b37060ce4a0f2c0" + + [[package]] + name = "strsim"