diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/by-name/pg/pgmodeler/package.nix similarity index 88% rename from pkgs/applications/misc/pgmodeler/default.nix rename to pkgs/by-name/pg/pgmodeler/package.nix index 884acd7aaa77..177b06fee164 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/by-name/pg/pgmodeler/package.nix @@ -4,33 +4,31 @@ copyDesktopItems, fetchFromGitHub, makeDesktopItem, - wrapQtAppsHook, pkg-config, - qmake, - qtwayland, - qtsvg, libpq, cups, libxml2, + qt6, }: 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 = [ 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 29854dcc2eb9..1ba7ce5705b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16515,8 +16515,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;