From f959b4590f1684fe3ee63ff3fc3fbe3035b98c2d Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 01:38:29 +0700
Subject: [PATCH 1/2] python3Packages.bashlex: migrate to pyproject

---
 pkgs/development/python-modules/bashlex/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/bashlex/default.nix b/pkgs/development/python-modules/bashlex/default.nix
index fd319178e678..7086beb3092e 100644
--- a/pkgs/development/python-modules/bashlex/default.nix
+++ b/pkgs/development/python-modules/bashlex/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   python,
+  setuptools,
   pytestCheckHook,
 }:
 
@@ -10,7 +11,7 @@ buildPythonPackage rec {
   pname = "bashlex";
   version = "0.18";
 
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "idank";
@@ -19,6 +20,8 @@ buildPythonPackage rec {
     hash = "sha256-ddZN91H95RiTLXx4lpES1Dmz7nNsSVUeuFuOEpJ7LQI=";
   };
 
+  build-system = [ setuptools ];
+
   # workaround https://github.com/idank/bashlex/issues/51
   preBuild = ''
     ${python.pythonOnBuildForHost.interpreter} -c 'import bashlex'

From ad8b2eba951844e27b25b0fe5f6264fe10f2d442 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 01:40:28 +0700
Subject: [PATCH 2/2] python3Packages.bashlex: modernize

---
 pkgs/development/python-modules/bashlex/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/bashlex/default.nix b/pkgs/development/python-modules/bashlex/default.nix
index 7086beb3092e..9bbabfbc6e98 100644
--- a/pkgs/development/python-modules/bashlex/default.nix
+++ b/pkgs/development/python-modules/bashlex/default.nix
@@ -7,16 +7,18 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "bashlex";
   version = "0.18";
 
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "idank";
     repo = "bashlex";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-ddZN91H95RiTLXx4lpES1Dmz7nNsSVUeuFuOEpJ7LQI=";
   };
 
@@ -37,4 +39,4 @@ buildPythonPackage rec {
     homepage = "https://github.com/idank/bashlex";
     maintainers = with lib.maintainers; [ multun ];
   };
-}
+})