diff --git a/pkgs/applications/office/vnote/default.nix b/pkgs/by-name/vn/vnote/package.nix similarity index 73% rename from pkgs/applications/office/vnote/default.nix rename to pkgs/by-name/vn/vnote/package.nix index 1b815228ac2d..a787f4a09e4b 100644 --- a/pkgs/applications/office/vnote/default.nix +++ b/pkgs/by-name/vn/vnote/package.nix @@ -1,34 +1,34 @@ { lib , stdenv , fetchFromGitHub -, qmake -, qtbase -, qtwebengine -, qtx11extras -, wrapQtAppsHook +, cmake +, qt6 }: stdenv.mkDerivation (finalAttrs: { pname = "vnote"; - version = "3.17.0"; + version = "3.18.0"; src = fetchFromGitHub { owner = "vnotex"; repo = "vnote"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-NUVu6tKXrrwAoT4BgxX05mmGSC9yx20lwvXzd4y19Zs="; + hash = "sha256-OpQjMngSEnmtTMLXLllDlIzucdSLSqdFU4ZtPb7ytvQ="; }; nativeBuildInputs = [ - qmake - wrapQtAppsHook + cmake + qt6.wrapQtAppsHook ]; buildInputs = [ - qtbase - qtwebengine - qtx11extras + qt6.qtbase + qt6.qtwebengine + qt6.qtsvg + qt6.qttools + qt6.qt5compat + qt6.qtwayland ]; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e58204403f6..c89f81fca4e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39835,8 +39835,6 @@ with pkgs; buildGoModule = buildGo122Module; }; - vnote = libsForQt5.callPackage ../applications/office/vnote { }; - sshportal = callPackage ../servers/sshportal { }; ssh-audit = callPackage ../tools/security/ssh-audit { };