git.iko.soy/typeable/nixpkgs
on master help sign in
kdeconnect: part of kdeApplications
commit0d25246f4dd651f9a82c7c38a872b6042901c89e authorPeter Hoeg <peter@hoeg.com> dateWed 28 Oct 2020, 16:13 (6 years ago) parentd87b883
4 files changed+34−44
pkgs/applications/kde/default.nix+1 pkgs/applications/misc/kdeconnect/default.nix → pkgs/applications/kde/kdeconnect-kde.nix+31−41 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix+1−3
pkgs/applications/kde/default.nix+1
@@ -107,6 +107,7 @@ let
107107 kcharselect = callPackage ./kcharselect.nix {};
108108 kcolorchooser = callPackage ./kcolorchooser.nix {};
109109 kdebugsettings = callPackage ./kdebugsettings.nix {};
110+ kdeconnect-kde = callPackage ./kdeconnect-kde.nix {};
110111 kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
111112 kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
112113 kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
pkgs/applications/misc/kdeconnect/default.nix → pkgs/applications/kde/kdeconnect-kde.nixrenamed+31−41
@@ -1,39 +1,32 @@
11{ mkDerivation
2−, lib
3−, fetchurl
4−, fetchpatch
52, extra-cmake-modules
3+, fetchpatch
64, kcmutils
75, kconfigwidgets
86, kdbusaddons
97, kdoctools
10−, kiconthemes
118, ki18n
9+, kiconthemes
10+, kio
11+, kirigami2
1212, knotifications
13−, qca-qt5
14−, libfakekey
13+, kpeople
14+, kpeoplevcard
15+, kwayland
16+, lib
1517, libXtst
16−, qtx11extras
17−, qtmultimedia
18−, qtgraphicaleffects
19−, sshfs
18+, libfakekey
2019, makeWrapper
21−, kwayland
22−, kio
23−, kpeoplevcard
24−, kpeople
25−, kirigami2
2620, pulseaudio-qt
21+, qca-qt5
22+, qtgraphicaleffects
23+, qtmultimedia
24+, qtx11extras
25+, sshfs
2726}:
2827
29−mkDerivation rec {
30− pname = "kdeconnect";
31− version = "20.08.2";
32−
33− src = fetchurl {
34− url = "https://download.kde.org/stable/release-service/${version}/src/${pname}-kde-${version}.tar.xz";
35− sha256 = "0rzfnkgkv759d4pa16qk0sw87wqzwgkd99yzrzfy2zcq423f6hvd";
36− };
28+mkDerivation {
29+ name = "kdeconnect-kde";
3730
3831 patches = [
3932 # https://invent.kde.org/network/kdeconnect-kde/-/merge_requests/328
@@ -44,39 +37,36 @@ mkDerivation rec {
4437 ];
4538
4639 buildInputs = [
47− libfakekey
48− libXtst
49− qtmultimedia
50− qtgraphicaleffects
51− pulseaudio-qt
52− kpeoplevcard
53− kpeople
54− kirigami2
55− ki18n
56− kiconthemes
5740 kcmutils
5841 kconfigwidgets
5942 kdbusaddons
43+ ki18n
44+ kiconthemes
45+ kio
46+ kirigami2
6047 knotifications
48+ kpeople
49+ kpeoplevcard
50+ kwayland
51+ libXtst
52+ libfakekey
53+ pulseaudio-qt
6154 qca-qt5
55+ qtgraphicaleffects
56+ qtmultimedia
6257 qtx11extras
63− makeWrapper
64− kwayland
65− kio
6658 ];
6759
68− nativeBuildInputs = [ extra-cmake-modules kdoctools ];
60+ nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
6961
7062 postInstall = ''
7163 wrapProgram $out/libexec/kdeconnectd --prefix PATH : ${lib.makeBinPath [ sshfs ]}
7264 '';
7365
74− enableParallelBuilding = true;
75−
7666 meta = with lib; {
7767 description = "KDE Connect provides several features to integrate your phone and your computer";
78− homepage = "https://community.kde.org/KDEConnect";
79− license = with licenses; [ gpl2 ];
68+ homepage = "https://community.kde.org/KDEConnect";
69+ license = with licenses; [ gpl2 ];
8070 maintainers = with maintainers; [ fridh ];
8171 };
8272}
pkgs/top-level/aliases.nix+1
@@ -224,6 +224,7 @@ mapAliases ({
224224 kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16
225225 julia_07 = throw "julia_07 is deprecated in favor of julia_10 LTS"; # added 2020-09-15
226226 julia_11 = throw "julia_11 is deprecated in favor of latest Julia version"; # added 2020-09-15
227+ kdeconnect = kdeApplications.kdeconnect-kde; # added 2020-10-28
227228 kdiff3-qt5 = kdiff3; # added 2017-02-18
228229 keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02
229230 keepassx-community = keepassxc; # added 2017-11
pkgs/top-level/all-packages.nix+1−3
@@ -21708,7 +21708,7 @@ in
2170821708 kaddressbook kalzium kapptemplate kapman kate katomic
2170921709 kblackbox kblocks kbounce
2171021710 kcachegrind kcalc kcharselect kcolorchooser
21711− kdenlive kdf kdialog kdiamond
21711+ kdeconnect-kde kdenlive kdf kdialog kdiamond
2171221712 keditbookmarks
2171321713 kfind kfloppy
2171421714 kget kgpg
@@ -21733,8 +21733,6 @@ in
2173321733
2173421734 k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };
2173521735
21736− kdeconnect = libsForQt512.callPackage ../applications/misc/kdeconnect { };
21737−
2173821736 inherit (kdeFrameworks) kdesu;
2173921737
2174021738 kdevelop-pg-qt = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { };