From 64acf1a48510e6e39225b20ea84ccccc57c6923a Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Fri, 6 Feb 2026 09:14:42 -0600 Subject: [PATCH] qmake2cmake: migrate to by-name --- .../qm}/qmake2cmake/fix-locations.patch | 0 .../qm/qmake2cmake/package.nix} | 25 +++++++------------ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 9 insertions(+), 18 deletions(-) rename pkgs/{tools/misc => by-name/qm}/qmake2cmake/fix-locations.patch (100%) rename pkgs/{tools/misc/qmake2cmake/default.nix => by-name/qm/qmake2cmake/package.nix} (70%) diff --git a/pkgs/tools/misc/qmake2cmake/fix-locations.patch b/pkgs/by-name/qm/qmake2cmake/fix-locations.patch similarity index 100% rename from pkgs/tools/misc/qmake2cmake/fix-locations.patch rename to pkgs/by-name/qm/qmake2cmake/fix-locations.patch diff --git a/pkgs/tools/misc/qmake2cmake/default.nix b/pkgs/by-name/qm/qmake2cmake/package.nix similarity index 70% rename from pkgs/tools/misc/qmake2cmake/default.nix rename to pkgs/by-name/qm/qmake2cmake/package.nix index f81f93f11d5c..139e55abb42c 100644 --- a/pkgs/tools/misc/qmake2cmake/default.nix +++ b/pkgs/by-name/qm/qmake2cmake/package.nix @@ -1,18 +1,11 @@ { lib, - buildPythonPackage, + python3Packages, fetchgit, - packaging, - platformdirs, - portalocker, - pyparsing, - setuptools, - sympy, - pytestCheckHook, writableTmpDirAsHomeHook, }: -buildPythonPackage { +python3Packages.buildPythonPackage { pname = "qmake2cmake"; version = "1.0.8"; pyproject = true; @@ -28,18 +21,18 @@ buildPythonPackage { ./fix-locations.patch ]; - build-system = [ setuptools ]; + build-system = [ python3Packages.setuptools ]; dependencies = [ - packaging - platformdirs - portalocker - pyparsing - sympy + python3Packages.packaging + python3Packages.platformdirs + python3Packages.portalocker + python3Packages.pyparsing + python3Packages.sympy ]; nativeCheckInputs = [ - pytestCheckHook + python3Packages.pytestCheckHook writableTmpDirAsHomeHook ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c516d2d0e4a2..e1504c640c65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12779,8 +12779,6 @@ with pkgs; waylandSupport = true; }; - qmake2cmake = python3Packages.callPackage ../tools/misc/qmake2cmake { }; - sail-riscv = callPackage ../applications/virtualization/sail-riscv { inherit (ocamlPackages) sail; };