diff options
99 files changed, 6 insertions, 2470 deletions
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index d1e79bae0828b..dacec0b82f517 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, lib, cmake, qt4, qtscriptgenerator, perl, gettext, curl -, libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs, automoc4, phonon -, strigi, soprano, qca2, libmtp, liblastfm, libgpod, pkgconfig }: +{ stdenv, fetchurl, lib, qtscriptgenerator, perl, gettext, curl +, libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs +, qca2, libmtp, liblastfm, libgpod, pkgconfig }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; - buildInputs = [ cmake qt4 qtscriptgenerator perl stdenv.gcc.libc gettext curl + buildInputs = [ qtscriptgenerator stdenv.gcc.libc gettext curl libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi soprano qca2 libmtp liblastfm libgpod pkgconfig ]; diff --git a/pkgs/applications/misc/filelight/default.nix b/pkgs/applications/misc/filelight/default.nix deleted file mode 100644 index 087c3ea045c92..0000000000000 --- a/pkgs/applications/misc/filelight/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{stdenv, fetchurl, lib, cmake, qt4, perl, qimageblitz, kdelibs, kdebase_workspace, -automoc4, phonon}: - -stdenv.mkDerivation { - name = "filelight-1.9rc3"; - src = fetchurl { - url = http://www.kde-apps.org/CONTENT/content-files/99561-filelight-1.9rc3.tgz; - sha256 = "0ljyx23j4cvrsi1dvmxila82q2cd26barmcvc8qmr74kz6pj78sq"; - }; - patches = [ ./gcc45.diff ]; - buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 phonon - qimageblitz ]; - meta = { - description = "Shows disk usage as an interactive map of concentric rings"; - license = "GPL"; - homepage = http://www.methylblue.com/filelight/; - maintainers = [ lib.maintainers.viric ]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/applications/misc/filelight/gcc45.diff b/pkgs/applications/misc/filelight/gcc45.diff deleted file mode 100644 index dcce2edaf16ba..0000000000000 --- a/pkgs/applications/misc/filelight/gcc45.diff +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/app/mainWindow.cpp b/src/app/mainWindow.cpp -index 68ec189..feb0e53 100644 ---- a/src/app/mainWindow.cpp -+++ b/src/app/mainWindow.cpp -@@ -222,7 +222,7 @@ inline void MainWindow::slotComboScan() - - inline bool MainWindow::slotScanPath(const QString &path) - { -- return slotScanUrl(KUrl::KUrl(path)); -+ return slotScanUrl(KUrl(path)); - } - - bool MainWindow::slotScanUrl(const KUrl &url) -diff --git a/src/part/radialMap/widget.cpp b/src/part/radialMap/widget.cpp -index d48a673..762f74e 100644 ---- a/src/part/radialMap/widget.cpp -+++ b/src/part/radialMap/widget.cpp -@@ -64,7 +64,7 @@ RadialMap::Widget::path() const - KUrl - RadialMap::Widget::url(File const * const file) const - { -- return KUrl::KUrl(file ? file->fullPath() : m_tree->fullPath()); -+ return KUrl(file ? file->fullPath() : m_tree->fullPath()); - } - - void diff --git a/pkgs/applications/networking/sync/akunambol/default.nix b/pkgs/applications/networking/sync/akunambol/default.nix index c27d8787bee66..2aedfd7f8334f 100644 --- a/pkgs/applications/networking/sync/akunambol/default.nix +++ b/pkgs/applications/networking/sync/akunambol/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, kdelibs, kdepimlibs, automoc4, funambol,liblikeback }: +{ stdenv, fetchgit, kdepimlibs, funambol, liblikeback }: stdenv.mkDerivation rec { name = "akunambol-20110304"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1d2x42lbw32qyawri7z0mrbafz36r035w5bxjpq51awyqjwkbb2d"; }; - buildInputs = [ cmake automoc4 kdelibs kdepimlibs funambol liblikeback ]; + buildInputs = [ kdepimlibs funambol liblikeback ]; KDEDIRS = liblikeback; patches = [ ./non-latin.diff ]; diff --git a/pkgs/desktops/kde-4.5/accessibility/color-schemes.nix b/pkgs/desktops/kde-4.5/accessibility/color-schemes.nix deleted file mode 100644 index 0be6cf2c6d5b0..0000000000000 --- a/pkgs/desktops/kde-4.5/accessibility/color-schemes.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, cmake, qt4, perl, automoc4, kdelibs }: - -kde.package { - buildInputs = [ cmake qt4 perl kdelibs automoc4 ]; - - meta = { - description = "KDE Accessibility color schemes"; - kde = { - name = "ColorSchemes"; - module = "kdeaccessibility"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/accessibility/icon-themes.nix b/pkgs/desktops/kde-4.5/accessibility/icon-themes.nix deleted file mode 100644 index 40e8a21d0e6a5..0000000000000 --- a/pkgs/desktops/kde-4.5/accessibility/icon-themes.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kde, cmake, qt4, perl, automoc4, kdelibs }: - -kde.package { - buildInputs = [ cmake qt4 perl kdelibs automoc4 ]; - - meta = { - description = "KDE mono icon theme"; - kde = { - name = "IconThemes"; - module = "kdeaccessibility"; - }; - }; -} - diff --git a/pkgs/desktops/kde-4.5/accessibility/jovie.nix b/pkgs/desktops/kde-4.5/accessibility/jovie.nix deleted file mode 100644 index 5fc138ca5c3f6..0000000000000 --- a/pkgs/desktops/kde-4.5/accessibility/jovie.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kde, cmake, qt4, perl, automoc4, kdelibs }: - -kde.package { - buildInputs = [ cmake qt4 perl kdelibs automoc4 ]; - -#TODO: working backend: speechd or opentts - meta = { - description = "Text-to-speech synthesis daemon"; - kde = { - name = "jovie"; - module = "kdeaccessibility"; - version = "0.6.0"; - versionFile = "jovie/jovie/main.cpp"; - }; - }; -} - diff --git a/pkgs/desktops/kde-4.5/accessibility/kmag.nix b/pkgs/desktops/kde-4.5/accessibility/kmag.nix deleted file mode 100644 index 84cad4d1e5464..0000000000000 --- a/pkgs/desktops/kde-4.5/accessibility/kmag.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kde, cmake, qt4, perl, automoc4, kdelibs }: - -kde.package { - buildInputs = [ cmake qt4 perl kdelibs automoc4 ]; - - meta = { - description = "Screen magnifier for KDE"; - kde = { - name = "kmag"; - module = "kdeaccessibility"; - version = "1.0"; - versionFile = "kmag/version.h"; - }; - }; -} - diff --git a/pkgs/desktops/kde-4.5/accessibility/kmousetool.nix b/pkgs/desktops/kde-4.5/accessibility/kmousetool.nix deleted file mode 100644 index 308aaad07e14a..0000000000000 --- a/pkgs/desktops/kde-4.5/accessibility/kmousetool.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake, qt4, perl, automoc4, kdelibs, libXtst }: - -kde.package { - buildInputs = [ cmake qt4 perl kdelibs automoc4 libXtst ]; - - meta = { - description = "A program that clicks the mouse for you"; - kde = { - name = "kmousetool"; - module = "kdeaccessibility"; - version = "1.12"; - versionFile = "kmousetool/kmousetool/version.h"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/accessibility/kmouth.nix b/pkgs/desktops/kde-4.5/accessibility/kmouth.nix deleted file mode 100644 index e576dfb68238c..0000000000000 --- a/pkgs/desktops/kde-4.5/accessibility/kmouth.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake, qt4, perl, automoc4, kdelibs }: - -kde.package { - buildInputs = [ cmake qt4 perl kdelibs automoc4 ]; - - meta = { - description = "A type-and-say front end for speech synthesizers"; - kde = { - name = "kmouth"; - module = "kdeaccessibility"; - version = "1.1.1"; - }; - }; -} - diff --git a/pkgs/desktops/kde-4.5/admin/builder.sh b/pkgs/desktops/kde-4.5/admin/builder.sh deleted file mode 100644 index 78e29543c1f02..0000000000000 --- a/pkgs/desktops/kde-4.5/admin/builder.sh +++ /dev/null @@ -1,13 +0,0 @@ -source $stdenv/setup - -myPatchPhase() -{ - for i in system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py system-config-printer-kde/system-config-printer-kde.py - do - sed -i -e "s|/usr/share/system-config-printer|$system_config_printer/share/system-config-printer|" $i - done - - sed -i -e "s|import cupshelpers.ppds, cupshelpers.cupshelpers|import ppds, cupshelpers|" system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py -} -patchPhase=myPatchPhase -genericBuild diff --git a/pkgs/desktops/kde-4.5/admin/default.nix b/pkgs/desktops/kde-4.5/admin/default.nix deleted file mode 100644 index c3b5a70b1dc52..0000000000000 --- a/pkgs/desktops/kde-4.5/admin/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ kde, cmake, qt4, pkgconfig, perl, python -, sip, pyqt4, pycups, rhpl, system_config_printer -, kdelibs, kdepimlibs, kdebindings, automoc4}: - -kde.package { - - builder = ./builder.sh; - - inherit system_config_printer; - - # TODO: split, check which packages work on nixos - - PYTHONPATH = "${pycups}/lib/python${python.majorVersion}/site-packages"; - - buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups rhpl system_config_printer - kdelibs kdepimlibs kdebindings automoc4 ]; - - meta = { - description = "KDE Administration Utilities"; - license = "GPL"; - kde.name = "kdeadmin"; - }; -} diff --git a/pkgs/desktops/kde-4.5/artwork/FindXscreensaver.cmake b/pkgs/desktops/kde-4.5/artwork/FindXscreensaver.cmake deleted file mode 100644 index 499ed75268e9e..0000000000000 --- a/pkgs/desktops/kde-4.5/artwork/FindXscreensaver.cmake +++ /dev/null @@ -1,73 +0,0 @@ -#Macro to find xscreensaver directory - -# Copyright (c) 2006, Laurent Montel, <montel@kde.org> -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -if (NOT XSCREENSAVER_FOUND) - FIND_PATH(XSCREENSAVER_DIR deco - HINTS - ${KDE4_INCLUDE_DIR} - PATHS - /usr - /usr/local - /opt/local - /usr/X11R6 - /opt/kde - /opt/kde3 - /usr/kde - /usr/local/kde - /usr/local/xscreensaver - /usr/openwin/lib/xscreensaver - /etc - PATH_SUFFIXES - lib${LIB_SUFFIX}/xscreensaver - lib${LIB_SUFFIX}/misc/xscreensaver - lib/xscreensaver - lib64/xscreensaver - lib/misc/xscreensaver - libexec/xscreensaver - bin/xscreensaver-hacks - hacks) - message(STATUS "XSCREENSAVER_DIR <${XSCREENSAVER_DIR}>") - - FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml - PATHS - ${KDE4_INCLUDE_DIR} - /usr/ - /usr/local/ - /opt/local/ - /usr/X11R6/ - /opt/kde/ - /opt/kde3/ - /usr/kde/ - /usr/local/kde/ - /usr/openwin/lib/xscreensaver/ - /etc/ - PATH_SUFFIXES xscreensaver xscreensaver/config share/xscreensaver/config - ) - MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>") - -endif(NOT XSCREENSAVER_FOUND) - -#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>") -#MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>") - -# Need to fix hack -if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR) - set(XSCREENSAVER_FOUND TRUE) -endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR) - -if (XSCREENSAVER_FOUND) - if (NOT Xscreensaver_FIND_QUIETLY) - message(STATUS "Found XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>") - endif (NOT Xscreensaver_FIND_QUIETLY) -else (XSCREENSAVER_FOUND) - if (Xscreensaver_FIND_REQUIRED) - message(FATAL_ERROR "XScreenSaver not found") - endif (Xscreensaver_FIND_REQUIRED) -endif (XSCREENSAVER_FOUND) - - -MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR) diff --git a/pkgs/desktops/kde-4.5/artwork/aurorae.nix b/pkgs/desktops/kde-4.5/artwork/aurorae.nix deleted file mode 100644 index 183914bf231a8..0000000000000 --- a/pkgs/desktops/kde-4.5/artwork/aurorae.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ cmake, kde, automoc4, kdelibs }: - -kde.package rec { - name = "aurorae-themes-${kde.release}"; - - buildInputs = [ cmake automoc4 kdelibs ]; - - meta = { - kde = { - name = "aurorae"; - module = "kdeartwork"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/artwork/color-schemes.nix b/pkgs/desktops/kde-4.5/artwork/color-schemes.nix deleted file mode 100644 index 7d20acb3a81ef..0000000000000 --- a/pkgs/desktops/kde-4.5/artwork/color-schemes.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ cmake, kde, automoc4, kdelibs }: - -kde.package rec { - name = "kde-color-schemes-${kde.release}"; - - buildInputs = [ cmake automoc4 kdelibs ]; - meta = { - description = "Additional KDE color schemes"; - kde = { - name = "ColorSchemes"; - module = "kdeartwork"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/artwork/desktop-themes.nix b/pkgs/desktops/kde-4.5/artwork/desktop-themes.nix deleted file mode 100644 index 760acd0292838..0000000000000 --- a/pkgs/desktops/kde-4.5/artwork/desktop-themes.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ cmake, kde, automoc4, kdelibs }: - -kde.package rec { - name = "kde-desktop-themes-${kde.release}"; - - buildInputs = [ cmake automoc4 kdelibs ]; - meta = { - description = "Additional KDE desktop themes"; - kde = { - name = "desktopthemes"; - module = "kdeartwork"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/artwork/emoticons.nix b/pkgs/desktops/kde-4.5/artwork/emoticons.nix deleted file mode 100644 index 05d40947a94ae..0000000000000 --- a/pkgs/desktops/kde-4.5/artwork/emoticons.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ cmake, kde, automoc4, kdelibs }: - -kde.package rec { - name = "kde-emotion-icons-${kde.release}"; - - buildInputs = [ cmake automoc4 kdelibs ]; - meta = { - description = "Additional KDE emotion icons (smiles)"; - kde = { - name = "emoticons"; - module = "kdeartwork"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/artwork/high-resolution-wallpapers.nix b/pkgs/desktops/kde-4.5/artwork/high-resolution-wallpapers.nix deleted file mode 100644 index 17e0af4c86f2e..0000000000000 --- a/pkgs/desktops/kde-4.5/artwork/high-resolution-wallpapers.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ cmake, kde, automoc4, kdelibs }: - -kde.package rec { - name = "kde-wallpapers-high-resolution-${kde.release}"; - - buildInputs = [ cmake automoc4 kdelibs ]; - meta = { - description = "KDE wallpapers in high resolution"; - kde = { - name = "HighResolutionWallpapers"; - module = "kdeartwork"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix b/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix deleted file mode 100644 index ca7e65b9f39b4..0000000000000 --- a/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ cmake, kde, automoc4, kdelibs, xscreensaver, kdebase_workspace, eigen }: - -kde.package rec { - buildInputs = [ cmake automoc4 kdelibs xscreensaver kdebase_workspace eigen ]; - preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake"; - meta = { - description = "KDE screensavers"; - kde = { - name = "kscreensaver"; - module = "kdeartwork"; - version = "1.0"; - versionFile = "kscreensaver/kpartsaver/kpartsaver.cpp"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/artwork/nuvola-icon-theme.nix b/pkgs/desktops/kde-4.5/artwork/nuvola-icon-theme.nix deleted file mode 100644 index 8bd1f4011367d..0000000000000 --- a/pkgs/desktops/kde-4.5/artwork/nuvola-icon-theme.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ cmake, kde, automoc4, kdelibs }: - -kde.package rec { - name = "nuvola-icon-theme-${kde.release}"; - - # Sources contain primary and kdeclassic as well but they're not installed - - buildInputs = [ cmake automoc4 kdelibs ]; - meta = { - description = "KDE nuvola icon theme"; - kde = { - name = "IconThemes"; - module = "kdeartwork"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/artwork/phase-style.nix b/pkgs/desktops/kde-4.5/artwork/phase-style.nix deleted file mode 100644 index c4295b668100c..0000000000000 --- a/pkgs/desktops/kde-4.5/artwork/phase-style.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ cmake, kde, automoc4, kdelibs }: - -kde.package rec { - name = "kde-style-phase-${kde.release}"; - - buildInputs = [ cmake automoc4 kdelibs ]; - meta = { - description = "KDE phase style. Clean classical look"; - kde = { - name = "styles"; - module = "kdeartwork"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/artwork/sounds.nix b/pkgs/desktops/kde-4.5/artwork/sounds.nix deleted file mode 100644 index e0824503281b4..0000000000000 --- a/pkgs/desktops/kde-4.5/artwork/sounds.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ cmake, kde, automoc4, kdelibs }: - -kde.package rec { - name = "kde-sounds-${kde.release}"; - - buildInputs = [ cmake automoc4 kdelibs ]; - meta = { - description = "New login/logout sounds"; - kde = { - name = "sounds"; - module = "kdeartwork"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/artwork/wallpapers.nix b/pkgs/desktops/kde-4.5/artwork/wallpapers.nix deleted file mode 100644 index e2cad0b717818..0000000000000 --- a/pkgs/desktops/kde-4.5/artwork/wallpapers.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ cmake, kde, automoc4, kdelibs }: - -kde.package rec { - name = "kde-wallpapers-${kde.release}"; - - buildInputs = [ cmake automoc4 kdelibs ]; - meta = { - description = "Additional KDE wallpapers"; - kde = { - name = "wallpapers"; - module = "kdeartwork"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/artwork/weather-wallpapers.nix b/pkgs/desktops/kde-4.5/artwork/weather-wallpapers.nix deleted file mode 100644 index b4354c10f8741..0000000000000 --- a/pkgs/desktops/kde-4.5/artwork/weather-wallpapers.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ cmake, kde, automoc4, kdelibs }: - -kde.package rec { - name = "kde-weather-wallpapers-${kde.release}"; - - buildInputs = [ cmake automoc4 kdelibs ]; - meta = { - description = "Additional KDE wallpapers (weather)"; - kde = { - name = "WeatherWallpapers"; - module = "kdeartwork"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/base-runtime/default.nix b/pkgs/desktops/kde-4.5/base-runtime/default.nix deleted file mode 100644 index 293bc8dd04d64..0000000000000 --- a/pkgs/desktops/kde-4.5/base-runtime/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ kde, cmake, perl, bzip2, xz, qt4, alsaLib, xineLib, samba, - shared_mime_info, exiv2, libssh , kdelibs, automoc4, strigi, soprano, - cluceneCore, attica, virtuoso, makeWrapper, oxygen_icons }: - -kde.package { - - buildInputs = [ cmake perl bzip2 xz qt4 alsaLib xineLib samba shared_mime_info - exiv2 libssh kdelibs automoc4 strigi soprano cluceneCore attica - makeWrapper]; - -# TODO: OpenSLP, OpenEXR - postInstall = '' - rm -v $out/share/icons/default.kde4 - wrapProgram "$out/bin/nepomukservicestub" --prefix LD_LIBRARY_PATH : "${virtuoso}/lib" \ - --prefix PATH : "${virtuoso}/bin" - ''; - - meta = { - description = "KDE runtime"; - longDescription = "Libraries and tools which supports running KDE desktop applications"; - license = "LGPL"; - kde.name = "kdebase-runtime"; - }; -} diff --git a/pkgs/desktops/kde-4.5/base-workspace/default.nix b/pkgs/desktops/kde-4.5/base-workspace/default.nix deleted file mode 100644 index 648e24d987def..0000000000000 --- a/pkgs/desktops/kde-4.5/base-workspace/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ kde, cmake, perl, python, pam, consolekit -, qt4, sip, pyqt4, kdelibs, kdepimlibs, kdebindings -, libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver -, lm_sensors, libxklavier, libusb, libpthreadstubs, boost -, automoc4, strigi, soprano, qimageblitz, akonadi -, libdbusmenu_qt, libqalculate, pciutils, libraw1394, bluez -}: - -kde.package { - -# TODO: qedje, qzion, ggadgets, libgps - buildInputs = [ cmake perl python qt4 pam consolekit sip pyqt4 kdelibs libXtst - kdepimlibs kdebindings boost libusb libXi libXau libXdmcp libraw1394 - libXcomposite libXdamage libXScrnSaver lm_sensors libxklavier automoc4 - strigi soprano qimageblitz akonadi libpthreadstubs libdbusmenu_qt libqalculate - pciutils bluez ]; - - patches = - [ # Don't do compositing with the software GLX driver, since it's - # completely broken (corrupt output, server crashes, etc.). - # (NixOS/121) - ./no-software-compositing.patch - ]; - - meta = { - description = "KDE base platform-specific components"; - longDescription = "KDE base components that are only required to work with X11 such KDM and KWin"; - license = "GPL"; - kde.name = "kdebase-workspace"; - }; -} diff --git a/pkgs/desktops/kde-4.5/base-workspace/no-software-compositing.patch b/pkgs/desktops/kde-4.5/base-workspace/no-software-compositing.patch deleted file mode 100644 index 7c9e102bc95a3..0000000000000 --- a/pkgs/desktops/kde-4.5/base-workspace/no-software-compositing.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -ru -x '*~' kdebase-workspace-4.5.5-orig//kwin/compositingprefs.cpp kdebase-workspace-4.5.5/kwin/compositingprefs.cpp ---- kdebase-workspace-4.5.5-orig//kwin/compositingprefs.cpp 2010-06-24 18:28:18.000000000 +0200 -+++ kdebase-workspace-4.5.5/kwin/compositingprefs.cpp 2011-03-11 16:33:07.296566718 +0100 -@@ -314,9 +314,10 @@ - //else if( mDriver == "radeon" ) - // { - // } -- //else if( mDriver == "software" ) -- // { -- // } -+ else if( mDriver == "software" ) -+ { -+ mRecommendCompositing = false; -+ } - } - - diff --git a/pkgs/desktops/kde-4.5/base/default.nix b/pkgs/desktops/kde-4.5/base/default.nix deleted file mode 100644 index 2f0c78e5f01d8..0000000000000 --- a/pkgs/desktops/kde-4.5/base/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kde, cmake, perl, qt4, kdelibs, pciutils, libraw1394 , automoc4, strigi -, qimageblitz, soprano}: - -kde.package { - preConfigure = "cd apps"; - - buildInputs = [ cmake perl qt4 kdelibs pciutils libraw1394 automoc4 - strigi qimageblitz ]; - - meta = { - description = "KDE Base components"; - longDescription = "Applications that form the KDE desktop, like Plasma, System Settings, Konqueror, Dolphin, Kate, and Konsole"; - license = "GPL"; - kde.name = "kdebase"; - }; -} diff --git a/pkgs/desktops/kde-4.5/bindings/default.nix b/pkgs/desktops/kde-4.5/bindings/default.nix deleted file mode 100644 index ec4c2ecc4cb52..0000000000000 --- a/pkgs/desktops/kde-4.5/bindings/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ kde, lib, cmake, perl, python, sip, pyqt4, zlib, libpng, freetype, fontconfig, qt4, boost -, kdelibs, kdepimlibs, automoc4, soprano, akonadi, attica, polkit_qt_1, ruby -}: - -# This function will only build the pykde4 module. I don't need the other bindings and -# some bindings are even broken. - -kde.package rec { - patches = [ ./python-site-packages-install-dir.diff ./sip-4.11.patch ]; - - preConfigure = '' - CUSTOM_RUBY_SITE_ARCH_DIR=$(ruby -r rbconfig -e "print Config::CONFIG['sitearchdir']" | sed -e "s@${ruby}@$out@") - CUSTOM_RUBY_SITE_LIB_DIR=$(ruby -r rbconfig -e "print Config::CONFIG['sitelibdir']" | sed -e "s@${ruby}@$out@") - CUSTOM_PERL_SITE_ARCH_DIR=$(perl -MConfig -e 'print $Config{sitearch}' | sed -e "s@${perl}@$out@") - cmakeFlagsArray+=( - -DSIP_DEFAULT_SIP_DIR=$out/share/sip - -DCUSTOM_RUBY_SITE_ARCH_DIR=$CUSTOM_RUBY_SITE_ARCH_DIR - -DCUSTOM_RUBY_SITE_LIB_DIR=$CUSTOM_RUBY_SITE_LIB_DIR - -DCUSTOM_PERL_SITE_ARCH_DIR=$CUSTOM_PERL_SITE_ARCH_DIR - ) - ''; - - # TODO: okular, qimageblitz, qwt5, qscintilla2, c# - buildInputs = [ cmake perl python sip pyqt4 zlib libpng freetype fontconfig qt4 boost - kdelibs kdepimlibs automoc4 soprano attica polkit_qt_1 ruby ]; - - meta = { - description = "KDE bindings"; - longDescription = "Provides KDE bindings for several languages such as Java, Smoke and Python"; - license = "LGPL"; - kde.name = "kdebindings"; - }; -} - diff --git a/pkgs/desktops/kde-4.5/bindings/python-site-packages-install-dir.diff b/pkgs/desktops/kde-4.5/bindings/python-site-packages-install-dir.diff deleted file mode 100644 index 7fe64e7eff552..0000000000000 --- a/pkgs/desktops/kde-4.5/bindings/python-site-packages-install-dir.diff +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/python/pykde4/CMakeLists.txt b/python/pykde4/CMakeLists.txt -index 01b69dc..375661d 100644 ---- a/python/pykde4/CMakeLists.txt -+++ b/python/pykde4/CMakeLists.txt -@@ -188,12 +188,12 @@ IF(POLKITQT_FOUND) - SET(PYKDE_MODULES "${PYKDE_MODULES} polkitqt") - ENDIF(POLKITQT_FOUND) - --PYTHON_INSTALL(__init__.py ${PYTHON_SITE_PACKAGES_DIR}/PyKDE4) -+PYTHON_INSTALL(__init__.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4) - - MESSAGE(STATUS "KDE_VERSION: ${KDE_VERSION}") - MESSAGE(STATUS "KDE4_INCLUDE_DIR: ${KDE4_INCLUDE_DIR}") - MESSAGE(STATUS "KDE4_LIB_DIR: ${KDE4_LIB_DIR}") --MESSAGE(STATUS "PYTHON_SITE_PACKAGES_DIR: ${PYTHON_SITE_PACKAGES_DIR}") -+MESSAGE(STATUS "PYTHON_SITE_PACKAGES_INSTALL_DIR: ${PYTHON_SITE_PACKAGES_INSTALL_DIR}") - - # Setup and install pykdeconfig.py - -@@ -225,7 +225,7 @@ _pkg_config = { - 'konsolepart': 'False', - 'libdir': '${LIB_DIR}', - 'pykde_kde_sip_flags': '${_SIP_TAGS} ${_SIP_X} ${SIP_EXTRA_OPTIONS}', -- 'pykde_mod_dir': '${PYTHON_SITE_PACKAGES_DIR}/PyKDE4', -+ 'pykde_mod_dir': '${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4', - 'pykde_modules': '${PYKDE_MODULES}', - 'pykde_sip_dir': '${SIP_DEFAULT_SIP_DIR}/PyKDE4', - 'pykde_version': kde_version_hex, -@@ -235,7 +235,7 @@ _pkg_config = { - _default_macros = None") - - CONFIGURE_FILE(pykdeconfig.py.in ${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py) --PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py ${PYTHON_SITE_PACKAGES_DIR}/PyKDE4) -+PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4) - - # Install the .sip files for anyone that wants to build bindings on top of PyKDE4. - # (Don't forget the / at the end of sip/.) -diff --git a/python/pykde4/tools/pykdeuic4/CMakeLists.txt b/python/pykde4/tools/pykdeuic4/CMakeLists.txt -index ea711ba..115c777 100644 ---- a/python/pykde4/tools/pykdeuic4/CMakeLists.txt -+++ b/python/pykde4/tools/pykdeuic4/CMakeLists.txt -@@ -1,5 +1,9 @@ - --PYTHON_INSTALL(kde4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/widget-plugins/) --PYTHON_INSTALL(pykdeuic4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/) -+PYTHON_INSTALL(kde4.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/widget-plugins/) -+PYTHON_INSTALL(pykdeuic4.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/) - find_path(cmake_module_dir create_exe_symlink.cmake ${CMAKE_MODULE_PATH}) --INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" ) -+IF(IS_ABSOLUTE ${PYTHON_SITE_PACKAGES_INSTALL_DIR}) -+ INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" ) -+ELSE(IS_ABSOLUTE ${PYTHON_SITE_PACKAGES_INSTALL_DIR}) -+ INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" ) -+ENDIF(IS_ABSOLUTE ${PYTHON_SITE_PACKAGES_INSTALL_DIR}) diff --git a/pkgs/desktops/kde-4.5/bindings/sip-4.11.patch b/pkgs/desktops/kde-4.5/bindings/sip-4.11.patch deleted file mode 100644 index 15059e2526d26..0000000000000 --- a/pkgs/desktops/kde-4.5/bindings/sip-4.11.patch +++ /dev/null @@ -1,67 +0,0 @@ -Make kdebindings compile against sip-4.11, from KDE svn -Index: kdebindings/python/pykde4/sip/kdecore/typedefs.sip -=================================================================== ---- kdebindings/python/pykde4/sip/kdecore/typedefs.sip (revision 1170601) -+++ kdebindings/python/pykde4/sip/kdecore/typedefs.sip (revision 1170602) -@@ -733,61 +733,6 @@ - }; - - --%MappedType QList<uint> --{ --%TypeHeaderCode --#include <qlist.h> --%End -- --%ConvertFromTypeCode -- // Create the list. -- PyObject *l; -- -- if ((l = PyList_New(sipCpp->size())) == NULL) -- return NULL; -- -- // Set the list elements. -- for (int i = 0; i < sipCpp->size(); ++i) { -- PyObject *pobj; -- --#if PY_MAJOR_VERSION >= 3 -- if ((pobj = PyLong_FromLong(sipCpp->value(i))) == NULL) { --#else -- if ((pobj = PyInt_FromLong(sipCpp->value(i))) == NULL) { --#endif -- Py_DECREF(l); -- -- return NULL; -- } -- -- PyList_SET_ITEM(l, i, pobj); -- } -- -- return l; --%End -- --%ConvertToTypeCode -- // Check the type if that is all that is required. -- if (sipIsErr == NULL) -- return PyList_Check(sipPy); -- -- QList<uint> *ql = new QList<uint>; -- -- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) { --#if PY_MAJOR_VERSION >= 3 -- ql->append(PyLong_AsLong(PyList_GET_ITEM(sipPy, i))); --#else -- ql->append(PyInt_AsLong(PyList_GET_ITEM(sipPy, i))); --#endif -- } -- -- *sipCppPtr = ql; -- -- return sipGetState(sipTransferObj); --%End --}; -- -- - template <TYPE*> - %MappedType QStack<TYPE*> - { diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix deleted file mode 100644 index e231ef104c020..0000000000000 --- a/pkgs/desktops/kde-4.5/default.nix +++ /dev/null @@ -1,155 +0,0 @@ -{ callPackage, recurseIntoAttrs, callPackageOrig, runCommand, stdenv, fetchurl, qt47, ffmpeg_0_6_90 } : - -let - - release = "4.5.5"; - - # Various packages (e.g. kdesdk) have been split up into many - # smaller packages. Some people may want to install the entire - # package, so provide a wrapper package that recombines them. - combinePkgs = name: pkgs: - let pkgs' = stdenv.lib.attrValues pkgs; in - runCommand "${name}-${release}" ({ passthru = pkgs // { inherit pkgs; }; }) - '' - mkdir -p $out/nix-support - echo ${toString pkgs'} > $out/nix-support/propagated-user-env-packages - ''; - -in - -rec { - inherit callPackage stdenv; - - qt4 = qt47; - - ffmpeg = ffmpeg_0_6_90; - - shared_desktop_ontologies = callPackage ./support/shared-desktop-ontologies { }; - - kde = callPackage ./kde-package { inherit release; }; - -### SUPPORT - akonadi = callPackage ./support/akonadi { }; - - attica = callPackage ./support/attica { }; - - oxygen_icons = callPackage ./support/oxygen-icons { }; - - polkit_qt_1 = callPackage ./support/polkit-qt-1 { }; - -### LIBS - kdelibs = callPackage ./libs { }; - - kdepimlibs = callPackage ./pimlibs { }; - -### BASE - kdebase = callPackage ./base { }; - - # Forward compatibility. - kde_baseapps = kdebase; - - kdebase_workspace = callPackage ./base-workspace { }; - - kdebase_runtime = callPackage ./base-runtime { }; - -### OTHER MODULES - - kdeaccessibility = combinePkgs "kdeaccessibility" { - colorSchemes = callPackage ./accessibility/color-schemes.nix { }; - iconThemes = callPackage ./accessibility/icon-themes.nix { }; - jovie = callPackage ./accessibility/jovie.nix { }; - kmag = callPackage ./accessibility/kmag.nix { }; - kmousetool = callPackage ./accessibility/kmousetool.nix { }; - kmouth = callPackage ./accessibility/kmouth.nix { }; - }; - - kdeadmin = callPackage ./admin { }; - - kdeartwork = combinePkgs "kdeartwork" { - aurorae = callPackage ./artwork/aurorae.nix { }; - colorSchemes = callPackage ./artwork/color-schemes.nix { }; - desktop_themes = callPackage ./artwork/desktop-themes.nix { }; - emoticons = callPackage ./artwork/emoticons.nix { }; - high_resolution_wallpapers = callPackage ./artwork/high-resolution-wallpapers.nix { }; - wallpapers = callPackage ./artwork/wallpapers.nix { }; - nuvola_icon_theme = callPackage ./artwork/nuvola-icon-theme.nix { }; - sounds = callPackage ./artwork/sounds.nix { }; - weather_wallpapers = callPackage ./artwork/weather-wallpapers.nix { }; - phase_style = callPackage ./artwork/phase-style.nix { }; - kscreensaver = callPackage ./artwork/kscreensaver.nix { }; - }; - - kdeedu = callPackage ./edu { }; - kdegames = callPackage ./games { }; - kdegraphics = callPackage ./graphics { }; - kdemultimedia = callPackage ./multimedia { }; - kdenetwork = callPackage ./network { }; - kdeplasma_addons = callPackage ./plasma-addons { }; - - kdesdk = combinePkgs "kdesdk" { - cervisia = callPackage ./sdk/cervisia.nix { }; - kapptemplate = callPackage ./sdk/kapptemplate.nix { }; - kate = callPackage ./sdk/kate.nix { }; - kcachegrind = callPackage ./sdk/kcachegrind.nix { }; - kdeaccounts_plugin = callPackage ./sdk/kdeaccounts-plugin.nix { }; - dolphin_plugins = callPackage ./sdk/dolphin-plugins.nix { }; - kioslave_perldoc = callPackage ./sdk/kioslave-perldoc.nix { }; - kioslave_svn = callPackage ./sdk/kioslave-svn.nix { }; - strigi_analyzer = callPackage ./sdk/strigi-analyzer.nix { }; - kbugbuster = callPackage ./sdk/kbugbuster.nix { }; - kmtrace = callPackage ./sdk/kmtrace.nix { }; - kompare = callPackage ./sdk/kompare.nix { }; - kpartloader = callPackage ./sdk/kpartloader.nix { }; - kprofilemethod = callPackage ./sdk/kprofilemethod.nix { }; - kstartperf = callPackage ./sdk/kstartperf.nix { }; - kuiviewer = callPackage ./sdk/kuiviewer.nix { }; - lokalize = callPackage ./sdk/lokalize.nix { }; - poxml = callPackage ./sdk/poxml.nix { }; - scripts = callPackage ./sdk/scripts.nix { }; - umbrello = callPackage ./sdk/umbrello.nix { }; - }; - - kdetoys = combinePkgs "kdetoys" { - amor = callPackage ./toys/amor.nix { }; - kteatime = callPackage ./toys/kteatime.nix { }; - ktux = callPackage ./toys/ktux.nix { }; - }; - - kdeutils = combinePkgs "kdeutils" { - ark = callPackage ./utils/ark.nix { }; - kcalc = callPackage ./utils/kcalc.nix { }; - kcharselect = callPackage ./utils/kcharselect.nix { }; - kdf = callPackage ./utils/kdf.nix { }; - kfloppy = callPackage ./utils/kfloppy.nix { }; - kgpg = callPackage ./utils/kgpg.nix { }; - kremotecontrol = callPackage ./utils/kremotecontrol.nix { }; - ktimer = callPackage ./utils/ktimer.nix { }; - kwallet = callPackage ./utils/kwallet.nix { }; - okteta = callPackage ./utils/okteta.nix { }; - #printer_applet = callPackage ./utils/printer-applet.nix { }; - superkaramba = callPackage ./utils/superkaramba.nix { }; - sweeper = callPackage ./utils/sweeper.nix { }; - }; - - kdewebdev = combinePkgs "kdewebdev" { - klinkstatus = callPackage ./webdev/klinkstatus.nix { }; - kommander = callPackage ./webdev/kommander.nix { }; - kfilereplace = callPackage ./webdev/kfilereplace.nix { }; - kimagemapeditor = callPackage ./webdev/kimagemapeditor.nix { }; - }; - - kdepim_runtime = callPackage ./pim-runtime { }; - kdepim = callPackage ./pim { }; - -### DEVELOPMENT - - #kdebindings = callPackage ./bindings { }; - kdebindings = null; - - l10n = callPackage ./l10n { inherit release; }; - - # Make the split packages visible to `nix-env -q'. - misc = recurseIntoAttrs - (kdeaccessibility.pkgs // kdeartwork.pkgs // kdesdk.pkgs // kdetoys.pkgs // kdeutils.pkgs // kdewebdev.pkgs); - -} diff --git a/pkgs/desktops/kde-4.5/edu/default.nix b/pkgs/desktops/kde-4.5/edu/default.nix deleted file mode 100644 index f9132de8739a8..0000000000000 --- a/pkgs/desktops/kde-4.5/edu/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ kde, cmake, qt4, perl, libxml2, libxslt, openbabel, boost, readline, gmm, gsl -, xplanet, libspectre, pkgconfig, libqalculate, python -, kdelibs, automoc4, eigen, attica}: - -kde.package { - -#TODO: -#* Boost.Python (1.31 or higher) <http://www.boost.org/> - fails to find -# * libcfitsio0 (3.09 or higher) <http://indi.sf.net> -# * libindi (0.6.1 or higher) <http://indi.sf.net> -# * R <http://www.r-project.org/> -# * OCaml <http://caml.inria.fr/> -# * LibFacile <http://www.recherche.enac.fr/log/facile/> -# * Avogadro (1.0 or higher) <http://avogadro.openmolecules.net> -# * libgps - - buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm - gsl xplanet kdelibs automoc4 eigen attica libspectre pkgconfig - libqalculate python ]; - - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${python}/include/${python.libPrefix}" - export NIX_LDFLAGS="$NIX_LDFLAGS -l${python.libPrefix} -lboost_python" - ''; - cmakeFlags = '' -DBOOST_PYTHON_INCLUDES="${boost}/include" -DBOOST_PYTHON_LIBS="boost_python" -DKIG_ENABLE_PYTHON_SCRIPTING=1''; - - meta = { - description = "KDE educational software"; - license = "GPL"; - kde.name = "kdeedu"; - }; -} diff --git a/pkgs/desktops/kde-4.5/games/default.nix b/pkgs/desktops/kde-4.5/games/default.nix deleted file mode 100644 index 8a407b3f57215..0000000000000 --- a/pkgs/desktops/kde-4.5/games/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{kde, cmake, qt4, perl, shared_mime_info, kdelibs, automoc4, qca2 -, kdebindings, twisted, python, pyqt4, sip, makeWrapper }: - -kde.package { - -# TODO: ggz - buildInputs = [ cmake qt4 perl shared_mime_info kdelibs automoc4 qca2 - kdebindings twisted python pyqt4 sip makeWrapper ]; - - meta = { - description = "KDE Games"; - license = "GPL"; - kde.name = "kdegames"; - }; -} diff --git a/pkgs/desktops/kde-4.5/graphics/default.nix b/pkgs/desktops/kde-4.5/graphics/default.nix deleted file mode 100644 index 36aeaf28019a2..0000000000000 --- a/pkgs/desktops/kde-4.5/graphics/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ kde, cmake, lib, perl, qt4, exiv2, lcms, saneBackends, libgphoto2 -, libspectre, popplerQt4, djvulibre, chmlib, shared_mime_info, libXxf86vm -, kdelibs, automoc4, strigi, qimageblitz, soprano, qca2, ebook_tools }: - -kde.package { - - buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends libgphoto2 libspectre - (popplerQt4.override { inherit qt4; }) chmlib shared_mime_info libXxf86vm - kdelibs automoc4 strigi qimageblitz soprano qca2 djvulibre ebook_tools ]; - - meta = { - description = "KDE graphics utilities"; - longDescription = '' - Contains various graphics utilities such as Gwenview image viewer and - Okular document reader. - ''; - license = "GPL"; - kde.name = "kdegraphics"; - }; -} diff --git a/pkgs/desktops/kde-4.5/kde-package/default.nix b/pkgs/desktops/kde-4.5/kde-package/default.nix deleted file mode 100644 index 81a36fe9502d2..0000000000000 --- a/pkgs/desktops/kde-4.5/kde-package/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ stdenv, fetchurl, release }: - -rec { - inherit release; - - defaultArgs = { name, stable ? true, version ? release, module ? name, ... }: - - ( - { - name = "${name}-${version}"; - - src = fetchurl { - url = "mirror://kde/" + (if stable then "" else "un") - + "stable/${release}/src/${module}-${release}.tar.bz2"; - sha256 = (stdenv.lib.findFirst - (x: x.module == module) - (throw "No module ${module} in release ${release}!") - (import (./manifest + "-${release}.nix")) - ).sha256; - }; - - enableParallelBuilding = true; - - meta = { - maintainers = with stdenv.lib.maintainers; [ sander urkud ]; - platforms = stdenv.lib.platforms.linux; - homepage = if name == module - then http://www.kde.org - else assert builtins.substring 0 3 module == "kde"; - "http://" - + builtins.substring 3 - (builtins.sub (builtins.stringLength module) 3) module - + ".kde.org/projects/${name}"; - }; - } // (if module == name then { } else { - cmakeFlags = '' - -DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE - -DBUILD_doc=TRUE -DBUILD_${name}=TRUE''; - }) - ); - - package = a@{meta, ...}: - assert a.meta ? kde; - let - default = defaultArgs a.meta.kde; - in -# hand-written merge - stdenv.mkDerivation ( - default - // removeAttrs a [ "meta" "cmakeFlags" ] - // { - meta = default.meta // a.meta; - } - // (if default ? cmakeFlags || a ? cmakeFlags then { - cmakeFlags = - (if default ? cmakeFlags then "${default.cmakeFlags}" else "") - + (if default ? cmakeFlags && a ? cmakeFlags then " " else "") - + (if a ? cmakeFlags then a.cmakeFlags else ""); - } else { } - )); -} diff --git a/pkgs/desktops/kde-4.5/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.5/kde-package/kde-manifest.sh deleted file mode 100755 index 3811769c57ae6..0000000000000 --- a/pkgs/desktops/kde-4.5/kde-package/kde-manifest.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# Usage: download kde release to $dir, then run -# $0 $dir - -dir=$1 - -if [[ ! -d "${dir}" ]]; then - echo "${dir} is not a directory (or doesn't exist)!" >&2 - exit 1 -fi - -release=$(ls "${dir}"/kdelibs-*.tar.bz2 | \ - sed -e 's/.*kdelibs-//' -e 's/\.tar\.bz2//') - -echo "Detected release ${release}" >&2 - -exec > "manifest-${release}.nix" -echo "[" -for i in `cd "${dir}"; ls *-${release}.tar.bz2`; do - module=${i%-${release}.tar.bz2} - echo -n "${module}.. " >&2 - hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}") - echo "{" - echo " module = \"${module}\";" - echo " sha256 = \"${hash}\";" - echo "}" - echo $hash >&2 -done -echo "]" diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest-4.5.5.nix b/pkgs/desktops/kde-4.5/kde-package/manifest-4.5.5.nix deleted file mode 100644 index 43fb16cd91714..0000000000000 --- a/pkgs/desktops/kde-4.5/kde-package/manifest-4.5.5.nix +++ /dev/null @@ -1,82 +0,0 @@ -[ -{ - module = "kdeaccessibility"; - sha256 = "1vlm844jx0ggp236zl3wzzq3j2s8h9cd7cg1ajvsalpcab0dp088"; -} -{ - module = "kdeadmin"; - sha256 = "1dd725f1m9w1sm6fkhvsc7nkn7avk2lmkgqx183vjx1znxfpj9x3"; -} -{ - module = "kdeartwork"; - sha256 = "1k22fhqch2s6ajfy906nxjhqw05a9lfibs7pdzgsrdxs5606jdyc"; -} -{ - module = "kdebase"; - sha256 = "07xk16r5cw1jzilkkg2kyff0nk7n0fxrawx0n7xn4mxpzqzgjvn6"; -} -{ - module = "kdebase-runtime"; - sha256 = "0kz9s3i66fzxcklm95f7vqlx3jbgpj32gbg7nxy1iyaih01vz17j"; -} -{ - module = "kdebase-workspace"; - sha256 = "14c0v5bhb16syrk9hw340jb9fh48syclgnxiwzyfn7967gz9142d"; -} -{ - module = "kdebindings"; - sha256 = "1iapya735cpdpdn5g8rw1m4r8jvr8kjpjbpxkhd7y750x3vjvykv"; -} -{ - module = "kdeedu"; - sha256 = "0agirfgx6fwm6j2hk7xzf589gikr5y4p3sqabjrk5i6wwqjsp651"; -} -{ - module = "kdegames"; - sha256 = "10jrq5cd0fjjl5bpdqjckyx1g4clxdain3xy2gcw2f40b4yk0zi4"; -} -{ - module = "kdegraphics"; - sha256 = "0k475fmfmr8z86qh9qsdik5jphdsaiw4kb580mn1r4zwsn1wq8dk"; -} -{ - module = "kdelibs"; - sha256 = "1yganq6m9zvf9l3cbdkgj1i4zrlq77qm3lf7nnqzpkyr6iq6sz1l"; -} -{ - module = "kdemultimedia"; - sha256 = "17ma5igdq8qmsmpx8lia7xpw68441via613qs42sbm2nhqg2rp46"; -} -{ - module = "kdenetwork"; - sha256 = "1w97bb5z55kllzig528ap5dmilvjgqiazn8vkj180zwi1avixqpg"; -} -{ - module = "kdepimlibs"; - sha256 = "0immri4fvs9kxhaafk9i8zh630slayrd84wpwgvy1673mgxs4y4r"; -} -{ - module = "kdeplasma-addons"; - sha256 = "13hhsbgfqxxh07zafy3zgky9bipyxysi5zpwmi7ljjj51n72z1wr"; -} -{ - module = "kdesdk"; - sha256 = "030m2gghaxgkg8hjrzzdkibmmf34zqimi8jw979sar7c9n5nrkkg"; -} -{ - module = "kdetoys"; - sha256 = "0q2cbsj2p16i0nd6swpayiq1w40l084cxvvkdqpzilkss8dcp0jf"; -} -{ - module = "kdeutils"; - sha256 = "057zmfyp4lz5i2hq7n80p6zi5bf39hz3rvi1wyyw35sga76j5fvw"; -} -{ - module = "kdewebdev"; - sha256 = "14k3dr9z53g98gxyzglbrmkbwgc63ifn11z0wfy2vxfrk4vhniip"; -} -{ - module = "oxygen-icons"; - sha256 = "06vn8yn79kxll9f7gpsa7ihw6waj5qgz752zh9h8bycqc1m1i6nb"; -} -] diff --git a/pkgs/desktops/kde-4.5/l10n/default.nix b/pkgs/desktops/kde-4.5/l10n/default.nix deleted file mode 100644 index e2ee8e4dc4099..0000000000000 --- a/pkgs/desktops/kde-4.5/l10n/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchurl, cmake, kdelibs, gettext, perl, automoc4, release }: - -let - - inherit (stdenv.lib) attrByPath singleton; - - kdeL10nDerivation = - { lang, saneName, sha256 }: - - stdenv.mkDerivation rec { - name = "kde-l10n-${saneName}-${release}"; - - src = fetchurl { - url = "mirror://kde/stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2"; - name = "${name}.tar.bz2"; - inherit sha256; - }; - - buildInputs = [ cmake perl gettext kdelibs automoc4 ]; - - meta = { - description = "KDE translation for ${lang}"; - license = "GPL"; - inherit (kdelibs.meta) maintainers platforms homepage; - }; - }; - - kdeL10nRelease = - builtins.listToAttrs ( - map ({lang, saneName, sha256}: - { - name = saneName; - value = kdeL10nDerivation { inherit lang saneName sha256; }; - } - ) (import (./manifest + "-${release}.nix")) - ); - -in -{ - inherit kdeL10nDerivation; - recurseForDerivations = true; -} // kdeL10nRelease diff --git a/pkgs/desktops/kde-4.5/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.5/l10n/l10n-manifest.sh deleted file mode 100755 index cc0eec20aaafa..0000000000000 --- a/pkgs/desktops/kde-4.5/l10n/l10n-manifest.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -# Usage: download kde-l10n to $dir, then run -# $0 $dir - -dir=$1 - -if [[ ! -d "${dir}" ]]; then - echo "${dir} is not a directory (or doesn't exist)!" >&2 - exit 1 -fi - -release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.bz2 | \ - sed -e 's/.*en_GB-//' -e 's/\.tar\.bz2//') - -echo "Detected release ${release}" >&2 - -exec > "manifest-${release}.nix" -echo "[" -for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.bz2`; do - lang=${i%-${release}.tar.bz2} - lang=${lang#kde-l10n-} - echo -n "${lang}.. " >&2 - hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}") - echo "{" - echo " lang = \"${lang}\";" - echo " saneName = \"$(echo $lang | sed s^@^_^g)\";" - echo " sha256 = \"${hash}\";" - echo "}" - echo $hash >&2 -done -echo "]" diff --git a/pkgs/desktops/kde-4.5/l10n/manifest-4.5.5.nix b/pkgs/desktops/kde-4.5/l10n/manifest-4.5.5.nix deleted file mode 100644 index 31a6a50fb77e4..0000000000000 --- a/pkgs/desktops/kde-4.5/l10n/manifest-4.5.5.nix +++ /dev/null @@ -1,277 +0,0 @@ -[ -{ - lang = "ar"; - saneName = "ar"; - sha256 = "0dn4aiv48dhknp9wv7fsjdy8fhrwiwnbp65qq66nfrly51ranv8s"; -} -{ - lang = "bg"; - saneName = "bg"; - sha256 = "07srb5r4a0j2pakk8xsv7ky5s2cjd9liyzrx86xyzxpf21p83xbd"; -} -{ - lang = "ca"; - saneName = "ca"; - sha256 = "0rhs16c331cjhxjqq08hkl1c8vjg4nyy3mjfw5idh9qv05y9af5z"; -} -{ - lang = "ca@valencia"; - saneName = "ca_valencia"; - sha256 = "1cm8ynlylmpggapplfzggkd9j98nycm1mybh87pk4vqdh3vm8wm4"; -} -{ - lang = "cs"; - saneName = "cs"; - sha256 = "1rblfliw810yadmdplyg6n9ss7zzq318cfgvhscjjl0c9ndcx7x2"; -} -{ - lang = "da"; - saneName = "da"; - sha256 = "1x2wg76i3jgylr56ynj4p53kym1wmk789spsrgnh2y5zgppf1h43"; -} -{ - lang = "de"; - saneName = "de"; - sha256 = "0rmpzlxds8m527vkfkd48pgqcpdmyr86hi53b9gy1z237hjzjp2w"; -} -{ - lang = "el"; - saneName = "el"; - sha256 = "0zwgzcr6d94h9j2ghj6mxdss98cp9x6wlf1cp4v743addmjja26v"; -} -{ - lang = "en_GB"; - saneName = "en_GB"; - sha256 = "1phdg7miligjyya5srj11szijbrk67n27d2zrjninbpvj6jhmsx2"; -} -{ - lang = "eo"; - saneName = "eo"; - sha256 = "0jlf8i4csmrp6k05v3hkx8kk45kx42klfn9z9xdn8lak5ckycbrm"; -} -{ - lang = "es"; - saneName = "es"; - sha256 = "04kybzwkxsj64zqwiwir70fddf4zbfqpzfy01xhwz4fwinjl2pp0"; -} -{ - lang = "et"; - saneName = "et"; - sha256 = "1s3wg2pxp40111s3w82jpcgzz6j2103q3kdsm6s2mc5343i44bcs"; -} -{ - lang = "eu"; - saneName = "eu"; - sha256 = "1hqzdg2g8c6knwv6dqvrlk31v35p91f1hh04n41w2acxzrhl8r5p"; -} -{ - lang = "fi"; - saneName = "fi"; - sha256 = "1fagzkgcnj8wihkhkd0xbfjr4x4774xsdc3n17wy2d49kinkgxa8"; -} -{ - lang = "fr"; - saneName = "fr"; - sha256 = "14796jqhkhr60dxc0f69lavaikci6qn6avgiy1f2apfirs60lfi4"; -} -{ - lang = "fy"; - saneName = "fy"; - sha256 = "0c39sr4q4dl4rf6irs0c5km3xwaip0iw8a8pfljsd9an7bpzs9f9"; -} -{ - lang = "ga"; - saneName = "ga"; - sha256 = "1gfbi896kwrjaz4jkif3276qjx4ixjy8mybhmkc3c19crk1lvfn4"; -} -{ - lang = "gl"; - saneName = "gl"; - sha256 = "1s368cszycmn8dr4l1fycr1rswqm93d0hlxjr007hp0n07fddkiw"; -} -{ - lang = "gu"; - saneName = "gu"; - sha256 = "1ca5j72kd8dbvwvvks4zhjz92v39x7g7qpdxzqscwm5cg17arxr9"; -} -{ - lang = "he"; - saneName = "he"; - sha256 = "0wchlwvw8rhiz08kglkqpj1vjiiagqrmypgyn4jiar2ds5b3kxl9"; -} -{ - lang = "hi"; - saneName = "hi"; - sha256 = "0sdlj0w2vgvsp44jy1rgc35vyvndsybdf2xyxml8zhr48rhijnr7"; -} -{ - lang = "hr"; - saneName = "hr"; - sha256 = "1rspkmppz9mpf4lp4a2jm708ilygpxdi3crnsfvrfb3qsywxz520"; -} -{ - lang = "hu"; - saneName = "hu"; - sha256 = "12kk692z9xaks9pys9pwq1zgb817grzgrkcm943yzdr68k5mvfhm"; -} -{ - lang = "ia"; - saneName = "ia"; - sha256 = "15464pdhfjw0dvmdjvl1c23cqnxgka498xh6fy2prrkwnsk4cra5"; -} -{ - lang = "id"; - saneName = "id"; - sha256 = "1iiypv1yf6mp5hp14yr7dgvk7ydb66yyp7ayjswf78ak7cl9kc4v"; -} -{ - lang = "is"; - saneName = "is"; - sha256 = "1v182xds7y3mpbm6jy3hbxr0ld4if67mx6027izbflnydydjindk"; -} -{ - lang = "it"; - saneName = "it"; - sha256 = "1lycijcrcsfviiqj34jqmap6czps8j1nsjp0fizkk6gmicfdwyxb"; -} -{ - lang = "ja"; - saneName = "ja"; - sha256 = "12li937isc3479a70z8x32y2lqbl97y833cpcmbsxpa93c3hrzs3"; -} -{ - lang = "kk"; - saneName = "kk"; - sha256 = "1kd0a2rh35k0yl5irv8jxhycvacg7444y02czdhmpg9z40xpl73k"; -} -{ - lang = "km"; - saneName = "km"; - sha256 = "1fvn0lh3psc3ijn8j26m5likvw466kvdda5f30p3md12ydd9h15x"; -} -{ - lang = "kn"; - saneName = "kn"; - sha256 = "0n7m67rjplc8q3bw5fyignba0kglzbrqay0qmgiqzdqn8yw72vjq"; -} -{ - lang = "ko"; - saneName = "ko"; - sha256 = "0p3f9rd6wvcxac9jv23msszq03nhi4sn6i98rszh7p93rwllhrpk"; -} -{ - lang = "lt"; - saneName = "lt"; - sha256 = "19lzs8avagiydmv4rmpxmzv5dsaprf9wl6iwzk9g1lqg4x16nisw"; -} -{ - lang = "lv"; - saneName = "lv"; - sha256 = "0xqwz6gbzv142izhf4qwx9qzny8k24712k9pvr0xpak5s7sn0838"; -} -{ - lang = "ml"; - saneName = "ml"; - sha256 = "07f8j5zqa0wil5mmdpv16dw4cd6qzsqfqply4jq276g16g80ihg6"; -} -{ - lang = "nb"; - saneName = "nb"; - sha256 = "149r3y0x4yahgmln2qg085b86whdhmh6dx11cxn8r31l497a0jp7"; -} -{ - lang = "nds"; - saneName = "nds"; - sha256 = "0zly7l2bpnmxv60kyyhm8n9mkd7w66sc18i98462zk2d2l7k2xyz"; -} -{ - lang = "nl"; - saneName = "nl"; - sha256 = "0a8dp40i8mxjjf08wg6xmx88fivkqpiv2icbpl3nm8xxhxjgx462"; -} -{ - lang = "nn"; - saneName = "nn"; - sha256 = "0sa7qiiffma83p0yk31l5rkng2z1cm3m8r05jyvici5048i1sg9w"; -} -{ - lang = "pa"; - saneName = "pa"; - sha256 = "0zj88vi9spyc06vgd2hifsix8sa3lcchjjpplv5jll7dvicdw8vd"; -} -{ - lang = "pl"; - saneName = "pl"; - sha256 = "0hhrpws9nhqb6yhlnbv03150jykb7fx3wbbmjg36fh78cbqjknjd"; -} -{ - lang = "pt"; - saneName = "pt"; - sha256 = "0yck1nrmyx9zpk65znnga9jhv6mjv3gmhvlqis3fs3panp5ngdhl"; -} -{ - lang = "pt_BR"; - saneName = "pt_BR"; - sha256 = "1w14431b3n3z3yjm8l2kcbs8gpv58gj55p801mb17bdfh5dvs7r5"; -} -{ - lang = "ro"; - saneName = "ro"; - sha256 = "0fzjgifv1skmgbfng5lpajan0icg87xipq0817vy0g2izrs356k8"; -} -{ - lang = "ru"; - saneName = "ru"; - sha256 = "0021hfr1zdvym8rsccypsbci8kcjal1dfhqrj8dci8lf78bf05hn"; -} -{ - lang = "sk"; - saneName = "sk"; - sha256 = "0iq9vn16na58iak6lg3h12cblajv28bk90f80b4ki8lsz0wynqky"; -} -{ - lang = "sl"; - saneName = "sl"; - sha256 = "1pzq68bahnr8afnyxmhhsiyzn83f34xgymly1b71hkavkg5f05zz"; -} -{ - lang = "sr"; - saneName = "sr"; - sha256 = "03g69ffxgiw9fzsznkxxrmma9m7plasy7qlf15vrcp7faj0pjl7s"; -} -{ - lang = "sv"; - saneName = "sv"; - sha256 = "0i140ddjdc1l5v52inimhzgx1i9sbrb88ggg1bc6nnsk762jxn2a"; -} -{ - lang = "th"; - saneName = "th"; - sha256 = "10s7j601dzhsl40f1rifn6mazi0hgl3isalv3pak6d0b690y6lnb"; -} -{ - lang = "tr"; - saneName = "tr"; - sha256 = "061jqvcajk05cp4w4fcxdsh0drkynn170cyw0491iq6rqz2wsqsk"; -} -{ - lang = "uk"; - saneName = "uk"; - sha256 = "0xnxyavzz5f861fm7g4xqjqdr3b9k6mrjfpc5yjf4wa8g60ra2jl"; -} -{ - lang = "wa"; - saneName = "wa"; - sha256 = "0p789j8jnfpgwlbl73mcx9jpxb7h7hgmmksqhrc2ng42z2jmlv6d"; -} -{ - lang = "zh_CN"; - saneName = "zh_CN"; - sha256 = "07jqagsp54805kz30lybizbj66njslwyfzh66xrlgfx5vsbfn6sk"; -} -{ - lang = "zh_TW"; - saneName = "zh_TW"; - sha256 = "17mrvf1flqyfnla96idj87m5406mjjm696kf505y4si78nlnc6s2"; -} -] diff --git a/pkgs/desktops/kde-4.5/libs/default.nix b/pkgs/desktops/kde-4.5/libs/default.nix deleted file mode 100644 index c45b9ac98f809..0000000000000 --- a/pkgs/desktops/kde-4.5/libs/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ kde, gcc, cmake, perl -, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper -, xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver -, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt -, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, hspell, phonon -}: - -kde.package { - - buildInputs = [ - cmake perl xz flex bison bzip2 pcre fam libxml2 libxslt shared_mime_info - giflib jasper /*openexr*/ aspell avahi kerberos acl attr libXScrnSaver - enchant libdbusmenu_qt polkit_qt_1 automoc4 hspell - ]; - -# TODO: make sonnet plugins (dictionaries) really work. -# There are a few hardcoded paths. -# Let kdelibs find openexr -# Split plugins from libs? - - propagatedBuildInputs = [ qt4 gcc.libc strigi soprano attica qca2 - shared_desktop_ontologies phonon ]; - - patches = [ ./polkit-install.patch ]; - - # cmake fails to find acl.h because of C++-style comment - # TODO: OpenEXR, hspell - cmakeFlags = '' - -DHAVE_ACL_LIBACL_H=ON -DHAVE_SYS_ACL_H=ON - -DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook - -DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook - ''; - - meta = { - description = "KDE libraries"; - license = "LGPL"; - kde.name = "kdelibs"; - }; -} diff --git a/pkgs/desktops/kde-4.5/libs/polkit-install.patch b/pkgs/desktops/kde-4.5/libs/polkit-install.patch deleted file mode 100644 index 6633ef1209b4f..0000000000000 --- a/pkgs/desktops/kde-4.5/libs/polkit-install.patch +++ /dev/null @@ -1,12 +0,0 @@ -Author: Yury Kudryashov -Reason: other KDE modules try to install polkit action files into -$kdelibs/share/polkit-1/actions -Upstream: rejected, they propose to set install dir in each package ---- a/cmake/modules/FindPolkitQt-1.cmake.old 2010-08-12 16:13:45.000000000 +0400 -+++ b/cmake/modules/FindPolkitQt-1.cmake 2010-08-12 16:13:56.000000000 +0400 -@@ -101,4 +101,4 @@ - endif (NOT PC_POLKITQT-1_PREFIX STREQUAL CMAKE_INSTALL_PREFIX) - endif (POLKITQT-1_FOUND) - --set(POLKITQT-1_POLICY_FILES_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions) -+set(POLKITQT-1_POLICY_FILES_INSTALL_DIR share/polkit-1/actions) diff --git a/pkgs/desktops/kde-4.5/multimedia/default.nix b/pkgs/desktops/kde-4.5/multimedia/default.nix deleted file mode 100644 index e18257e02a1e8..0000000000000 --- a/pkgs/desktops/kde-4.5/multimedia/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kde, cmake, perl, qt4, alsaLib, libvorbis, xineLib, taglib, flac, -cdparanoia, lame , kdelibs, automoc4, ffmpeg, libmusicbrainz2, libtunepimp }: - -kde.package { - - buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib - cdparanoia lame kdelibs automoc4 ffmpeg libmusicbrainz2 libtunepimp ]; - - meta = { - description = "KDE Multimedia"; - longDescription = '' - Contains various Multimedia utilties for KDE such as a movie player and sound volume mixer. - ''; - license = "GPL"; - kde.name = "kdemultimedia"; - }; -} diff --git a/pkgs/desktops/kde-4.5/network/default.nix b/pkgs/desktops/kde-4.5/network/default.nix deleted file mode 100644 index af605f1912722..0000000000000 --- a/pkgs/desktops/kde-4.5/network/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ kde, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn -, libvncserver, libmsn, giflib, gpgme, boost, libv4l, libotr -, libXi, libXtst, libXdamage, libXxf86vm, libktorrent, kdebase -, kdebase_workspace -, kdelibs, kdepimlibs, automoc4, qca2, soprano, qimageblitz, strigi}: - -kde.package { - - buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn - libvncserver libmsn giflib gpgme boost libv4l libotr libXi libXtst - libXdamage libXxf86vm kdelibs kdepimlibs automoc4 qca2 soprano - qimageblitz strigi libktorrent kdebase kdebase_workspace ]; - - patches = [ ./log-feature.diff ]; -#TODO -# * telepathy-qt4 (0.18 or higher) <http://telepathy.freedesktop.org> -# * KWebKitPart <https://svn.kde.org/home/kde/trunk/extragear/base/kwebkitpart> -# * libortp (0.13 or higher) <http://www.linphone.org/index.php/eng/code_review/ortp> -# * XMMS <http://www.xmms.org> -# * mediastreamer (2.3.0 or higher) <http://www.linphone.org/index.php/eng/code_review/mediastreamer2> -# * libmeanwhile <http://meanwhile.sf.net> -# * libgadu (1.8.0 or higher) <http://toxygen.net/libgadu/> - -# Let cmake find libktorrent. Waiting for upstream fix - KDEDIRS="${libktorrent}"; - - meta = { - description = "KDE network utilities"; - longDescription = "Various network utilities for KDE such as a messenger client and network configuration interface"; - license = "GPL"; - kde.name = "kdenetwork"; - }; -} diff --git a/pkgs/desktops/kde-4.5/network/log-feature.diff b/pkgs/desktops/kde-4.5/network/log-feature.diff deleted file mode 100644 index 6770dd399e332..0000000000000 --- a/pkgs/desktops/kde-4.5/network/log-feature.diff +++ /dev/null @@ -1,60 +0,0 @@ ---- a/kget/CMakeLists.txt 2010-08-16 19:08:36.000000000 +0400 -+++ b/kget/CMakeLists.txt 2010-08-16 22:04:24.000000000 +0400 -@@ -53,21 +53,20 @@ - add_subdirectory(desktop) - add_subdirectory(plasma) - --# find kworkspace library to allow the shutdown after downloads completed option --find_library(KDE4_KWORKSPACE_LIBRARY NAMES kworkspace PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) --if(KDE4_KWORKSPACE_LIBRARY) -- set(KDE4_KWORKSPACE_LIBS ${kworkspace_LIB_DEPENDS} ${KDE4_KWORKSPACE_LIBRARY}) -+macro_optional_find_package(KDE4Workspace) -+macro_log_feature(KDE4WORKSPACE_FOUND "KDE4Workspace" "KDE4 workspace libraries, part of kdebase-workspace" "http://www.kde.org" FALSE "" "Allows 'shutdown after downloads completed' in kget") -+if(KDE4WORKSPACE_FOUND) - add_definitions(-DHAVE_KWORKSPACE) -- set(KWORKSPACE_FOUND true) --endif(KDE4_KWORKSPACE_LIBRARY) -+ include_directories(${KDE4WORKSPACE_INCLUDE_DIR}) -+endif(KDE4WORKSPACE_FOUND) - - # find libkonq to allow actions and open with options in the context menu of a transfer --find_library(KDE4_KONQUEROR_LIBRARY NAMES konq PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH ) --if(KDE4_KONQUEROR_LIBRARY) -- set(KDE4_KONQUEROR_LIBS ${konq_LIB_DEPENDS} ${KDE4_KONQUEROR_LIBRARY}) -+macro_optional_find_package(LibKonq) -+macro_log_feature(LIBKONQ_FOUND "libkonq" "KDE4 Konqueror library" "http://www.kde.org" FALSE "" "Needed to build actions and open with options in the context menu of a transfer") -+if(LIBKONQ_FOUND) - add_definitions(-DHAVE_KONQUEROR) -- set(KONQUEROR_FOUND true) --endif(KDE4_KONQUEROR_LIBRARY) -+ include_directories(${LIBKONQ_INCLUDE_DIR}) -+endif(LIBKONQ_FOUND) - - - include_directories( -@@ -142,9 +141,9 @@ - - target_link_libraries(kgetcore ${KDE4_KIO_LIBS}) - --if (KWORKSPACE_FOUND) -- target_link_libraries(kgetcore ${KDE4_KWORKSPACE_LIBS}) --endif (KWORKSPACE_FOUND) -+if (KDE4WORKSPACE_FOUND) -+ target_link_libraries(kgetcore ${KDE4WORKSPACE_KWORKSPACE_LIBS}) -+endif (KDE4WORKSPACE_FOUND) - - if (HAVE_NEPOMUK) - target_link_libraries(kgetcore ${SOPRANO_LIBRARIES} ${NEPOMUK_LIBRARIES}) -@@ -294,9 +293,9 @@ - target_link_libraries(kget ${SOPRANO_LIBRARIES} ${NEPOMUK_LIBRARIES}) - endif (HAVE_NEPOMUK) - --if (KONQUEROR_FOUND) -- target_link_libraries(kget ${KDE4_KONQUEROR_LIBS}) --endif (KONQUEROR_FOUND) -+if (LIBKONQ_FOUND) -+ target_link_libraries(kget ${LIBKONQ_LIBRARY}) -+endif (LIBKONQ_FOUND) - - if (QGPGME_FOUND) - target_link_libraries(kget ${QGPGME_LIBRARIES}) diff --git a/pkgs/desktops/kde-4.5/pim-runtime/default.nix b/pkgs/desktops/kde-4.5/pim-runtime/default.nix deleted file mode 100644 index 6fb6a44d38d49..0000000000000 --- a/pkgs/desktops/kde-4.5/pim-runtime/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ kde, fetchurl, cmake, qt4, perl, libxml2, libxslt, boost, shared_mime_info -, kdelibs, kdepimlibs -, automoc4, phonon, akonadi, soprano, strigi}: - -kde.package rec { - buildInputs = [ cmake qt4 perl libxml2 libxslt boost shared_mime_info - kdelibs kdepimlibs - automoc4 phonon akonadi soprano strigi ]; - prePatch = '' - find .. -name CMakeLists.txt | xargs sed -i -e "s@DESTINATION \''${KDE4_DBUS_INTERFACES_DIR}@DESTINATION \''${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/@" - ''; - - src = fetchurl { - url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.name}-${meta.kde.version}.tar.bz2"; - sha256 = "0w99jv0lzajmz9gvgss8gkgffm0lpqv3r6pzfsnqhrdhcf6h853y"; - }; - - meta = { - description = "KDE PIM runtime"; - homepage = http://www.kde.org; - license = "GPL"; - kde = { - name = "kdepim-runtime"; - version = "4.4.9"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/pim/default.nix b/pkgs/desktops/kde-4.5/pim/default.nix deleted file mode 100644 index 5f7d5e06c48ca..0000000000000 --- a/pkgs/desktops/kde-4.5/pim/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ kde, fetchurl, cmake, perl, boost, gpgme, libassuan, libgpgerror, libxslt -, shared_mime_info, libXScrnSaver, kdelibs, kdepimlibs, kdepim_runtime -, automoc4, akonadi, qca2}: - -kde.package rec { - - buildInputs = [ cmake boost gpgme libassuan libgpgerror libxslt - shared_mime_info libXScrnSaver kdelibs kdepimlibs automoc4 akonadi ]; - prePatch = '' - find .. -name CMakeLists.txt | xargs sed -i -e "s@DESTINATION \''${KDE4_DBUS_INTERFACES_DIR}@DESTINATION \''${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/@" - ''; - postInstall = '' - mkdir -p $out/nix-support/ - echo ${akonadi} ${kdepimlibs} ${kdepim_runtime} > $out/nix-support/propagated-user-env-packages - ''; - - src = fetchurl { - url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.name}-${meta.kde.version}.tar.bz2"; - sha256 = "0pr1n6k51aadi8fsk7rkv0vrfl4y6llywxjkzci6if7g300yd8r8"; - }; - - meta = { - description = "KDE PIM tools"; - longDescription = '' - Contains various personal information management tools for KDE, such as an organizer - ''; - license = "GPL"; - homepage = http://pim.kde.org; - kde = { - name = "kdepim"; - version = "4.4.9"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/pimlibs/default.nix b/pkgs/desktops/kde-4.5/pimlibs/default.nix deleted file mode 100644 index a1e26384e47ad..0000000000000 --- a/pkgs/desktops/kde-4.5/pimlibs/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info -, kdelibs, automoc4, akonadi, soprano}: - -kde.package { - - buildInputs = [ cmake automoc4 perl shared_mime_info ]; - propagatedBuildInputs = [ qt4 boost cyrus_sasl gpgme libical openldap kdelibs - akonadi soprano ]; - - meta = { - description = "KDE PIM libraries"; - license = "LGPL"; - kde.name = "kdepimlibs"; - }; -} diff --git a/pkgs/desktops/kde-4.5/plasma-addons/default.nix b/pkgs/desktops/kde-4.5/plasma-addons/default.nix deleted file mode 100644 index 0a1b3aa6b1ae0..0000000000000 --- a/pkgs/desktops/kde-4.5/plasma-addons/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ kde, cmake, qt4, perl, automoc4, kdelibs, soprano, kdeedu -, boost, eigen, kdebase_workspace, attica, python, qca2, qimageblitz -, shared_mime_info, kdepimlibs, kdegraphics, libqalculate, libXtst }: -# TODO: qwt, scim, MARBLE!! - -kde.package { - - preConfigure = - "cp -v ${kdeedu}/share/apps/cmake/modules/FindMarble.cmake cmake"; - - buildInputs = [ cmake qt4 perl automoc4 kdelibs boost eigen kdebase_workspace - attica python qca2 qimageblitz shared_mime_info kdepimlibs kdegraphics - libqalculate soprano libXtst kdeedu ]; - - meta = { - description = "KDE Plasma Addons"; - license = "GPL"; - kde.name = "kdeplasma-addons"; - }; -} diff --git a/pkgs/desktops/kde-4.5/sdk/cervisia.nix b/pkgs/desktops/kde-4.5/sdk/cervisia.nix deleted file mode 100644 index 98a45eae1d507..0000000000000 --- a/pkgs/desktops/kde-4.5/sdk/cervisia.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake, kdelibs, automoc4 }: - -kde.package { - buildInputs = [ cmake kdelibs automoc4 ]; - - meta = { - description = "A KDE CVS frontend"; - kde = { - name = "cervisia"; - module = "kdesdk"; - version = "3.5.0"; - versionFile = "cervisia/version.h"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/sdk/dolphin-plugins.nix b/pkgs/desktops/kde-4.5/sdk/dolphin-plugins.nix deleted file mode 100644 index e216bfaea2a0f..0000000000000 --- a/pkgs/desktops/kde-4.5/sdk/dolphin-plugins.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kde, cmake, kdelibs, automoc4, kdebase }: - -kde.package { - # Needs kdebase for libkonq - buildInputs = [ cmake kdelibs automoc4 kdebase ]; - - meta = { - description = "Git and Svn plugins for dolphin"; - kde = { - name = "dolphin-plugins"; - module = "kdesdk"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/sdk/find-svn.patch b/pkgs/desktops/kde-4.5/sdk/find-svn.patch deleted file mode 100644 index 61cb49b308f2c..0000000000000 --- a/pkgs/desktops/kde-4.5/sdk/find-svn.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/cmake/modules/FindSVN.cmake b/cmake/modules/FindSVN.cmake -index 59bcb96..2eac05d 100644 ---- a/cmake/modules/FindSVN.cmake -+++ b/cmake/modules/FindSVN.cmake -@@ -17,6 +17,9 @@ FIND_PROGRAM(SVNCONFIG_EXECUTABLE NAMES svn-config PATHS - FIND_PROGRAM(APRCONFIG_EXECUTABLE NAMES apr-1-config apr-config PATHS - /usr/local/apr/bin - ) -+find_program(APUCONFIG_EXECUTABLE NAMES apu-1-config apu-config PATHS -+ /usr/local/apr/bin -+) - - if(SVNCONFIG_EXECUTABLE) - -@@ -56,15 +59,9 @@ else(SVNCONFIG_EXECUTABLE) - set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) - else(APRCONFIG_EXECUTABLE) - FIND_PATH(_INCLUDES apr_pools.h -- ${SVN_INCLUDES}/apr-0/ -- ${SVN_INCLUDES}/apr-1/ -- ${SVN_INCLUDES}/apr-1.0/ -- /usr/include/apr-0/ -- /usr/include/apr-1/ -- /usr/include/apr-1.0/ -- /usr/local/include/apr-0/ -- /usr/local/include/apr-1/ -- /usr/local/include/apr-1.0/ -+ HINTS ${SVN_INCLUDES} -+ PATHS /usr /usr/local -+ SUFFIXES apr-0 apr-1 apr-1.0 - ) - if(_INCLUDES) - set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) -@@ -72,6 +69,25 @@ else(SVNCONFIG_EXECUTABLE) - set(SVN_FOUND FALSE) # no apr == can't compile! - endif(_INCLUDES) - endif(APRCONFIG_EXECUTABLE) -+ -+ # Use apu-config if it exists -+ if(APUCONFIG_EXECUTABLE) -+ EXEC_PROGRAM(${APUCONFIG_EXECUTABLE} ARGS --includes RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _INCLUDES) -+ string(REPLACE "-I" "" _INCLUDES ${_INCLUDES}) -+ string(REPLACE " " ";" _INCLUDES ${_INCLUDES}) -+ set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) -+ else(APUCONFIG_EXECUTABLE) -+ FIND_PATH(_INCLUDES apu.h -+ HINTS ${SVN_INCLUDES} -+ PATHS /usr /usr/local -+ SUFFIXES apr-0 apr-1 apr-1.0 -+ ) -+ if(_INCLUDES) -+ set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) -+ else(_INCLUDES) -+ set(SVN_FOUND FALSE) # no apr == can't compile! -+ endif(_INCLUDES) -+ endif(APUCONFIG_EXECUTABLE) - FIND_LIBRARY(SVN_LIBRARIES NAMES svn_client-1) - if(SVN_LIBRARIES) - FIND_LIBRARY(_LIBRARIES NAMES svn_subr-1) diff --git a/pkgs/desktops/kde-4.5/sdk/kapptemplate.nix b/pkgs/desktops/kde-4.5/sdk/kapptemplate.nix deleted file mode 100644 index 12445cb9f9b8b..0000000000000 --- a/pkgs/desktops/kde-4.5/sdk/kapptemplate.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kde, cmake, kdelibs, automoc4 }: - -kde.package { - buildInputs = [ cmake kdelibs automoc4 ]; - - - meta = { - description = "A KDE 4 project template generator"; - kde = { - name = "kapptemplate"; - module = "kdesdk"; - version = "0.1"; - versionFile = "kapptemplate/main.cpp"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/sdk/kate.nix b/pkgs/desktops/kde-4.5/sdk/kate.nix deleted file mode 100644 index 95b0fbfcdc4f8..0000000000000 --- a/pkgs/desktops/kde-4.5/sdk/kate.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake, kdelibs, automoc4, shared_mime_info }: - -kde.package { - buildInputs = [ cmake kdelibs automoc4 shared_mime_info ]; - - - meta = { - description = "Kate - Advanced Text Editor"; - kde = { - name = "kate"; - module = "kdesdk"; - version = "3.5.2"; # (release.major-1).(release.minor).(release.patch) - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/sdk/kbugbuster.nix b/pkgs/desktops/kde-4.5/sdk/kbugbuster.nix deleted file mode 100644 index dffb064f01baf..0000000000000 --- a/pkgs/desktops/kde-4.5/sdk/kbugbuster.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake, kdelibs, automoc4, kdepimlibs }: - -kde.package { - buildInputs = [ cmake kdelibs automoc4 kdepimlibs ]; - - meta = { - description = "KDE bugzilla client"; - kde = { - name = "kbugbuster"; - module = "kdesdk"; - version = "3.80.3"; - versionFile = "version.h"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/sdk/kcachegrind.nix b/pkgs/desktops/kde-4.5/sdk/kcachegrind.nix deleted file mode 100644 index b32f46135dbba..0000000000000 --- a/pkgs/desktops/kde-4.5/sdk/kcachegrind.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake, kdelibs, automoc4 }: - -kde.package { - buildInputs = [ cmake kdelibs automoc4 ]; - - meta = { - description = "KDE Frontend for Callgrind/Cachegrind"; - kde = { - name = "kcachegrind"; - module = "kdesdk"; - version = "0.6"; - versionFile = "CMakeLists.txt"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/sdk/kdeaccounts-plugin.nix b/pkgs/desktops/kde-4.5/sdk/kdeaccounts-plugin.nix deleted file mode 100644 index beac8a6d8f476..0000000000000 --- a/pkgs/desktops/kde-4.5/sdk/kdeaccounts-plugin.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, cmake, kdelibs, automoc4, kdepimlibs }: - -kde.package { - buildInputs = [ cmake kdelibs automoc4 kdepimlibs ]; - - meta = { - description = "KDE accounts akonadi agent"; - kde = { - name = "kdeaccounts-plugin"; - module = "kdesdk"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/sdk/kioslave-perldoc.nix b/pkgs/desktops/kde-4.5/sdk/kioslave-perldoc.nix deleted file mode 100644 index 5c996243b524d..0000000000000 --- a/pkgs/desktops/kde-4.5/sdk/kioslave-perldoc.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kde, cmake, kdelibs, automoc4, perl }: - -kde.package { - buildInputs = [ cmake kdelibs automoc4 perl ]; - - cmakeFlags = "-DBUILD_kioslave=ON -DBUILD_perldoc=ON"; - - meta = { - description = "perldoc: kioslave"; - kde = { - name = "kioslave-perldoc"; - module = "kdesdk"; - version = "0.9.1"; - versionFile = "kioslave/perldoc/perldoc.cpp"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/sdk/kioslave-svn.nix b/pkgs/desktops/kde-4.5/sdk/kioslave-svn.nix deleted file mode 100644 index d58d915a7f225..0000000000000 --- a/pkgs/desktops/kde-4.5/sdk/kioslave-svn.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kde, cmake, kdelibs, automoc4, subversion, apr, aprutil }: - -kde.package { - buildInputs = [ cmake kdelibs automoc4 subversion apr aprutil ]; - - patches = [ ./find-svn.patch ]; - cmakeFlags = "-DBUILD_kioslave=ON"; - - meta = { - description = "svn:/ kioslave"; - kde = { - name = "kioslave-svn"; - module = "kdesdk"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/sdk/kmtrace.nix b/pkgs/desktops/kde-4.5/sdk/kmtrace.nix deleted file mode 100644 index 190a86bc2b526..0000000000000 --- a/pkgs/desktops/kde-4.5/sdk/kmtrace.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake, kdelibs, automoc4, gcc }: - -kde.package { - buildInputs = [ cmake kdelibs automoc4 ]; - - preConfigure="export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}"; - - meta = { - description = "KDE mtrace-based malloc debuger"; - kde = { - name = "kmtrace"; - module = "kdesdk"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/sdk/kompare.nix b/pkgs/desktops/kde-4.5/sdk/kompare.nix deleted file mode 100644 index e20fc585dd27a..0000000000000 --- a/pkgs/desktops/kde-4.5/sdk/kompare.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake, kdelibs, automoc4 }: - -kde.package { - buildInputs = [ cmake kdelibs automoc4 ]; - - meta = { - description = "A program to view the differences between files and optionally generate a diff"; - kde = { - name = "kompare"; - module = "kdesdk"; - version = "4.0.0"; - versionFile = "main.cpp"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/sdk/kpartloader.nix b/pkgs/desktops/kde-4.5/sdk/kpartloader.nix deleted file mode 100644 index 25eb100dd5368..0000000000000 --- a/pkgs/desktops/kde-4.5/sdk/kpartloader.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake, kdelibs, automoc4 }: - -kde.package { - buildInputs = [ cmake kdelibs automoc4 ]; - - meta = { - description = "A test application for KParts"; - kde = { - name = "kpartloader"; - module = "kdesdk"; - version = "1.0"; - versionFile = "kpartloader.cpp"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/sdk/kprofilemethod.nix b/pkgs/desktops/kde-4.5/sdk/kprofilemethod.nix deleted file mode 100644 index 39640f9218577..0000000000000 --- a/pkgs/desktops/kde-4.5/sdk/kprofilemethod.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kde, cmake, kdelibs, automoc4 }: - -kde.package { - buildInputs = [ cmake kdelibs automoc4 ]; - - meta = { - description = "A macros for profiling using QTime"; - longDescription = "Don't commit any code using kprofilemethod.h to KDE repositories."; - kde = { - name = "kprofilemethod"; - module = "kdesdk"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/sdk/kstartperf.nix b/pkgs/desktops/kde-4.5/sdk/kstartperf.nix deleted file mode 100644 index 0887531fdec26..0000000000000 --- a/pkgs/desktops/kde-4.5/sdk/kstartperf.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake, kdelibs, automoc4, libtool }: - -kde.package { - buildInputs = [ cmake kdelibs automoc4 libtool ]; - - meta = { - description = "Measures start up time of a KDE application"; - kde = { - name = "kstartperf"; - module = "kdesdk"; - version = "1.0"; - versionFile = "kstartperf.cpp"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/sdk/kuiviewer.nix b/pkgs/desktops/kde-4.5/sdk/kuiviewer.nix deleted file mode 100644 index 377a1563d64e6..0000000000000 --- a/pkgs/desktops/kde-4.5/sdk/kuiviewer.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake, kdelibs, automoc4 }: - -kde.package { - buildInputs = [ cmake kdelibs automoc4 ]; - - meta = { - description = "Displays Qt Designer's UI files"; - kde = { - name = "kuiviewer"; - module = "kdesdk"; - version = "0.1"; - versionFile = "main.cpp"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/sdk/lokalize.nix b/pkgs/desktops/kde-4.5/sdk/lokalize.nix deleted file mode 100644 index ec5381ee55dd3..0000000000000 --- a/pkgs/desktops/kde-4.5/sdk/lokalize.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ kde, cmake, kdelibs, automoc4, hunspell }: - -kde.package { - buildInputs = [ cmake kdelibs automoc4 hunspell ]; - - meta = { - description = "KDE 4 Computer-aided translation system"; - longDescription = '' - Computer-aided translation system. - Do not translate what had already been translated. - ''; - kde = { - name = "lokalize"; - module = "kdesdk"; - version = "1.1"; - versionFile = "src/version.h"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/sdk/optional-docs.diff b/pkgs/desktops/kde-4.5/sdk/optional-docs.diff deleted file mode 100644 index f67e1f4cdd8ee..0000000000000 --- a/pkgs/desktops/kde-4.5/sdk/optional-docs.diff +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt -index 63cdef8..0c5b50a 100644 ---- a/doc/CMakeLists.txt -+++ b/doc/CMakeLists.txt -@@ -3,22 +3,30 @@ if( UNIX ) - add_subdirectory(cervisia) - endif() - endif( UNIX ) --add_subdirectory(kapptemplate) -+if(BUILD_kapptemplate) -+ add_subdirectory(kapptemplate) -+endif() - if(BUILD_kbugbuster) - add_subdirectory(kbugbuster) - endif() - if(BUILD_kcachegrind) - add_subdirectory(kcachegrind) - endif() --add_subdirectory(kmtrace) -+if(BUILD_kmtrace) -+ add_subdirectory(kmtrace) -+endif() - if(BUILD_kompare) - add_subdirectory(kompare) - endif() - if(BUILD_lokalize) - add_subdirectory(lokalize) - endif() --add_subdirectory(poxml) --add_subdirectory(scripts) -+if(BUILD_poxml) -+ add_subdirectory(poxml) -+endif() -+if(BUILD_scripts) -+ add_subdirectory(scripts) -+endif() - - if(LIBXSLT_FOUND AND LIBXML2_FOUND) - if(BUILD_umbrello) diff --git a/pkgs/desktops/kde-4.5/sdk/poxml.nix b/pkgs/desktops/kde-4.5/sdk/poxml.nix deleted file mode 100644 index 683fa77debd90..0000000000000 --- a/pkgs/desktops/kde-4.5/sdk/poxml.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kde, cmake, kdelibs, automoc4, antlr }: - -kde.package { - buildInputs = [ cmake kdelibs automoc4 antlr ]; - - - meta = { - description = "Po<->xml tools"; - kde = { - name = "poxml"; - module = "kdesdk"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/sdk/scripts.nix b/pkgs/desktops/kde-4.5/sdk/scripts.nix deleted file mode 100644 index 2bbb926259710..0000000000000 --- a/pkgs/desktops/kde-4.5/sdk/scripts.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, cmake, kdelibs, automoc4 }: - -kde.package { - buildInputs = [ cmake kdelibs automoc4 ]; - - meta = { - description = "Various scripts to ease KDE development"; - kde = { - name = "scripts"; - module = "kdesdk"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/sdk/strigi-analyzer.nix b/pkgs/desktops/kde-4.5/sdk/strigi-analyzer.nix deleted file mode 100644 index 0215a24608a51..0000000000000 --- a/pkgs/desktops/kde-4.5/sdk/strigi-analyzer.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, cmake, kdelibs, automoc4 }: - -kde.package { - buildInputs = [ cmake kdelibs automoc4 ]; - - meta = { - description = "Strigi analyzers for diff, po and ts"; - kde = { - name = "strigi-analyzer"; - module = "kdesdk"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/sdk/umbrello.nix b/pkgs/desktops/kde-4.5/sdk/umbrello.nix deleted file mode 100644 index 85e63c66e1bdc..0000000000000 --- a/pkgs/desktops/kde-4.5/sdk/umbrello.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kde, cmake, kdelibs, automoc4, libxml2, libxslt, boost }: - -kde.package { - buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt boost ]; - - meta = { - description = "Umbrello UML modeller"; - kde = { - name = "umbrello"; - module = "kdesdk"; - version = "2.5.2"; # release - 200 - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/support/akonadi/default.nix b/pkgs/desktops/kde-4.5/support/akonadi/default.nix deleted file mode 100644 index eedd6b9f6e896..0000000000000 --- a/pkgs/desktops/kde-4.5/support/akonadi/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, mysql, automoc4, soprano}: - -stdenv.mkDerivation rec { - name = "akonadi-1.4.3"; - src = fetchurl { - url = "http://download.akonadi-project.org/${name}.tar.bz2"; - sha256 = "18xi66w78lsf2jf1z1vl8abps9hdv3g5msw6q1kj6xhmn4lbgjkk"; - }; - buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ]; - patches = [ ./fix-broken-datadir-parameter.patch ]; - meta = with stdenv.lib; { - description = "KDE PIM Storage Service"; - license = "LGPL"; - homepage = http://pim.kde.org/akonadi; - maintainers = [ maintainers.sander maintainers.urkud ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/kde-4.5/support/akonadi/fix-broken-datadir-parameter.patch b/pkgs/desktops/kde-4.5/support/akonadi/fix-broken-datadir-parameter.patch deleted file mode 100644 index 09b594f4e2197..0000000000000 --- a/pkgs/desktops/kde-4.5/support/akonadi/fix-broken-datadir-parameter.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix broken datadir parameter. - ---- akonadi-1.3.85/server/src/storage/dbconfigmysql.cpp 2010-06-09 03:41:30.000000000 -0430 -+++ akonadi-local-1.3.85/server/src/storage/dbconfigmysql.cpp 2010-08-11 00:21:20.547181479 -0430 -@@ -250,11 +250,10 @@ - // synthesize the mysqld command - QStringList arguments; - arguments << QString::fromLatin1( "--defaults-file=%1/mysql.conf" ).arg( akDir ); -+ arguments << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ); - #ifndef Q_WS_WIN -- arguments << QString::fromLatin1( "--datadir" ) << QString::fromLatin1( "%1/" ).arg( dataDir ); - arguments << QString::fromLatin1( "--socket=%1/mysql.socket" ).arg( socketDirectory ); - #else -- arguments << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ); - arguments << QString::fromLatin1( "--shared-memory" ); - #endif - diff --git a/pkgs/desktops/kde-4.5/support/attica/default.nix b/pkgs/desktops/kde-4.5/support/attica/default.nix deleted file mode 100644 index 0eff2cbb4ebad..0000000000000 --- a/pkgs/desktops/kde-4.5/support/attica/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, fetchurl, cmake, qt4}: - -stdenv.mkDerivation rec { - name = "attica-0.2.0"; - src = fetchurl { - url = "mirror://kde/stable/attica/${name}.tar.bz2"; - sha256 = "0g2la91fgdr185ah15vc91plvdwvbm6kpsyz0vk0da7ggiyg3y9a"; - }; - buildInputs = [ cmake qt4 ]; - meta = with stdenv.lib; { - description = "A library to access Open Collaboration Service providers"; - license = "LGPL"; - maintainers = [ maintainers.sander maintainers.urkud ]; - platforms = qt4.meta.platforms; - }; -} diff --git a/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix b/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix deleted file mode 100644 index 703dfe0f0cf01..0000000000000 --- a/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{kde, cmake}: - -kde.package { - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "4c2881683f8d66114ac79a9573498e627146aa647574efb9b8f89f837e1d7b06"; - - buildInputs = [ cmake ]; - meta = { - description = "KDE Oxygen theme icons"; - longDescription = "Contains icons for the KDE Oxygen theme, which is the default icon theme since KDE 4.3"; - license = "GPL"; - kde.name = "oxygen-icons"; - }; -} diff --git a/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix b/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix deleted file mode 100644 index 9ff43ef5f9b10..0000000000000 --- a/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kde, fetchurl, cmake, qt4, pkgconfig, polkit, automoc4, glib }: - -kde.package rec { - buildInputs = [ cmake qt4 automoc4 ]; - propagatedBuildInputs = [ polkit glib ]; - - src = fetchurl { - url = with meta.kde; - "mirror://kde/stable/apps/KDE4.x/admin/${name}-${version}.tar.bz2"; - sha256 = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr"; - }; - - meta.kde = { - name = "polkit-qt-1"; - version = "0.96.1"; - }; -} diff --git a/pkgs/desktops/kde-4.5/support/shared-desktop-ontologies/default.nix b/pkgs/desktops/kde-4.5/support/shared-desktop-ontologies/default.nix deleted file mode 100644 index b4713794a03ec..0000000000000 --- a/pkgs/desktops/kde-4.5/support/shared-desktop-ontologies/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{stdenv, fetchurl, cmake}: - -stdenv.mkDerivation rec { - name = "shared-desktop-ontologies-0.5"; - src = fetchurl { - url = "mirror://sf/oscaf/${name}.tar.bz2"; - sha256 = "1a1gs2b314133rg7vzwvnqbxchf7xgs0jpkydid5l2wz98m7j17r"; - }; - buildInputs = [ cmake ]; - meta = with stdenv.lib; { - description = "Ontologies necessary for the Nepomuk semantic desktop"; - longDescription = '' - The shared-desktop-ontologies package brings the semantic web to the - desktop in terms of vocabulary. It contains the well known core - ontologies such as RDF and RDFS as well as the Nepomuk ontologies which - are used by projects like KDE or Strigi. - ''; - platforms = platforms.all; - maintainers = [ maintainers.sander maintainers.urkud ]; - }; -} - diff --git a/pkgs/desktops/kde-4.5/toys/amor.nix b/pkgs/desktops/kde-4.5/toys/amor.nix deleted file mode 100644 index dec967febde56..0000000000000 --- a/pkgs/desktops/kde-4.5/toys/amor.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake, kdelibs, automoc4 }: - -kde.package { - buildInputs = [ cmake kdelibs automoc4 ]; - - meta = { - description = "KDE creature for your desktop"; - kde = { - name = "amor"; - module = "kdetoys"; - version = "2.4.0"; - versionFile = "src/version.h"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/toys/kteatime.nix b/pkgs/desktops/kde-4.5/toys/kteatime.nix deleted file mode 100644 index 9df5d8ab528d1..0000000000000 --- a/pkgs/desktops/kde-4.5/toys/kteatime.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kde, cmake, kdelibs, automoc4 }: - -kde.package { - buildInputs = [ cmake kdelibs automoc4 ]; - - meta = { - description = "KDE utility for making a fine cup of tea"; - kde = { - name = "kteatime"; - module = "kdetoys"; - version = "1.2.1"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/toys/ktux.nix b/pkgs/desktops/kde-4.5/toys/ktux.nix deleted file mode 100644 index 8d2df5974a0d8..0000000000000 --- a/pkgs/desktops/kde-4.5/toys/ktux.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake, kdelibs, automoc4, kdebase_workspace }: - -kde.package { - buildInputs = [ cmake kdelibs automoc4 kdebase_workspace ]; - - meta = { - description = "Tux Screen Saver"; - kde = { - name = "ktux"; - module = "kdetoys"; - version = "1.0.1"; - versionFile = "src/sprite.cpp"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/utils/ark.nix b/pkgs/desktops/kde-4.5/utils/ark.nix deleted file mode 100644 index 6f963bdb99807..0000000000000 --- a/pkgs/desktops/kde-4.5/utils/ark.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ kde, cmake, kdelibs, qt4, perl, libarchive, xz, automoc4, qjson, - kdebase }: - -kde.package { - patchPhase = "cp -vn ${qjson}/share/apps/cmake/modules/FindQJSON.cmake cmake/modules"; - - buildInputs = [ cmake qt4 perl libarchive xz kdelibs automoc4 qjson - kdebase # for libkonq - ]; - - meta = { - description = "KDE Archiving Tool"; - kde = { - name = "ark"; - module = "kdeutils"; - version = "2.15"; - versionFile = "app/main.cpp"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/utils/kcalc.nix b/pkgs/desktops/kde-4.5/utils/kcalc.nix deleted file mode 100644 index b04e6e9f9832b..0000000000000 --- a/pkgs/desktops/kde-4.5/utils/kcalc.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake, perl, kdelibs, qt4, automoc4, gmp }: - -kde.package { - buildInputs = [ cmake qt4 perl kdelibs automoc4 gmp ]; - - meta = { - description = "KDE Calculator"; - kde = { - name = "kcalc"; - module = "kdeutils"; - version = "2.7"; - versionFile = "version.h"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/utils/kcharselect.nix b/pkgs/desktops/kde-4.5/utils/kcharselect.nix deleted file mode 100644 index 115efaa703e68..0000000000000 --- a/pkgs/desktops/kde-4.5/utils/kcharselect.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake, kdelibs, qt4, perl, automoc4 }: - -kde.package { - buildInputs = [ cmake qt4 perl kdelibs automoc4 ]; - - meta = { - description = "KDE character selection utility"; - kde = { - name = "kcharselect"; - module = "kdeutils"; - version = "1.7"; - versionFile = "main.cc"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/utils/kdf.nix b/pkgs/desktops/kde-4.5/utils/kdf.nix deleted file mode 100644 index a15341ab2dbd7..0000000000000 --- a/pkgs/desktops/kde-4.5/utils/kdf.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake, kdelibs, qt4, perl, automoc4 }: - -kde.package { - buildInputs = [ cmake qt4 perl kdelibs automoc4 ]; - - meta = { - description = "KDE free disk space utility"; - kde = { - name = "kdf"; - module = "kdeutils"; - version = "0.11"; - versionFile = "kdf.cpp"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/utils/kfloppy.nix b/pkgs/desktops/kde-4.5/utils/kfloppy.nix deleted file mode 100644 index 440c139e4cc61..0000000000000 --- a/pkgs/desktops/kde-4.5/utils/kfloppy.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, cmake, kdelibs, qt4, perl, automoc4 }: - -kde.package { - buildInputs = [ cmake qt4 perl kdelibs automoc4 ]; - - meta = { - description = "Helps you format floppies with the filesystem of your choice"; - kde = { - name = "kfloppy"; - module = "kdeutils"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/utils/kgpg.nix b/pkgs/desktops/kde-4.5/utils/kgpg.nix deleted file mode 100644 index 00a2d2a873943..0000000000000 --- a/pkgs/desktops/kde-4.5/utils/kgpg.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake, kdelibs, qt4, perl, automoc4, kdepimlibs }: - -kde.package { - buildInputs = [ cmake qt4 perl kdelibs automoc4 kdepimlibs ]; - - meta = { - description = "Simple KDE GUI for gpg"; - kde = { - name = "kgpg"; - module = "kdeutils"; - version = "2.4.1"; - versionFile = "main.cpp"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/utils/kremotecontrol.nix b/pkgs/desktops/kde-4.5/utils/kremotecontrol.nix deleted file mode 100644 index 1ea8a140dca8e..0000000000000 --- a/pkgs/desktops/kde-4.5/utils/kremotecontrol.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, cmake, kdelibs, qt4, perl, automoc4, kdebase_workspace }: - -kde.package { - buildInputs = [ cmake qt4 perl kdelibs automoc4 kdebase_workspace ]; - - meta = { - description = "KDE remote control"; - kde = { - name = "kremotecontrol"; - module = "kdeutils"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/utils/ktimer.nix b/pkgs/desktops/kde-4.5/utils/ktimer.nix deleted file mode 100644 index 9fd90e6616af0..0000000000000 --- a/pkgs/desktops/kde-4.5/utils/ktimer.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake, kdelibs, qt4, perl, automoc4 }: - -kde.package { - buildInputs = [ cmake qt4 perl kdelibs automoc4 ]; - - meta = { - description = "KDE Timer"; - kde = { - name = "ktimer"; - module = "kdeutils"; - version = "0.6"; - versionFile = "main.cpp"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/utils/kwallet.nix b/pkgs/desktops/kde-4.5/utils/kwallet.nix deleted file mode 100644 index 76331102227ae..0000000000000 --- a/pkgs/desktops/kde-4.5/utils/kwallet.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake, kdelibs, qt4, perl, automoc4 }: - -kde.package { - buildInputs = [ cmake qt4 perl kdelibs automoc4 ]; - - meta = { - description = "KDE Wallet (password storage) management tool"; - kde = { - name = "kwallet"; - module = "kdeutils"; - version = "1.6"; - versionFile = "main.cpp"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/utils/okteta.nix b/pkgs/desktops/kde-4.5/utils/okteta.nix deleted file mode 100644 index 0b7cb6d388def..0000000000000 --- a/pkgs/desktops/kde-4.5/utils/okteta.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake, kdelibs, qt4, perl, automoc4, shared_mime_info, qca2 }: - -kde.package { - buildInputs = [ cmake qt4 perl kdelibs automoc4 shared_mime_info qca2 ]; - - meta = { - description = "KDE byte editor"; - kde = { - name = "okteta"; - module = "kdeutils"; - version = "0.5.3"; - versionFile = "program/about.cpp"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/utils/printer-applet.nix b/pkgs/desktops/kde-4.5/utils/printer-applet.nix deleted file mode 100644 index ea9d6a7426cbe..0000000000000 --- a/pkgs/desktops/kde-4.5/utils/printer-applet.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ kde, cmake, kdelibs, qt4, perl, automoc4 -, python, sip, pyqt4, pycups, rhpl, system_config_printer, kdebindings, - pythonDBus, makeWrapper }: - -kde.package { - buildInputs = [ cmake qt4 perl kdelibs automoc4 python sip pyqt4 pycups rhpl - system_config_printer kdebindings makeWrapper pythonDBus ]; - - postInstall="wrapProgram $out/bin/printer-applet --set PYTHONPATH $PYTHONPATH"; - - meta = { - description = "KDE printer applet"; - longDescription = "Applet to view current print jobs and configure new printers"; - kde = { - name = "printer-applet"; - module = "kdeutils"; - version = "1.5"; - versionFile = "printer-applet.py"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/utils/superkaramba.nix b/pkgs/desktops/kde-4.5/utils/superkaramba.nix deleted file mode 100644 index e49874fc80500..0000000000000 --- a/pkgs/desktops/kde-4.5/utils/superkaramba.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kde, cmake, perl, kdelibs, qt4, automoc4, qimageblitz, python }: - -kde.package { - buildInputs = [ cmake qt4 perl kdelibs automoc4 qimageblitz python ]; - - cmakeFlags = "-DBUILD_icons=TRUE -DBULD_plasma=TRUE"; - - meta = { - description = "A KDE Eye-candy Application"; - kde = { - name = "superkaramba"; - module = "kdeutils"; - version = "0.55"; - versionFile = "src/main.cpp"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/utils/sweeper.nix b/pkgs/desktops/kde-4.5/utils/sweeper.nix deleted file mode 100644 index 3b1d73df803e2..0000000000000 --- a/pkgs/desktops/kde-4.5/utils/sweeper.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake, perl, kdelibs, qt4, automoc4 }: - -kde.package { - buildInputs = [ cmake qt4 perl kdelibs automoc4 ]; - - meta = { - description = "Helps clean unwanted traces the user leaves on the system"; - kde = { - name = "sweeper"; - module = "kdeutils"; - version = "1.5"; - versionFile = "main.cpp"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/webdev/kfilereplace.nix b/pkgs/desktops/kde-4.5/webdev/kfilereplace.nix deleted file mode 100644 index ab56a26878a30..0000000000000 --- a/pkgs/desktops/kde-4.5/webdev/kfilereplace.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kde, cmake, kdelibs, automoc4, libxml2, libxslt }: - -kde.package { - buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt ]; - - meta = { - description = "Batch search and replace tool"; - homepage = http://www.kdewebdev.org; - kde = { - name = "kfilereplace"; - module = "kdewebdev"; - version = "0.1"; - versionFile = "main.cpp"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/webdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.5/webdev/kimagemapeditor.nix deleted file mode 100644 index 958e714e32c5c..0000000000000 --- a/pkgs/desktops/kde-4.5/webdev/kimagemapeditor.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kde, cmake, kdelibs, automoc4, libxml2, libxslt }: - -kde.package { - buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt ]; - - meta = { - description = "An HTML imagemap editor"; - homepage = http://www.nongnu.org/kimagemap/; - kde = { - name = "kimagemapeditor"; - module = "kdewebdev"; - version = "3.9.0"; - versionFile = "version.h"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/webdev/klinkstatus.nix b/pkgs/desktops/kde-4.5/webdev/klinkstatus.nix deleted file mode 100644 index 5024cb771ef03..0000000000000 --- a/pkgs/desktops/kde-4.5/webdev/klinkstatus.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ kde, cmake, kdelibs, automoc4, libxml2, libxslt, kdepimlibs, boost, htmlTidy, - ruby }: - -kde.package { - buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt kdepimlibs boost - htmlTidy ruby ]; - - meta = { - description = "A KDE link checker"; - homepage = http://klinkstatus.kdewebdev.org; - kde = { - name = "klinkstatus"; - module = "kdewebdev"; - version = "0.7.0"; - versionFile = "src/main.cpp"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/webdev/kommander.nix b/pkgs/desktops/kde-4.5/webdev/kommander.nix deleted file mode 100644 index 4a761b2eabe0e..0000000000000 --- a/pkgs/desktops/kde-4.5/webdev/kommander.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kde, cmake, kdelibs, automoc4, libxml2, libxslt }: - -kde.package { - buildInputs = [ cmake kdelibs automoc4 libxml2 libxslt ]; - - meta = { - description = "A graphical editor of scripted dialogs"; - kde = { - name = "kommander"; - module = "kdewebdev"; - versionFile = "lib/kommanderversion.h"; - }; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c46ebdb6c079..439c42510db22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8010,9 +8010,6 @@ let kde4 = recurseIntoAttrs pkgs.kde47; - # TODO: merge with branches/drop-kde4.5 if you want to remove KDE SC 4.5 - # This branch removes kde45 and quite a few compatibility hacks - kde45 = kdePackagesFor pkgs.kde45 "4.5"; kde47 = kdePackagesFor pkgs.kde47 "4.7"; kdePackagesFor = self: version: |