Unverified Commit 3c6c737f authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

zee: modernize, move to by-name (#400236)

parents c033e938 8c785010
Loading
Loading
Loading
Loading
+12 −15
Original line number Diff line number Diff line
@@ -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;

  useFetchCargoVendor = true;
  cargoHash = "sha256-auwbpavF/WZQIE/htYXJ4di6xoRtXkBBkP/Bj4lFp6U=";
  env.ZEE_DISABLE_GRAMMAR_BUILD = 1;

  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";
  };
}
})
+0 −4
Original line number Diff line number Diff line
@@ -3276,10 +3276,6 @@ with pkgs;
  xkcdpass = with python3Packages; toPythonApplication xkcdpass;
  zee = callPackage ../applications/editors/zee {
    inherit (darwin.apple_sdk.frameworks) Security;
  };
  zeek = darwin.apple_sdk_11_0.callPackage ../applications/networking/ids/zeek { };
  zonemaster-cli = perlPackages.ZonemasterCLI;