diff --git a/pkgs/by-name/qb/qbittorrent-enhanced/package.nix b/pkgs/by-name/qb/qbittorrent-enhanced/package.nix index 2f92d753bb75..ed4da5552468 100644 --- a/pkgs/by-name/qb/qbittorrent-enhanced/package.nix +++ b/pkgs/by-name/qb/qbittorrent-enhanced/package.nix @@ -7,13 +7,13 @@ (qbittorrent.override { inherit guiSupport; }).overrideAttrs (old: rec { pname = "qbittorrent-enhanced" + lib.optionalString (!guiSupport) "-nox"; - version = "5.0.4.10"; + version = "5.0.5.10"; src = fetchFromGitHub { owner = "c0re100"; repo = "qBittorrent-Enhanced-Edition"; rev = "release-${version}"; - hash = "sha256-qYGDPEg4BZZgHschgFjp23EnmaBtmM+UNoC2Lympt/g="; + hash = "sha256-wMPzasrWmPG+iOwUBkbswSMQQBJxq03GVlQg5ck54vQ="; }; meta = old.meta // { diff --git a/pkgs/by-name/qb/qbittorrent/package.nix b/pkgs/by-name/qb/qbittorrent/package.nix index ecb3243eb1bf..f32b270787e1 100644 --- a/pkgs/by-name/qb/qbittorrent/package.nix +++ b/pkgs/by-name/qb/qbittorrent/package.nix @@ -20,22 +20,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "qbittorrent" + lib.optionalString (!guiSupport) "-nox"; - version = "5.0.4"; + version = "5.1.0"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${finalAttrs.version}"; - hash = "sha256-8gSSUgYx0CSSb3ackFknZ9r0cWFLxkC7a3Tj8QJaylc="; + hash = "sha256-ZLmKEdvtOxCzEOnJ4JPQQhR427YA288vTRxpk6O0tUc="; }; - # Partial backport of https://github.com/qbittorrent/qBittorrent/commit/a6809efbbbdf18a1b66df9c89d0d0aeefd78f461 - # to fix build with Qt 6.9. - # FIXME: remove in next update - patches = [ - ./qt-6.9.patch - ]; - nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/qb/qbittorrent/qt-6.9.patch b/pkgs/by-name/qb/qbittorrent/qt-6.9.patch deleted file mode 100644 index 3efe7fac60bc..000000000000 --- a/pkgs/by-name/qb/qbittorrent/qt-6.9.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/base/http/types.h b/src/base/http/types.h -index 156ddf6c0381..4b0b99a5914e 100644 ---- a/src/base/http/types.h -+++ b/src/base/http/types.h -@@ -29,7 +29,10 @@ - - #pragma once - -+#include -+#include - #include -+#include - #include - #include \ No newline at end of file