diff --git a/pkgs/by-name/ta/tailspin/package.nix b/pkgs/by-name/ta/tailspin/package.nix index df4bee0faadd..922f0f984cf0 100644 --- a/pkgs/by-name/ta/tailspin/package.nix +++ b/pkgs/by-name/ta/tailspin/package.nix @@ -3,6 +3,7 @@ rustPlatform, fetchFromGitHub, installShellFiles, + procps, stdenv, versionCheckHook, nix-update-script, @@ -10,23 +11,27 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tailspin"; - version = "6.1.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "bensadeh"; repo = "tailspin"; tag = finalAttrs.version; - hash = "sha256-9+uu9q9tGIWFnyYpy+HHD5UUCsxUDLRlZlo0Ap4ezsY="; + hash = "sha256-RI604v8ImQSgvNUGsnCLe6FuzEMJwE0tNVuFLmJLwvM="; }; - cargoHash = "sha256-C3OORW5aeDrRDTlfvRNW3RLE0p8wFs1qbIKl/XpzThs="; + cargoHash = "sha256-kcd6rBoonoCKuybVIVtZqt+njHFhVDTjTyF2UURuOSI="; nativeBuildInputs = [ installShellFiles ]; - postPatch = '' - substituteInPlace tests/utils.rs --replace-fail \ - 'target/debug' "target/${stdenv.hostPlatform.rust.rustcTargetSpec}/$cargoCheckType" - ''; + nativeCheckInputs = [ procps ]; + checkFlags = lib.optionals (!(stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isCygwin)) [ + # Requires pgrep, which is not provided by procps on non-Linux systems + "--skip=failing_pager_spawn_kills_the_exec_child" + "--skip=pager_killed_by_ctrl_c_is_a_quiet_quit" + "--skip=quitting_the_pager_kills_the_exec_child" + "--skip=stream_error_while_paging_kills_the_pager" + ]; postInstall = '' installShellCompletion completions/tspin.{bash,fish,zsh}