diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index eb3aa5a43472..8f19bcb823d3 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -217,6 +217,9 @@ - The logrotate service has received hardening and now requires enabling `allowNetworking`, if logrotate needs to access the network. +- qBittorrent has been updated to major version 5, which drops support for Qt 5. + The `qbittorrent-qt5` package has been removed. + - The fcgiwrap module now allows multiple instances running as distinct users. The option `services.fgciwrap` now takes an attribute set of the configuration of each individual instance. diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index c9ff19468745..e542dabc6dae 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -28,15 +28,14 @@ let in stdenv.mkDerivation rec { pname = "qbittorrent" - + lib.optionalString (guiSupport && qtVersion == "5") "-qt5" + lib.optionalString (!guiSupport) "-nox"; - version = "4.6.7"; + version = "5.0.0"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - hash = "sha256-vUC8YIuyoGnl46FajfJG/XFXG+2lM9EaHWl2Hfo3T7c="; + hash = "sha256-iwqJaRfwJTL6SimWTNqqqFPXxSKrgo6whYY70llZyGs"; }; nativeBuildInputs = [ @@ -62,9 +61,7 @@ stdenv.mkDerivation rec { python3 ]; - cmakeFlags = lib.optionals (qtVersion == "6") [ - "-DQT6=ON" - ] ++ lib.optionals (!guiSupport) [ + cmakeFlags = lib.optionals (!guiSupport) [ "-DGUI=OFF" "-DSYSTEMD=ON" "-DSYSTEMD_SERVICES_INSTALL_DIR=${placeholder "out"}/lib/systemd/system" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a24730771cf1..8789745cdfce 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1319,6 +1319,7 @@ mapAliases { ### Q ### + qbittorrent-qt5 = throw "'qbittorrent-qt5' has been removed as qBittorrent 5 dropped support for Qt 5. Please use 'qbittorrent'"; # Added 2024-09-30 qcsxcad = libsForQt5.qcsxcad; # Added 2020-11-05 qtcreator-qt6 = throw "'qtcreator-qt6' has been renamed to/replaced by 'qtcreator', since qt5 version has been removed"; # Added 2023-07-25 qflipper = qFlipper; # Added 2022-02-11 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 288564a842f7..28e9a7d37f27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32291,9 +32291,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; qbittorrent-nox = qbittorrent.override { guiSupport = false; }; - qbittorrent-qt5 = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; qcad = libsForQt5.callPackage ../applications/misc/qcad { };