From 05f0a6e9be6f84a81901b753764d10d597723196 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 22 Sep 2025 23:47:38 +0200
Subject: [PATCH 1/2] qmake2cmake: 1.0.6 -> 1.0.7

---
 pkgs/tools/misc/qmake2cmake/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/qmake2cmake/default.nix b/pkgs/tools/misc/qmake2cmake/default.nix
index 1d2e6c49d487..aaac7c0dff25 100644
--- a/pkgs/tools/misc/qmake2cmake/default.nix
+++ b/pkgs/tools/misc/qmake2cmake/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "qmake2cmake";
-  version = "1.0.6";
+  version = "1.0.7";
   format = "setuptools";
 
   src = fetchgit {
     url = "https://codereview.qt-project.org/qt/qmake2cmake";
-    rev = "v${version}";
-    hash = "sha256-M5XVQ8MXo2Yxg5eZCho2YAGFtB0h++mEAg8NcQVuP/w=";
+    tag = "v${version}";
+    hash = "sha256-Y1HU4bNZY0b1C8HIX43AR24zoIyTEgkVXpnweEBlOYk=";
   };
 
   patches = [

From b1a51e5e45f01fda6eda67109a60e99c9bc6feec Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 27 Sep 2025 13:45:29 +0200
Subject: [PATCH 2/2] qmake2cmake: modernize

Co-authored-by: Nikolay Korotkiy <sikmir@disroot.org>
---
 pkgs/tools/misc/qmake2cmake/default.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/qmake2cmake/default.nix b/pkgs/tools/misc/qmake2cmake/default.nix
index aaac7c0dff25..99d9a8120c94 100644
--- a/pkgs/tools/misc/qmake2cmake/default.nix
+++ b/pkgs/tools/misc/qmake2cmake/default.nix
@@ -6,14 +6,16 @@
   platformdirs,
   portalocker,
   pyparsing,
+  setuptools,
   sympy,
   pytestCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "qmake2cmake";
   version = "1.0.7";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchgit {
     url = "https://codereview.qt-project.org/qt/qmake2cmake";
@@ -25,7 +27,9 @@ buildPythonPackage rec {
     ./fix-locations.patch
   ];
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     packaging
     platformdirs
     portalocker
@@ -35,16 +39,13 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
+    writableTmpDirAsHomeHook
   ];
 
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
-  meta = with lib; {
+  meta = {
     description = "Tool to convert qmake .pro files to CMakeLists.txt";
     homepage = "https://wiki.qt.io/Qmake2cmake";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ wegank ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ wegank ];
   };
 }