Merge pull request #29369 from bkchr/remove_kde4_workspace_kde_telepathy

Remove kde4workspace and kdetelepathy

pkgs/applications/networking/instant-messengers/telepathy/kde/0.8.80.nix

···
-[
-{name="ktp-accounts-kcm";key="accounts_kcm";sha256="08b873k455jbs9vd5nsb222pr1kb7gjx3qky769654j696rad5bc";}
-{name="ktp-approver";key="approver";sha256="07qsjxvcjr9i0v7g7cdx3rky1fa8aany5fyfav488kq6nc13fjb1";}
-{name="ktp-auth-handler";key="auth_handler";sha256="00gq5gq7imv7rv8xivl2s1n0k39llpmd5z46rvhai76z7hp8sj4l";}
-{name="ktp-call-ui";key="call_ui";sha256="1dwsq2ixci95byfg1ayy6g2zv0dbc0273r9wb395f220dgqpz7b4";}
-{name="ktp-common-internals";key="common_internals";sha256="049hh045p6nccyrjvagfw183vfa857xdl96q2w1vrj6frimniz9q";}
-{name="ktp-contact-list";key="contact_list";sha256="0xydyyla48y7q8pf84i12l7fx13p0gi8k4jl7nl7jxjsflzidscp";}
-{name="ktp-contact-runner";key="contact_runner";sha256="1bfb772cyzrbwjkglr3bvawp44dcqr59kkgvb6irgha8w7adic3b";}
-{name="ktp-desktop-applets";key="desktop_applets";sha256="150mpk7vq2w47vz2yffhj676k84fn3h8g77xklmyqm1y3f21dx01";}
-{name="ktp-filetransfer-handler";key="filetransfer_handler";sha256="07jgfydhr5hh7z0wkrz6k4gh3li9nmyxhjvxcxsayxrc7gnhazja";}
-{name="ktp-kded-integration-module";key="kded_integration_module";sha256="0axjqsk1h9c71hxpcy8ls7jsb0dsmsm75wdgwx71xrdb9hpqwn9f";}
-{name="ktp-send-file";key="send_file";sha256="0wiqrwhrmccx3ic0aaqlq539jcznkgsrwyn9hdizwsc8f33rxmri";}
-{name="ktp-text-ui";key="text_ui";sha256="0ch6sqvj9hpx3823c1wmziqy6g9v97sj1hihbaf8z8wyb84f0wbl";}
-]

pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix

···
-{ stdenv, fetchurl, fetchgit, automoc4, cmake, gettext, perl, pkgconfig
-, telepathy_qt, kdelibs4, kde_workspace, dbus_glib, dbus_libs, farstream
-, qt-gstreamer1, telepathy_glib, telepathy_logger
-, qjson, flex, bison, qca2 }:
-
-let
-  version = "0.8.80";
-  manifest = import (./. + "/${version}.nix");
-
-  overrides = {
-    call_ui = x : x // {
-      NIX_CFLAGS_COMPILE =
-        "-I${telepathy_glib}/include/telepathy-1.0"
-        + " -I${dbus_glib.dev}/include/dbus-1.0"
-        + " -I${dbus_libs.dev}/include/dbus-1.0";
-    };
-    telepathy_logger_qt = x : x // {
-      NIX_CFLAGS_COMPILE = "-I${dbus_libs.dev}/include/dbus-1.0";
-    };
-  };
-
-  extraBuildInputs = {
-    auth_handler = [ qjson qca2 ];
-    call_ui = [ qt-gstreamer1 telepathy_glib farstream ];
-    contact_applet = [ kde_workspace ];
-    telepathy_logger_qt = [ telepathy_logger qt-gstreamer1 ];
-    text_ui = [ qt-gstreamer1 telepathy_logger qjson ];
-    common_internals = [ telepathy_qt ];
-  };
-
-  extraNativeBuildInputs = {
-    telepathy_logger_qt = [ flex bison ];
-  };
-
-  ktpFun = { name, key, sha256 }:
-  {
-    name = key;
-    value = stdenv.mkDerivation (
-      (stdenv.lib.attrByPath [ key ] (x : x) overrides)
-      {
-        name = "${name}-${version}";
-
-        src = fetchurl {
-          url = "mirror://kde/unstable/kde-telepathy/${version}/src/${name}-${version}.tar.bz2";
-          inherit sha256;
-        };
-
-        nativeBuildInputs =
-          [ automoc4 cmake gettext perl pkgconfig ]
-          ++ (stdenv.lib.attrByPath [ key ] [] extraNativeBuildInputs);
-        buildInputs = [ kdelibs4 telepathy_qt ]
-          ++ stdenv.lib.optional (name != "ktp-common-internals") ktp.common_internals
-          ++ (stdenv.lib.attrByPath [ key ] [] extraBuildInputs);
-
-        meta = {
-          inherit (kdelibs4.meta) platforms;
-          maintainers = [ ];
-        };
-      }
-    );
-  };
-
-  ktp = builtins.listToAttrs (map ktpFun manifest);
-in
-ktp // {
-  inherit version;
-  recurseForDerivations = true;
-  full = stdenv.lib.attrValues ktp;
-}

pkgs/applications/networking/instant-messengers/telepathy/kde/update.sh

···
-#!/bin/sh
-
-usage() {
-  echo "$0 version|directory"
-}
-
-download() {
-  URL=ftp://ftp.kde.org/pub/kde/unstable/kde-telepathy/$1/src
-  destdir=$2
-  if test -n "$KDE_FULL_SESSION"; then
-    kioclient copy $URL $destdir
-  else
-    mkdir $destdir
-    lftp -c "open $URL; lcd $destdir; mget -c *"
-  fi
-}
-
-if [[ -d $1 ]]; then
-  directory=$1
-  version=$(ls $directory/* | head -n1 |
-    sed -e "s,$directory/[^0-9.]*\\([0-9.]\\+\\)\\.tar.*,\\1,")
-  echo "Version $version"
-else
-  version=$1
-  directory=src-$version
-  download $version $directory
-fi
-
-packages=$(ls $directory/* | sed -e "s,$directory/\\(.*\\)-$version.*,\\1,")
-echo $packages
-exec >$version.nix
-echo "["
-for name in $packages; do
-  hash=$(nix-hash --flat --type sha256 --base32 $directory/$name-$version.*)
-  key=${name#ktp-}
-  echo "{name=\"${name}\";key=\"${key//-/_}\";sha256=\"${hash}\";}"
-done
-echo "]"

pkgs/desktops/kde-4.14/kde-package/4.14.3.nix

···
   {name="baloo";value="0p3awsrc20q79kq04x0vjz84acxz6gjm9jc7j2al4kybkyzx5p4y";}
   {name="kde-baseapps";value="1nz6mm257rd916dklnbrix4r25scylvjil99b1djb35blx1aynqj";}
   {name="kdepimlibs";value="1mv8k0wr0wr0hnlb1al50nmz8d77vbm73p2hhipipgliq6zb3vb5";}
-  {name="kde-workspace";value="00bf708i0vzl47dgcr8mp61n7k0xjzqnlb8j1smliy5bydiaa86g";}
   {name="kfilemetadata";value="0wak1nphnphcam8r6pba7m2gld4w04dkk8qn23myjammv3myc59i";}
   {name="libkcddb";value="0xrmg53p5lh4ral2l5zh96angaf9czhih3zzvwr9qr9h9ks5vrn1";}
   {name="libkdcraw";value="0ksarwq8aaxc77cp0ryfnw1n311wkykzdlhj03rln8jjlbdm3j3q";}
···
   {name="kde-baseapps";value="4.14.3";}
   {name="kdepimlibs";value="4.14.3";}
   {name="kde-runtime";value="4.14.3";}
-  {name="kde-workspace";value="4.11.14";}
   {name="kfilemetadata";value="4.14.3";}
   {name="libkcddb";value="4.14.3";}
   {name="libkdcraw";value="4.14.3";}
···
 }
 { module="kactivities";  split=false;}
 { module="kdepimlibs";  split=false;}
-{ module="kde-workspace"; sane="kde_workspace"; split=false;}
 ];
 }

pkgs/desktops/kde-4.14/kde-workspace.nix

···
-{ stdenv, kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, lm_sensors
-, pciutils, libraw1394, libusb1, python, libqalculate, akonadi
-, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison
-, libjpeg, pkgconfig, kactivities, qjson, udev, fetchurl
-}:
-
-kde {
-#todo: wayland, xmms,   libusb isn't found
-#note: xorg.libXft is needed to build kfontview and kfontinst though this isn't reflected in the build log
-  buildInputs =
-    [ kdelibs qimageblitz libdbusmenu_qt xorg.libxcb xorg.xcbutilimage libjpeg
-      xorg.xcbutilrenderutil xorg.xcbutilkeysyms xorg.libpthreadstubs xorg.libXdmcp
-      xorg.libxkbfile xorg.libXcomposite  xorg.libXtst
-      xorg.libXdamage xorg.libXft
-
-      python boost qjson lm_sensors /* gpsd */ libraw1394 pciutils udev
-      akonadi pam libusb1 libqalculate kdepimlibs  prison
-      kactivities
-    ];
-
-  patches = [ ./files/ksysguard-0001-disable-signalplottertest.patch ];
-
-  preConfigure =
-   ''
-     # Fix incorrect path to kde4-config.
-     substituteInPlace startkde.cmake --replace '$bindir/kde4-config' ${kdelibs}/bin/kde4-config
-
-     # Fix the path to the keyboard configuration files.
-     substituteInPlace kcontrol/keyboard/xkb_rules.cpp \
-       --replace /usr/share/X11 ${xkeyboard_config}/etc/X11
-   '';
-
-  NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; # gcc-6
-
-  enableParallelBuilding = false; # frequent problems on Hydra
-
-  meta = {
-    description = "KDE workspace components such as Plasma, Kwin and System Settings";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}

pkgs/top-level/all-packages.nix

···
 
   kanboard = callPackage ../applications/misc/kanboard { };
 
-  kde-telepathy = kde4.callPackage ../applications/networking/instant-messengers/telepathy/kde {};
-
   kdeApplications =
     let
       mkApplications = import ../applications/kde;