diff --git a/pkgs/applications/misc/huggle/00-remove-third-party.patch b/pkgs/by-name/hu/huggle/00-remove-third-party.patch similarity index 100% rename from pkgs/applications/misc/huggle/00-remove-third-party.patch rename to pkgs/by-name/hu/huggle/00-remove-third-party.patch diff --git a/pkgs/applications/misc/huggle/01-extensions.patch b/pkgs/by-name/hu/huggle/01-extensions.patch similarity index 100% rename from pkgs/applications/misc/huggle/01-extensions.patch rename to pkgs/by-name/hu/huggle/01-extensions.patch diff --git a/pkgs/applications/misc/huggle/default.nix b/pkgs/by-name/hu/huggle/package.nix similarity index 87% rename from pkgs/applications/misc/huggle/default.nix rename to pkgs/by-name/hu/huggle/package.nix index 59d375ed1cf9..70455ca0f352 100644 --- a/pkgs/applications/misc/huggle/default.nix +++ b/pkgs/by-name/hu/huggle/package.nix @@ -6,26 +6,25 @@ ncurses, which, cmake, - wrapQtAppsHook, - qtwebengine, + qt6, yaml-cpp, libirc, }: stdenv.mkDerivation rec { pname = "huggle"; - version = "3.4.13"; + version = "3.4.14"; src = fetchFromGitHub { owner = "huggle"; repo = "huggle3-qt-lx"; rev = version; - sha256 = "sha256-f7Oo6x262Ju9KY8f/xjm9gL6I1fRCaDsQWGWJMUNUfY="; + hash = "sha256-obArs5NqjHbuWv+zNGAuulHQz6MUIejRqNvg2l5eZxc="; fetchSubmodules = true; }; nativeBuildInputs = [ - wrapQtAppsHook + qt6.wrapQtAppsHook pkg-config which cmake @@ -33,7 +32,8 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses yaml-cpp - qtwebengine + qt6.qtmultimedia + qt6.qtwebengine libirc ]; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { "-S" "/build/source/src" "-DINSTALL_DATA_DIR=bin" - "-DQT5_BUILD=ON" + "-DQT6_BUILD=ON" "-DWEB_ENGINE=ON" "-DBUILD_SHARED_LIBS=OFF" "-Wno-dev" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce4c374213ca..8038e21799d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9562,8 +9562,6 @@ with pkgs; hpack = haskell.lib.compose.justStaticExecutables haskellPackages.hpack; - huggle = libsForQt5.callPackage ../applications/misc/huggle { }; - hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { }; hyperglot = with python3Packages; toPythonApplication hyperglot;