From ca78a3ad06590ce3f9fe565456f184947a3c8db6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 5 Jul 2026 18:01:52 -0700
Subject: [PATCH 1/2] esptool: 5.3.0 -> 5.3.1

Diff: https://github.com/espressif/esptool/compare/v5.3.0...v5.3.1

Changelog: https://github.com/espressif/esptool/blob/v5.3.1/CHANGELOG.md
---
 pkgs/by-name/es/esptool/package.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/es/esptool/package.nix b/pkgs/by-name/es/esptool/package.nix
index 6480217bb0a1..ad28a37876d6 100644
--- a/pkgs/by-name/es/esptool/package.nix
+++ b/pkgs/by-name/es/esptool/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  addBinToPathHook,
   fetchFromGitHub,
   python3Packages,
   softhsm,
@@ -8,14 +9,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "esptool";
-  version = "5.3.0";
+  version = "5.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "espressif";
     repo = "esptool";
     tag = "v${version}";
-    hash = "sha256-NRfXLf8u35/9RD1QxEuV06K3h030qXj5GM+QjvLC6FM=";
+    hash = "sha256-oHQ6rkMnzvjtP/dg+tyc7Dw+D/WuWDqRwqePKBBnjCw=";
   };
 
   postPatch = ''
@@ -77,6 +78,7 @@ python3Packages.buildPythonApplication rec {
   nativeCheckInputs =
     with python3Packages;
     [
+      addBinToPathHook
       pyelftools
       pytestCheckHook
       requests
@@ -84,10 +86,6 @@ python3Packages.buildPythonApplication rec {
     ]
     ++ lib.concatAttrValues optional-dependencies;
 
-  preCheck = ''
-    export PATH="$out/bin:$PATH"
-  '';
-
   pytestFlags = [
     "-m"
     "host_test"
@@ -102,12 +100,10 @@ python3Packages.buildPythonApplication rec {
     "test_esp_rfc2217_server_py"
   ];
 
-  postCheck = ''
+  preCheck = ''
     export SOFTHSM2_CONF=$(mktemp)
     echo "directories.tokendir = $(mktemp -d)" > "$SOFTHSM2_CONF"
     ./ci/setup_softhsm2.sh
-
-    pytest test/test_espsecure_hsm.py
   '';
 
   meta = {

From a920d2f1fae56782476df5c0a79d041852b29824 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 5 Jul 2026 18:05:16 -0700
Subject: [PATCH 2/2] esptool: use finalAttrs

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

diff --git a/pkgs/by-name/es/esptool/package.nix b/pkgs/by-name/es/esptool/package.nix
index ad28a37876d6..a431be78c64f 100644
--- a/pkgs/by-name/es/esptool/package.nix
+++ b/pkgs/by-name/es/esptool/package.nix
@@ -7,7 +7,7 @@
   installShellFiles,
 }:
 
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "esptool";
   version = "5.3.1";
   pyproject = true;
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "espressif";
     repo = "esptool";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-oHQ6rkMnzvjtP/dg+tyc7Dw+D/WuWDqRwqePKBBnjCw=";
   };
 
@@ -84,7 +84,7 @@ python3Packages.buildPythonApplication rec {
       requests
       softhsm
     ]
-    ++ lib.concatAttrValues optional-dependencies;
+    ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
 
   pytestFlags = [
     "-m"
@@ -107,7 +107,7 @@ python3Packages.buildPythonApplication rec {
   '';
 
   meta = {
-    changelog = "https://github.com/espressif/esptool/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/espressif/esptool/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     description = "ESP8266 and ESP32 serial bootloader utility";
     homepage = "https://github.com/espressif/esptool";
     license = lib.licenses.gpl2Plus;
@@ -117,4 +117,4 @@ python3Packages.buildPythonApplication rec {
     platforms = with lib.platforms; linux ++ darwin;
     mainProgram = "esptool";
   };
-}
+})