diff --git a/pkgs/applications/editors/zee/default.nix b/pkgs/applications/editors/zee/default.nix index 43c63bb95260..8d9a9f0c382f 100644 --- a/pkgs/applications/editors/zee/default.nix +++ b/pkgs/applications/editors/zee/default.nix @@ -4,21 +4,21 @@ fetchFromGitHub, pkg-config, openssl, - stdenv, - Security, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "zee"; version = "0.3.2"; src = fetchFromGitHub { owner = "zee-editor"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-/9SogKOaXdFDB+e0//lrenTTbfmXqNFGr23L+6Pnm8w="; + repo = "zee"; + tag = "v${finalAttrs.version}"; + hash = "sha256-/9SogKOaXdFDB+e0//lrenTTbfmXqNFGr23L+6Pnm8w="; }; + cargoHash = "sha256-auwbpavF/WZQIE/htYXJ4di6xoRtXkBBkP/Bj4lFp6U="; + cargoPatches = [ # fixed upstream but unreleased ./update-ropey-for-rust-1.65.diff @@ -26,21 +26,18 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; + buildInputs = [ openssl ]; # disable downloading and building the tree-sitter grammars at build time # grammars can be configured in a config file and installed with `zee --build` # see https://github.com/zee-editor/zee#syntax-highlighting - ZEE_DISABLE_GRAMMAR_BUILD = 1; + env.ZEE_DISABLE_GRAMMAR_BUILD = 1; - useFetchCargoVendor = true; - cargoHash = "sha256-auwbpavF/WZQIE/htYXJ4di6xoRtXkBBkP/Bj4lFp6U="; - - meta = with lib; { + meta = { description = "Modern text editor for the terminal written in Rust"; homepage = "https://github.com/zee-editor/zee"; - license = licenses.mit; - maintainers = with maintainers; [ booklearner ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ booklearner ]; mainProgram = "zee"; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 548a6291147d..36d07a6f5e41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3295,9 +3295,7 @@ with pkgs; xkcdpass = with python3Packages; toPythonApplication xkcdpass; - zee = callPackage ../applications/editors/zee { - inherit (darwin.apple_sdk.frameworks) Security; - }; + zee = callPackage ../applications/editors/zee { }; zeek = darwin.apple_sdk_11_0.callPackage ../applications/networking/ids/zeek { };