From f5ac1c66f05f76fac6847452bc6346af71287faa Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Fri, 30 Oct 2020 12:13:25 -0700 Subject: [PATCH] zoxide: 0.4.3 -> 0.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/ajeetdsouza/zoxide/compare/v0.4.3...v0.5.0 Tests are disabled on darwin because they fail and I can't troubleshoot (since I don't have a darwin system). Co-authored-by: Sandro Jäckel --- pkgs/tools/misc/zoxide/default.nix | 32 +++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix index 3e4cbfd84334..c5ca2965e9dd 100644 --- a/pkgs/tools/misc/zoxide/default.nix +++ b/pkgs/tools/misc/zoxide/default.nix @@ -1,11 +1,20 @@ { lib +, stdenv , fetchFromGitHub , rustPlatform , withFzf ? true , fzf + + # checkInputs +, fish +, powershell +, shellcheck +, shfmt +, xonsh +, zsh }: let - version = "0.4.3"; + version = "0.5.0"; in rustPlatform.buildRustPackage { pname = "zoxide"; @@ -15,15 +24,32 @@ rustPlatform.buildRustPackage { owner = "ajeetdsouza"; repo = "zoxide"; rev = "v${version}"; - sha256 = "1ghdal6pqkp56rqawhj26ch1x4cvnjj032xz3626aiddqgn134zj"; + sha256 = "143lh94mw31pm9q7ib63h2k842g3h222mdabhf25hpb19lka2w5y"; }; + # tests are broken on darwin + doCheck = !stdenv.isDarwin; + + # fish needs a writable HOME for whatever reason + preCheck = '' + export HOME=$(mktemp -d) + ''; + + checkInputs = [ + fish + powershell + shellcheck + shfmt + xonsh + zsh + ]; + postPatch = lib.optionalString withFzf '' substituteInPlace src/fzf.rs \ --replace '"fzf"' '"${fzf}/bin/fzf"' ''; - cargoSha256 = "0klnjmda77bq9i9f0rz48jzaw4rcf7hafcjjpb0i570d7hlxnwsr"; + cargoSha256 = "05mp101yk1zkjj1gwbkldizq6f9f8089gqgvq42c4ngq88pc7v9a"; meta = with lib; { description = "A fast cd command that learns your habits";