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 69aeee083d1c..f9d990784496 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3868,8 +3868,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 { };