diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 27b702e370e4..4d39d25222c8 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -186,6 +186,7 @@ let kteatime = callPackage ./kteatime.nix {}; ktimer = callPackage ./ktimer.nix {}; ktnef = callPackage ./ktnef.nix {}; + ktorrent = callPackage ./ktorrent.nix {}; ktouch = callPackage ./ktouch.nix {}; kturtle = callPackage ./kturtle.nix {}; kwalletmanager = callPackage ./kwalletmanager.nix {}; @@ -203,6 +204,7 @@ let libkomparediff2 = callPackage ./libkomparediff2.nix {}; libksane = callPackage ./libksane.nix {}; libksieve = callPackage ./libksieve.nix {}; + libktorrent = callPackage ./libktorrent.nix {}; mailcommon = callPackage ./mailcommon.nix {}; mailimporter = callPackage ./mailimporter.nix {}; marble = callPackage ./marble.nix {}; diff --git a/pkgs/applications/kde/ktorrent.nix b/pkgs/applications/kde/ktorrent.nix new file mode 100644 index 000000000000..f63865d30303 --- /dev/null +++ b/pkgs/applications/kde/ktorrent.nix @@ -0,0 +1,22 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + karchive, kcmutils, kcrash, kdnssd, ki18n, knotifications, knotifyconfig, + kplotting, kross, libgcrypt, libktorrent, taglib +}: + +mkDerivation { + pname = "ktorrent"; + meta = with lib; { + description = "KDE integrated BtTorrent client"; + homepage = "https://apps.kde.org/ktorrent/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ eelco ]; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + karchive kcmutils kcrash kdnssd ki18n knotifications knotifyconfig kplotting + kross libgcrypt libktorrent taglib + ]; +} diff --git a/pkgs/applications/kde/libktorrent.nix b/pkgs/applications/kde/libktorrent.nix new file mode 100644 index 000000000000..3b4ae5f72f7f --- /dev/null +++ b/pkgs/applications/kde/libktorrent.nix @@ -0,0 +1,22 @@ +{ + mkDerivation, lib, + extra-cmake-modules, + karchive, kcrash, ki18n, kio, libgcrypt, qca-qt5, solid, + boost, gmp +}: + +mkDerivation { + pname = "libktorrent"; + meta = with lib; { + description = "A BitTorrent library used by KTorrent"; + homepage = "https://apps.kde.org/ktorrent/"; + maintainers = with maintainers; [ eelco ]; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ karchive kcrash ki18n kio libgcrypt qca-qt5 solid ]; + propagatedBuildInputs = [ boost gmp ]; + outputs = [ "out" "dev" ]; + + dontWrapQtApps = true; +} diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix deleted file mode 100644 index 94a4642b2de1..000000000000 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ mkDerivation, lib, fetchurl, fetchpatch, cmake -, extra-cmake-modules, qtbase, qtscript -, karchive, kcrash, kdnssd, ki18n, kio, knotifications, knotifyconfig -, kdoctools, kross, kcmutils, kwindowsystem -, libktorrent, taglib, libgcrypt, kplotting -}: - -mkDerivation rec { - pname = "ktorrent"; - version = "${libktorrent.mainVersion}"; - - src = fetchurl { - url = "mirror://kde/stable/ktorrent/${libktorrent.mainVersion}/${pname}-${version}.tar.xz"; - sha256 = "0kwd0npxfg4mdh7f3xadd2zjlqalpb1jxk61505qpcgcssijf534"; - }; - - nativeBuildInputs = [ cmake kdoctools extra-cmake-modules ]; - - buildInputs = [ - qtbase qtscript - karchive kcrash kdnssd ki18n kio knotifications knotifyconfig kross kcmutils kwindowsystem - libktorrent taglib libgcrypt kplotting - ]; - - meta = with lib; { - description = "KDE integrated BtTorrent client"; - homepage = "https://www.kde.org/applications/internet/ktorrent/"; - license = licenses.gpl2; - maintainers = with maintainers; [ eelco ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix deleted file mode 100644 index 825fe87fe2fe..000000000000 --- a/pkgs/development/libraries/libktorrent/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, extra-cmake-modules -, karchive, kcrash, ki18n, kio, solid -, boost, gmp, qca-qt5, libgcrypt -}: - -let - mainVersion = "5.1.2"; - -in stdenv.mkDerivation rec { - pname = "libktorrent"; - version = "2.1.1"; - - src = fetchurl { - url = "mirror://kde/stable/ktorrent/${mainVersion}/${pname}-${version}.tar.xz"; - sha256 = "0051zh8bb4p9wmcfn5ql987brhsaiw9880xdck7b5dm1a05mri2w"; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ cmake extra-cmake-modules ]; - - buildInputs = [ karchive kcrash ki18n kio solid qca-qt5 libgcrypt ]; - - propagatedBuildInputs = [ gmp boost ]; - - passthru = { - inherit mainVersion; - }; - - dontWrapQtApps = true; - - meta = with lib; { - description = "A BitTorrent library used by KTorrent"; - homepage = "https://www.kde.org/applications/internet/ktorrent/"; - maintainers = with maintainers; [ eelco ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c4583f83bffa..38e6d5dcc0d1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1426,7 +1426,7 @@ mapAliases ({ kleopatra klettres klines kmag kmail kmenuedit kmines kmix kmplot knavalbattle knetwalk knights kollision kolourpaint kompare konsole kontact korganizer kpkpass krdc kreversi krfb kscreen kscreenlocker kshisen ksquares - ksshaskpass ksystemlog kteatime ktimer ktouch kturtle kwallet-pam + ksshaskpass ksystemlog kteatime ktimer ktorrent ktouch kturtle kwallet-pam kwalletmanager kwave kwayland-integration kwin kwrited marble milou minuet okular oxygen oxygen-icons5 picmi plasma-browser-integration plasma-desktop plasma-integration plasma-nano plasma-nm plasma-pa plasma-phone-components diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9eb67dfffeaa..5368a4a56780 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26870,8 +26870,6 @@ with pkgs; ktimetracker = libsForQt5.callPackage ../applications/office/ktimetracker { }; - ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { }; - kubedb-cli = callPackage ../applications/networking/cluster/kubedb-cli { }; kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index d9cc05afe713..751236fdcb4b 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -116,8 +116,6 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { }; - libktorrent = callPackage ../development/libraries/libktorrent { }; - liblastfm = callPackage ../development/libraries/liblastfm { }; libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { };