From 4ed0dee987dc3039f8d0c2fc8a9ef53ba1e58ad4 Mon Sep 17 00:00:00 2001
From: Daniel Albert <git@esclear.de>
Date: Sat, 10 May 2025 02:35:21 +0200
Subject: [PATCH 1/2] pgmodeler: move to by-name

---
 .../pg/pgmodeler/package.nix}                     | 15 +++++++--------
 pkgs/top-level/all-packages.nix                   |  2 --
 2 files changed, 7 insertions(+), 10 deletions(-)
 rename pkgs/{applications/misc/pgmodeler/default.nix => by-name/pg/pgmodeler/package.nix} (92%)

diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/by-name/pg/pgmodeler/package.nix
similarity index 92%
rename from pkgs/applications/misc/pgmodeler/default.nix
rename to pkgs/by-name/pg/pgmodeler/package.nix
index 884acd7aaa77..4bd18f89c949 100644
--- a/pkgs/applications/misc/pgmodeler/default.nix
+++ b/pkgs/by-name/pg/pgmodeler/package.nix
@@ -4,14 +4,11 @@
   copyDesktopItems,
   fetchFromGitHub,
   makeDesktopItem,
-  wrapQtAppsHook,
   pkg-config,
-  qmake,
-  qtwayland,
-  qtsvg,
   libpq,
   cups,
   libxml2,
+  qt6,
 }:
 
 stdenv.mkDerivation rec {
@@ -27,10 +24,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkg-config
-    qmake
-    wrapQtAppsHook
+    qt6.qmake
+    qt6.wrapQtAppsHook
     copyDesktopItems
   ];
+
   qmakeFlags =
     [
       "pgmodeler.pro"
@@ -46,10 +44,11 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [
+      qt6.qtbase
+      qt6.qtsvg
       libpq
-      qtsvg
     ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       cups
       libxml2
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43ecd33124f6..3e26ae043e83 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16631,8 +16631,6 @@ with pkgs;
 
   pgadmin4-desktopmode = callPackage ../tools/admin/pgadmin { server-mode = false; };
 
-  pgmodeler = qt6Packages.callPackage ../applications/misc/pgmodeler { };
-
   philipstv = with python3Packages; toPythonApplication philipstv;
 
   pyupgrade = with python3Packages; toPythonApplication pyupgrade;

From e9b91497d6a6414a1091e74281ac75baec64aa36 Mon Sep 17 00:00:00 2001
From: Daniel Albert <git@esclear.de>
Date: Sat, 10 May 2025 02:50:41 +0200
Subject: [PATCH 2/2] pgmodeler: 1.1.6 -> 1.2.0

---
 pkgs/by-name/pg/pgmodeler/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pg/pgmodeler/package.nix b/pkgs/by-name/pg/pgmodeler/package.nix
index 4bd18f89c949..177b06fee164 100644
--- a/pkgs/by-name/pg/pgmodeler/package.nix
+++ b/pkgs/by-name/pg/pgmodeler/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pgmodeler";
-  version = "1.1.6";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "pgmodeler";
     repo = "pgmodeler";
     rev = "v${version}";
-    sha256 = "sha256-ZoWCXCRaFQMf/RbcgXZQiF4+TDogdMOtccxOTk1c7Jw=";
+    sha256 = "sha256-q0XoShp+XERvyERLxi9uh//dNxVEtfL+UY9uVKqX4fI=";
   };
 
   nativeBuildInputs = [