From e6366770ff748e4184610178a532474a6b6f09ec Mon Sep 17 00:00:00 2001 From: KSJ2000 Date: Sun, 24 Nov 2024 12:31:15 +0200 Subject: [PATCH 1/4] qbittorrent: 5.0.1 -> 5.0.2 --- pkgs/applications/networking/p2p/qbittorrent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index ffda991b0c373..414c67a014619 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -29,13 +29,13 @@ in stdenv.mkDerivation rec { pname = "qbittorrent" + lib.optionalString (!guiSupport) "-nox"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - hash = "sha256-BmfTQGftQIkRrlSpJy0yHTh0r3D2CWLIo+tnL0+OeA4="; + hash = "sha256-JIURzAkVNYjHAx8yY0WaKNK4N/z9ndqjk0EXkJH9AzY="; }; nativeBuildInputs = [ From b10a84893ecdfa2f07f72cffcd86d6206dc33a11 Mon Sep 17 00:00:00 2001 From: KSJ2000 Date: Sun, 24 Nov 2024 12:42:20 +0200 Subject: [PATCH 2/4] qbittorrent: nixfmt --- .../networking/p2p/qbittorrent/default.nix | 96 +++++++++---------- 1 file changed, 46 insertions(+), 50 deletions(-) diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 414c67a014619..052b5ec0a64a4 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -1,34 +1,34 @@ -{ lib -, stdenv -, fetchFromGitHub +{ + lib, + stdenv, + fetchFromGitHub, -, boost -, cmake -, Cocoa -, libtorrent-rasterbar -, ninja -, qtbase -, qtsvg -, qttools -, wrapGAppsHook3 -, wrapQtAppsHook + boost, + cmake, + Cocoa, + libtorrent-rasterbar, + ninja, + qtbase, + qtsvg, + qttools, + wrapGAppsHook3, + wrapQtAppsHook, -, guiSupport ? true -, dbus -, qtwayland + guiSupport ? true, + dbus, + qtwayland, -, trackerSearch ? true -, python3 + trackerSearch ? true, + python3, -, webuiSupport ? true + webuiSupport ? true, }: let qtVersion = lib.versions.major qtbase.version; in stdenv.mkDerivation rec { - pname = "qbittorrent" - + lib.optionalString (!guiSupport) "-nox"; + pname = "qbittorrent" + lib.optionalString (!guiSupport) "-nox"; version = "5.0.2"; src = fetchFromGitHub { @@ -45,33 +45,28 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; - buildInputs = [ - boost - libtorrent-rasterbar - qtbase - qtsvg - qttools - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - ] ++ lib.optionals guiSupport [ - dbus - ] ++ lib.optionals (guiSupport && stdenv.hostPlatform.isLinux) [ - qtwayland - ] ++ lib.optionals trackerSearch [ - python3 - ]; + buildInputs = + [ + boost + libtorrent-rasterbar + qtbase + qtsvg + qttools + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ] + ++ lib.optionals guiSupport [ dbus ] + ++ lib.optionals (guiSupport && stdenv.hostPlatform.isLinux) [ qtwayland ] + ++ lib.optionals trackerSearch [ python3 ]; - cmakeFlags = lib.optionals (!guiSupport) [ - "-DGUI=OFF" - "-DSYSTEMD=ON" - "-DSYSTEMD_SERVICES_INSTALL_DIR=${placeholder "out"}/lib/systemd/system" - ] ++ lib.optionals (!webuiSupport) [ - "-DWEBUI=OFF" - ]; + cmakeFlags = + lib.optionals (!guiSupport) [ + "-DGUI=OFF" + "-DSYSTEMD=ON" + "-DSYSTEMD_SERVICES_INSTALL_DIR=${placeholder "out"}/lib/systemd/system" + ] + ++ lib.optionals (!webuiSupport) [ "-DWEBUI=OFF" ]; - qtWrapperArgs = lib.optionals trackerSearch [ - "--prefix PATH : ${lib.makeBinPath [ python3 ]}" - ]; + qtWrapperArgs = lib.optionals trackerSearch [ "--prefix PATH : ${lib.makeBinPath [ python3 ]}" ]; dontWrapGApps = true; @@ -92,9 +87,10 @@ stdenv.mkDerivation rec { changelog = "https://github.com/qbittorrent/qBittorrent/blob/release-${version}/Changelog"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ Anton-Latukha kashw2 ]; - mainProgram = - "qbittorrent" - + lib.optionalString (!guiSupport) "-nox"; + maintainers = with maintainers; [ + Anton-Latukha + kashw2 + ]; + mainProgram = "qbittorrent" + lib.optionalString (!guiSupport) "-nox"; }; } From f649041da99bac2b7c5097f719f52df98c46e4c8 Mon Sep 17 00:00:00 2001 From: KSJ2000 Date: Sun, 24 Nov 2024 12:52:48 +0200 Subject: [PATCH 3/4] qbittorrent: modernize derivation --- .../networking/p2p/qbittorrent/default.nix | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 052b5ec0a64a4..09cd980538ec8 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -1,65 +1,60 @@ { - lib, - stdenv, - fetchFromGitHub, - + apple-sdk_11, boost, cmake, - Cocoa, - libtorrent-rasterbar, - ninja, - qtbase, - qtsvg, - qttools, - wrapGAppsHook3, - wrapQtAppsHook, - - guiSupport ? true, dbus, - qtwayland, - - trackerSearch ? true, + fetchFromGitHub, + guiSupport ? true, + lib, + libtorrent-rasterbar, + nix-update-script, + openssl, + pkg-config, python3, - + qt6, + stdenv, + trackerSearch ? true, webuiSupport ? true, + wrapGAppsHook3, + zlib, }: -let - qtVersion = lib.versions.major qtbase.version; -in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qbittorrent" + lib.optionalString (!guiSupport) "-nox"; version = "5.0.2"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; - rev = "release-${version}"; + rev = "release-${finalAttrs.version}"; hash = "sha256-JIURzAkVNYjHAx8yY0WaKNK4N/z9ndqjk0EXkJH9AzY="; }; nativeBuildInputs = [ cmake - ninja + pkg-config wrapGAppsHook3 - wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ boost libtorrent-rasterbar - qtbase - qtsvg - qttools + openssl + qt6.qtbase + qt6.qtsvg + qt6.qttools + zlib ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ] ++ lib.optionals guiSupport [ dbus ] - ++ lib.optionals (guiSupport && stdenv.hostPlatform.isLinux) [ qtwayland ] + ++ lib.optionals (guiSupport && stdenv.hostPlatform.isLinux) [ qt6.qtwayland ] ++ lib.optionals trackerSearch [ python3 ]; cmakeFlags = - lib.optionals (!guiSupport) [ + [ "-DVERBOSE_CONFIGURE=ON" ] + ++ lib.optionals (!guiSupport) [ "-DGUI=OFF" "-DSYSTEMD=ON" "-DSYSTEMD_SERVICES_INSTALL_DIR=${placeholder "out"}/lib/systemd/system" @@ -73,7 +68,7 @@ stdenv.mkDerivation rec { postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' APP_NAME=qbittorrent${lib.optionalString (!guiSupport) "-nox"} mkdir -p $out/{Applications,bin} - cp -R $APP_NAME.app $out/Applications + mv $out/$APP_NAME.app $out/Applications makeWrapper $out/{Applications/$APP_NAME.app/Contents/MacOS,bin}/$APP_NAME ''; @@ -81,16 +76,21 @@ stdenv.mkDerivation rec { qtWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - meta = with lib; { + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=release-(.*)" ]; }; + + meta = { description = "Featureful free software BitTorrent client"; homepage = "https://www.qbittorrent.org"; - changelog = "https://github.com/qbittorrent/qBittorrent/blob/release-${version}/Changelog"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ + changelog = "https://github.com/qbittorrent/qBittorrent/blob/release-${finalAttrs.version}/Changelog"; + license = with lib.licenses; [ + gpl2Only + gpl3Only + ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ Anton-Latukha kashw2 ]; mainProgram = "qbittorrent" + lib.optionalString (!guiSupport) "-nox"; }; -} +}) From d2d419c37fd187f460c72aaed61520710eb1fa13 Mon Sep 17 00:00:00 2001 From: KSJ2000 Date: Sun, 24 Nov 2024 13:41:56 +0200 Subject: [PATCH 4/4] qbittorrent: move to by-name --- .../default.nix => by-name/qb/qbittorrent/package.nix} | 0 pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 3 deletions(-) rename pkgs/{applications/networking/p2p/qbittorrent/default.nix => by-name/qb/qbittorrent/package.nix} (100%) diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/by-name/qb/qbittorrent/package.nix similarity index 100% rename from pkgs/applications/networking/p2p/qbittorrent/default.nix rename to pkgs/by-name/qb/qbittorrent/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eecbd8c6e87d0..e8625d6123983 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15231,9 +15231,6 @@ with pkgs; pure-maps = libsForQt5.callPackage ../applications/misc/pure-maps { }; - qbittorrent = qt6Packages.callPackage ../applications/networking/p2p/qbittorrent { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; qbittorrent-nox = qbittorrent.override { guiSupport = false; }; qcad = libsForQt5.callPackage ../applications/misc/qcad { };