From 04c6d45ed92719fe7d7b12753b5f65f7295db247 Mon Sep 17 00:00:00 2001
From: brudel <brudel13742@gmail.com>
Date: Wed, 2 Sep 2026 00:35:00 -0300
Subject: [PATCH] tailspin: 6.1.0 -> 7.0.0

https://github.com/bensadeh/tailspin/blob/7.0.0/CHANGELOG.md

Also:
- Drop the postPatch that rewrote tests/utils.rs's hardcoded
  target/debug path. That file is gone upstream; tests now locate
  the binary via Cargo's CARGO_BIN_EXE_tspin, which is target-triple
  aware, so the workaround is obsolete.
- Add procps to nativeCheckInputs: new e2e tests in this release
  supervise the pager subprocess via pgrep/kill, which requires
  procps to be on PATH during the check phase.
- Skip four of those e2e tests on non-Linux/Cygwin via checkFlags:
  they depend on pgrep, which procps doesn't provide there. The
  program itself works fine on Darwin, confirmed in review.
  (per review from @abus-sh)

Assisted-by: Claude Sonnet 5
---
 pkgs/by-name/ta/tailspin/package.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ta/tailspin/package.nix b/pkgs/by-name/ta/tailspin/package.nix
index df4bee0faadd0..922f0f984cf06 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}