From 3e96a3f6b9460eade50777eba679adab6e09c79b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 14 Aug 2022 04:33:37 +0200 Subject: [PATCH] didyoumean: 1.1.0 -> 1.1.3 --- pkgs/tools/misc/didyoumean/default.nix | 36 +++++++++++++++++++++----- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/didyoumean/default.nix b/pkgs/tools/misc/didyoumean/default.nix index 3839d117afd..ecc9404d71c 100644 --- a/pkgs/tools/misc/didyoumean/default.nix +++ b/pkgs/tools/misc/didyoumean/default.nix @@ -2,32 +2,54 @@ , stdenv , rustPlatform , fetchFromGitHub +, installShellFiles +, pkg-config , libxcb -# Darwin dependencies +, openssl + # Darwin dependencies , AppKit }: rustPlatform.buildRustPackage rec { pname = "didyoumean"; - version = "1.1.0"; + version = "1.1.3"; src = fetchFromGitHub { owner = "hisbaan"; repo = "didyoumean"; rev = "v${version}"; - sha256 = "sha256-t2bmvz05vWIxQhC474q/9uky1kAQoFN8Z+qflw5Vj68="; + sha256 = "sha256-hHl9PGNDFN7Dad2JOlAy99dz0pC9OmphwYMJHBBwx7Y="; }; - cargoSha256 = "sha256-4DbziI9enib4pm9/P4WEu15glIxtejaV2GCqbzuxxyw="; + cargoSha256 = "sha256-rjkj9MO6fXVOk3fA87olGt/iIaJ8Zv/cy/Cqy/pg6yI="; - buildInputs = lib.optional stdenv.isLinux [ libxcb ] - ++ lib.optionals stdenv.isDarwin [ AppKit ]; + nativeBuildInputs = [ + installShellFiles + ] ++ lib.optionals stdenv.isLinux [ + pkg-config + ]; + + buildInputs = lib.optionals stdenv.isLinux [ + libxcb + openssl + ] ++ lib.optionals stdenv.isDarwin [ + AppKit + ]; + + postInstall = '' + installManPage man/dym.1 + installShellCompletion completions/dym.{bash,fish} + installShellCompletion --zsh completions/_dym + ''; + + # Clipboard doesn't exist in test environment + doCheck = false; meta = with lib; { description = "A CLI spelling corrector for when you're unsure"; homepage = "https://github.com/hisbaan/didyoumean"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ evanjs ]; + maintainers = with maintainers; [ evanjs wegank ]; mainProgram = "dym"; }; }