From 9be791656fa85b2ef4fbfda3b8ad7fd26c695760 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 18 Feb 2017 13:00:07 -0600 Subject: [PATCH] Remove kde4.plasma-nm and its dependencies - Already updated to KDE 5 in Nixpkgs - Not useful without the KDE 4 desktop --- .../libraries/libmm-qt/default.nix | 31 ----------------- .../libraries/libnm-qt/default.nix | 33 ------------------- pkgs/tools/networking/plasma-nm/default.nix | 29 ---------------- pkgs/top-level/all-packages.nix | 6 ---- 4 files changed, 99 deletions(-) delete mode 100644 pkgs/development/libraries/libmm-qt/default.nix delete mode 100644 pkgs/development/libraries/libnm-qt/default.nix delete mode 100644 pkgs/tools/networking/plasma-nm/default.nix diff --git a/pkgs/development/libraries/libmm-qt/default.nix b/pkgs/development/libraries/libmm-qt/default.nix deleted file mode 100644 index 3515d8388a27..000000000000 --- a/pkgs/development/libraries/libmm-qt/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ 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; - }; -} diff --git a/pkgs/development/libraries/libnm-qt/default.nix b/pkgs/development/libraries/libnm-qt/default.nix deleted file mode 100644 index b9d033235cb4..000000000000 --- a/pkgs/development/libraries/libnm-qt/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, cmake, pkgconfig, qt4, networkmanager, libmm-qt }: - -let - pname = "libnm-qt"; - version = "0.9.8.2"; - name = "${pname}-${version}"; -in -stdenv.mkDerivation { - inherit name; - - buildInputs = [ - cmake - pkgconfig - qt4 - networkmanager - ]; - - cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; - - propagatedBuildInputs = [ libmm-qt ]; - - src = fetchurl { - url = "mirror://kde/unstable/networkmanager-qt/${version}/src/${name}.tar.xz"; - sha256 = "118fa4732536677f889b2776ec45bd0c726f26abcb8e8b6f8dfcaee265475f33"; - }; - - 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; - }; -} diff --git a/pkgs/tools/networking/plasma-nm/default.nix b/pkgs/tools/networking/plasma-nm/default.nix deleted file mode 100644 index f0f379d38295..000000000000 --- a/pkgs/tools/networking/plasma-nm/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig -, kdelibs, networkmanager, libnm-qt, glib }: - -let - pname = "plasma-nm"; - version = "0.9.3.4"; - name = "${pname}-${version}"; -in -stdenv.mkDerivation { - inherit name; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${name}.tar.xz"; - sha256 = "0xj14isvjq8ll70b6q66n8adm8ff4j9ng195ndk2gmavjf6bb751"; - }; - - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; - - nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; - - buildInputs = [ 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; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3790c9f775b2..8b5cc63cc8db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16755,16 +16755,10 @@ with pkgs; liblikeback = callPackage ../development/libraries/liblikeback { }; - libmm-qt = callPackage ../development/libraries/libmm-qt { }; - - libnm-qt = callPackage ../development/libraries/libnm-qt { }; - massif-visualizer = callPackage ../development/tools/analysis/massif-visualizer { }; 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 { };