diff --git a/lib/maintainers.nix b/lib/maintainers.nix index f2fe38e8e56c..65e04703223f 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -48,6 +48,7 @@ iElectric = "Domen Kozar "; iyzsong = "Song Wenwu "; jcumming = "Jack Cummings "; + jgeerds = "Jascha Geerds "; joamaki = "Jussi Maki "; joelteon = "Joel Taylor "; jwiegley = "John Wiegley "; diff --git a/pkgs/development/libraries/libmm-qt/default.nix b/pkgs/development/libraries/libmm-qt/default.nix new file mode 100644 index 000000000000..f78604f86c53 --- /dev/null +++ b/pkgs/development/libraries/libmm-qt/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, cmake, pkgconfig, qt4, doxygen, modemmanager }: + +let + pname = "libmm-qt"; + version = "1.0.1"; + name = "${pname}-${version}"; +in +stdenv.mkDerivation { + inherit name; + + buildInputs = [ + cmake + pkgconfig + qt4 + doxygen + ]; + + propagatedBuildInputs = [ modemmanager ]; + + src = fetchurl { + url = "mirror://kde/unstable/modemmanager-qt/${version}/src/${name}-1.tar.xz"; + sha256 = "0ad57815a904ddb2660a7327c0bda5da47a2a60ce57b2b12f4aaff99b174f74a"; + }; + + meta = with stdenv.lib; { + homepage = "https://projects.kde.org/projects/extragear/libs/libmm-qt"; + description = "Qt wrapper for ModemManager DBus API"; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = [ maintainers.jgeerds ]; + }; +} diff --git a/pkgs/development/libraries/libnm-qt/default.nix b/pkgs/development/libraries/libnm-qt/default.nix new file mode 100644 index 000000000000..31afcae8e01a --- /dev/null +++ b/pkgs/development/libraries/libnm-qt/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, cmake, pkgconfig, qt4, networkmanager, libmm-qt }: + +let + pname = "libnm-qt"; + version = "0.9.8.1"; + name = "${pname}-${version}"; +in +stdenv.mkDerivation { + inherit name; + + buildInputs = [ + cmake + pkgconfig + qt4 + networkmanager + ]; + + propagatedBuildInputs = [ libmm-qt ]; + + src = fetchurl { + url = "mirror://kde/unstable/networkmanager-qt/${version}/src/${name}.tar.xz"; + sha256 = "cde8bed2beb57015cb5f6772c1fe0843aab299b9529578c5406ba7fe614af23d"; + }; + + meta = with stdenv.lib; { + homepage = "https://projects.kde.org/projects/extragear/libs/libnm-qt"; + description = "Qt wrapper for NetworkManager DBus API"; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainer = [ maintainers.jgeerds ]; + }; +} diff --git a/pkgs/tools/networking/plasma-nm/default.nix b/pkgs/tools/networking/plasma-nm/default.nix new file mode 100644 index 000000000000..42c5ab3973a5 --- /dev/null +++ b/pkgs/tools/networking/plasma-nm/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, pkgconfig, cmake, gettext, kdelibs, networkmanager, libnm-qt }: + +let + pname = "plasma-nm"; + version = "0.9.3.3"; + name = "${pname}-${version}"; +in +stdenv.mkDerivation { + inherit name; + + src = fetchurl { + url = "mirror://kde/unstable/${pname}/${name}.tar.xz"; + sha256 = "099cbe86eb989c4fda8cdcc0f8721dc3350cc6735c3f50bcdd94661e5930e326"; + }; + + buildInputs = [ + cmake + pkgconfig + gettext + kdelibs + networkmanager + libnm-qt + ]; + + meta = with stdenv.lib; { + homepage = "https://projects.kde.org/projects/kde/workspace/plasma-nm"; + description = "Plasma applet written in QML for managing network connections"; + license = licenses.lgpl21; + inherit (kdelibs.meta) platforms; + maintainers = [ maintainers.jgeerds ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40640320276a..b6535fea8162 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10565,10 +10565,16 @@ let liblikeback = callPackage ../development/libraries/liblikeback { }; + libmm-qt = callPackage ../development/libraries/libmm-qt { }; + + libnm-qt = callPackage ../development/libraries/libnm-qt { }; + networkmanagement = callPackage ../tools/networking/networkmanagement { }; partitionManager = callPackage ../tools/misc/partition-manager { }; + plasma-nm = callPackage ../tools/networking/plasma-nm { }; + polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { }; psi = callPackage ../applications/networking/instant-messengers/psi { };