From 71c1b60da5986c855b8b225e92a50cd3aa858e77 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Jul 2026 21:21:01 +0000
Subject: [PATCH 1/2] jimtcl: 0.82 -> 0.84

---
 pkgs/by-name/ji/jimtcl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ji/jimtcl/package.nix b/pkgs/by-name/ji/jimtcl/package.nix
index 73e0d6e568a6..e551e07e3308 100644
--- a/pkgs/by-name/ji/jimtcl/package.nix
+++ b/pkgs/by-name/ji/jimtcl/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jimtcl";
-  version = "0.82";
+  version = "0.84";
 
   src = fetchFromGitHub {
     owner = "msteveb";
     repo = "jimtcl";
     rev = finalAttrs.version;
-    sha256 = "sha256-CDjjrxpoTbLESAbCiCjQ8+E/oJP87gDv9SedQOzH3QY=";
+    sha256 = "sha256-MvsC82PMmh7PP1sXNwZRNDNFU7r5LWRA6YqvuvZ9yZE=";
   };
 
   nativeBuildInputs = [

From 750770bcfe61cc544ed2275af3c6c6974d05cc21 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Fri, 17 Jul 2026 11:33:21 +0200
Subject: [PATCH 2/2] openocd: use jimtcl 0.82

---
 pkgs/by-name/op/openocd/package.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openocd/package.nix b/pkgs/by-name/op/openocd/package.nix
index e8fdd29854b7..8f71e54961a8 100644
--- a/pkgs/by-name/op/openocd/package.nix
+++ b/pkgs/by-name/op/openocd/package.nix
@@ -17,10 +17,19 @@
   extraHardwareSupport ? [ ],
 }:
 let
-
   isWindows = stdenv.hostPlatform.isWindows;
   notWindows = !isWindows;
 
+  # OpenOCD needs JimTcl 0.82 and fails to build with the latest version (0.84).
+  # When updating OpenOCD, check which JimTcl version its jimtcl submodule uses.
+  jimtcl_0_82 = jimtcl.overrideAttrs (oldAttrs: rec {
+    version = "0.82";
+    src = oldAttrs.src.override {
+      rev = version;
+      sha256 = "sha256-CDjjrxpoTbLESAbCiCjQ8+E/oJP87gDv9SedQOzH3QY=";
+    };
+  });
+
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "openocd";
@@ -40,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals notWindows [
     hidapi
-    jimtcl
+    jimtcl_0_82
     libftdi1
     libjaylink
   ]