diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 378fcde41e1..a138a51824d 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -102,6 +102,7 @@ let kdepim-apps-libs = callPackage ./kdepim-apps-libs {}; kdf = callPackage ./kdf.nix {}; keditbookmarks = callPackage ./keditbookmarks.nix {}; + kget = callPackage ./kget.nix {}; kgpg = callPackage ./kgpg.nix {}; khelpcenter = callPackage ./khelpcenter.nix {}; kholidays = callPackage ./kholidays.nix {}; diff --git a/pkgs/applications/kde/kget.nix b/pkgs/applications/kde/kget.nix new file mode 100644 index 00000000000..6a50f1d08d1 --- /dev/null +++ b/pkgs/applications/kde/kget.nix @@ -0,0 +1,22 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + kdelibs4support, libgcrypt, libktorrent, qca-qt5, qgpgme, + kcmutils, kcompletion, kcoreaddons, knotifyconfig, kparts, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui +}: + +mkDerivation { + name = "kget"; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + + buildInputs = [ + kdelibs4support libgcrypt libktorrent qca-qt5 qgpgme + kcmutils kcompletion kcoreaddons knotifyconfig kparts kwallet kwidgetsaddons kwindowsystem kxmlgui + ]; + + meta = with lib; { + license = with licenses; [ gpl2 ]; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/applications/networking/kget/default.nix b/pkgs/applications/networking/kget/default.nix deleted file mode 100644 index 0dc37d10d1a..00000000000 --- a/pkgs/applications/networking/kget/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - mkDerivation, lib, fetchFromGitHub, - extra-cmake-modules, kdoctools, makeWrapper, - kdelibs4support, libgcrypt, libktorrent, qca-qt5, qgpgme, - kcmutils, kcompletion, kcoreaddons, knotifyconfig, kparts, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui -}: - -let - pname = "kget"; - version = "20170903"; - -in mkDerivation { - name = "${pname}-${version}"; - src = fetchFromGitHub { - owner = "KDE"; - repo = pname; - rev = "739c0b399faf5a393c7436c0771662596b840fdc"; - sha256 = "0rn6a4xd9zmf9sdjd5b4rh8yky6qm6ffjgjpn4snkdjsn6vm6y43"; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; - - buildInputs = [ - kdelibs4support libgcrypt libktorrent qca-qt5 qgpgme - kcmutils kcompletion kcoreaddons knotifyconfig kparts kwallet kwidgetsaddons kwindowsystem kxmlgui - ]; - - enableParallelBuilding = true; - - meta = with lib; { - license = licenses.gpl2; - maintainers = with maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cea7a7478ad..61587314a90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2953,10 +2953,6 @@ with pkgs; kpcli = callPackage ../tools/security/kpcli { }; - # kget is part of kde-applications but the released version is still for KDE 4 - # This needs to move to the proper place when the "frameworks" branch is released - kget = libsForQt5.callPackage ../applications/networking/kget { }; - krename = libsForQt5.callPackage ../applications/misc/krename { }; kronometer = libsForQt5.callPackage ../tools/misc/kronometer { }; @@ -15555,7 +15551,7 @@ with pkgs; inherit (kdeApplications) akonadi akregator ark dolphin ffmpegthumbs filelight gwenview k3b kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf keditbookmarks - kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole + kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole kontact korganizer krdc krfb kwalletmanager marble minuet okteta okular spectacle; kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };