From 3c35d9c5660883b188fa723b4edf9f38a0fc7390 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Fri, 26 Dec 2025 09:57:53 -0500
Subject: [PATCH] thinkpad-scripts: migrate to by-name, modernize

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 .../th/thinkpad-scripts/package.nix}          | 19 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 12 insertions(+), 9 deletions(-)
 rename pkgs/{tools/misc/thinkpad-scripts/default.nix => by-name/th/thinkpad-scripts/package.nix} (60%)

diff --git a/pkgs/tools/misc/thinkpad-scripts/default.nix b/pkgs/by-name/th/thinkpad-scripts/package.nix
similarity index 60%
rename from pkgs/tools/misc/thinkpad-scripts/default.nix
rename to pkgs/by-name/th/thinkpad-scripts/package.nix
index 605e35f9c5af..1d37b8f016dc 100644
--- a/pkgs/tools/misc/thinkpad-scripts/default.nix
+++ b/pkgs/by-name/th/thinkpad-scripts/package.nix
@@ -1,23 +1,28 @@
 {
   lib,
-  buildPythonPackage,
+  python3Packages,
   fetchFromGitHub,
-  setuptools,
 }:
 
-buildPythonPackage rec {
+python3Packages.buildPythonPackage rec {
   pname = "thinkpad-scripts";
   version = "4.12.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "martin-ueding";
     repo = "thinkpad-scripts";
-    rev = "v${version}";
-    sha256 = "08adx8r5pwwazbnfahay42l5f203mmvcn2ipz5hg8myqc9jxm2ky";
+    tag = "v${version}";
+    hash = "sha256-foraZWLYV/Rg+TcKy3atAwhXqCBeQeXs+orzWzLqTSE=";
   };
 
-  propagatedBuildInputs = [ setuptools ];
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
+    setuptools
+  ];
 
   meta = {
     description = "Screen rotation, docking and other scripts for ThinkPad® X220 and X230 Tablet";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 02ee980f3aab..04eaa6a172da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3863,8 +3863,6 @@ with pkgs;
 
   texworks = qt6Packages.callPackage ../applications/editors/texworks { };
 
-  thinkpad-scripts = python3.pkgs.callPackage ../tools/misc/thinkpad-scripts { };
-
   tiled = libsForQt5.callPackage ../applications/editors/tiled { };
 
   tinc = callPackage ../tools/networking/tinc { };