From 24904702aed780acef448b365e14cd111d7c9d71 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 10 Jun 2026 18:55:35 +0200
Subject: [PATCH 1/4] restish: 2.0.0 -> 2.2.0

Changelog: https://github.com/danielgtaylor/restish/releases/tag/v2.2.0
---
 pkgs/by-name/re/restish/package.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/restish/package.nix b/pkgs/by-name/re/restish/package.nix
index b078977cc0e6..48a05b97591a 100644
--- a/pkgs/by-name/re/restish/package.nix
+++ b/pkgs/by-name/re/restish/package.nix
@@ -14,16 +14,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "restish";
-  version = "2.0.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "danielgtaylor";
     repo = "restish";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4piN0W/9y2NTsTuZ2B4Czhr9RQNb4eT9ZIX9MYzfMLI=";
+    hash = "sha256-wGchbKSEbzr1vQlYWgUTubA1xQVcxq7iyRUIuWqVL0Y=";
   };
 
-  vendorHash = "sha256-ZRyGCdmPenOeLtFuj0howJH0rah05sPUuD7RH/c0LKI=";
+  vendorHash = "sha256-Y0GwgrkD09WAlmyI6Oe3Kw6L62E7QRTCIThZGXbbn74=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     libx11
@@ -39,6 +39,11 @@ buildGoModule (finalAttrs: {
     "-X=main.version=${finalAttrs.version}"
   ];
 
+  checkFlags = [
+    # Test requires network access  
+    "-skip=TestAPISyncDiscoveryDoesNotSendAuthToCrossOriginLinkSpec"
+  ];
+
   preCheck = ''
     export HOME=$(mktemp -d)
   '';

From 68b52767f3da51bfe70e800675fd4c3f5e913651 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 10 Jun 2026 19:06:15 +0200
Subject: [PATCH 2/4] restish: migrate to versionCheckHook

---
 pkgs/by-name/re/restish/package.nix | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/re/restish/package.nix b/pkgs/by-name/re/restish/package.nix
index 48a05b97591a..b346745d69d0 100644
--- a/pkgs/by-name/re/restish/package.nix
+++ b/pkgs/by-name/re/restish/package.nix
@@ -3,13 +3,12 @@
   stdenv,
   buildGoModule,
   fetchFromGitHub,
-  restish,
-  testers,
-  libxrandr,
+  libx11,
+  libxcursor,
   libxi,
   libxinerama,
-  libxcursor,
-  libx11,
+  libxrandr,
+  versionCheckHook,
 }:
 
 buildGoModule (finalAttrs: {
@@ -33,25 +32,24 @@ buildGoModule (finalAttrs: {
     libxrandr
   ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   ldflags = [
     "-s"
     "-w"
-    "-X=main.version=${finalAttrs.version}"
+    "-X=github.com/rest-sh/restish/v2/internal/cli.Version=${finalAttrs.version}"
   ];
 
   checkFlags = [
-    # Test requires network access  
-    "-skip=TestAPISyncDiscoveryDoesNotSendAuthToCrossOriginLinkSpec"
+    # Test requires network access and test with hard-coded version '2.0.0'
+    "-skip=TestAPISyncDiscoveryDoesNotSendAuthToCrossOriginLinkSpec|TestVersion$|TestVersionCommand"
   ];
 
   preCheck = ''
     export HOME=$(mktemp -d)
   '';
 
-  passthru.tests.version = testers.testVersion {
-    package = restish;
-    command = "HOME=$(mktemp -d) restish --version";
-  };
+  doInstallCheck = true;
 
   meta = {
     description = "CLI tool for interacting with REST-ish HTTP APIs";

From d02f15c65a0fd2c08e2817514f585e9ddc6a26b8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 10 Jun 2026 19:10:24 +0200
Subject: [PATCH 3/4] restish: migrate to writableTmpDirAsHomeHook

---
 pkgs/by-name/re/restish/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/re/restish/package.nix b/pkgs/by-name/re/restish/package.nix
index b346745d69d0..e414005d21d6 100644
--- a/pkgs/by-name/re/restish/package.nix
+++ b/pkgs/by-name/re/restish/package.nix
@@ -9,6 +9,7 @@
   libxinerama,
   libxrandr,
   versionCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 
 buildGoModule (finalAttrs: {
@@ -32,7 +33,10 @@ buildGoModule (finalAttrs: {
     libxrandr
   ];
 
-  nativeInstallCheckInputs = [ versionCheckHook ];
+  nativeInstallCheckInputs = [
+    versionCheckHook
+    writableTmpDirAsHomeHook
+  ];
 
   ldflags = [
     "-s"
@@ -45,10 +49,6 @@ buildGoModule (finalAttrs: {
     "-skip=TestAPISyncDiscoveryDoesNotSendAuthToCrossOriginLinkSpec|TestVersion$|TestVersionCommand"
   ];
 
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
   doInstallCheck = true;
 
   meta = {

From f417dc852622cfbfaf3c3f6aaf695f94d0b0d37e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 10 Jun 2026 19:23:43 +0200
Subject: [PATCH 4/4] restish: modernize

---
 pkgs/by-name/re/restish/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/restish/package.nix b/pkgs/by-name/re/restish/package.nix
index e414005d21d6..4201f4ae9d40 100644
--- a/pkgs/by-name/re/restish/package.nix
+++ b/pkgs/by-name/re/restish/package.nix
@@ -16,6 +16,8 @@ buildGoModule (finalAttrs: {
   pname = "restish";
   version = "2.2.0";
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "danielgtaylor";
     repo = "restish";
@@ -40,7 +42,6 @@ buildGoModule (finalAttrs: {
 
   ldflags = [
     "-s"
-    "-w"
     "-X=github.com/rest-sh/restish/v2/internal/cli.Version=${finalAttrs.version}"
   ];
 
@@ -54,7 +55,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "CLI tool for interacting with REST-ish HTTP APIs";
     homepage = "https://rest.sh/";
-    changelog = "https://github.com/danielgtaylor/restish/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/danielgtaylor/restish/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "restish";