diff options
| author | Thomas Tuegel <ttuegel@secure.mailbox.org> | 2017-02-25 12:21:44 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-25 12:21:44 -0600 |
| commit | 0ed156a2167fb5a23fa3b798bc8e148f5045f922 (patch) | |
| tree | 67f90f8ba5a3bf8905a433bcb5c496bd61a0d75d | |
| parent | a1431f35db8263d8ee440b75cc988366eac7294d (diff) | |
| parent | fbf12d9f702bc3d994af9de8eb4ded99e55ea75e (diff) | |
| download | nixlib-0ed156a2167fb5a23fa3b798bc8e148f5045f922.tar nixlib-0ed156a2167fb5a23fa3b798bc8e148f5045f922.tar.gz nixlib-0ed156a2167fb5a23fa3b798bc8e148f5045f922.tar.bz2 nixlib-0ed156a2167fb5a23fa3b798bc8e148f5045f922.tar.lz nixlib-0ed156a2167fb5a23fa3b798bc8e148f5045f922.tar.xz nixlib-0ed156a2167fb5a23fa3b798bc8e148f5045f922.tar.zst nixlib-0ed156a2167fb5a23fa3b798bc8e148f5045f922.zip | |
Merge pull request #22977 from ttuegel/triage-kde4
Remove KDE 4 desktop packages
267 files changed, 526 insertions, 5051 deletions
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index af796f7490a8..3b675cd9020b 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, automoc4, cmake, perl, pkgconfig , qtscriptgenerator, gettext, curl , libxml2, mysql, taglib -, taglib_extras, loudmouth , kdelibs , qca2, libmtp, liblastfm, libgpod +, taglib_extras, loudmouth , kdelibs4, qca2, libmtp, liblastfm, libgpod , phonon , strigi, soprano, qjson, ffmpeg, libofa, nepomuk_core ? null , lz4, lzo, snappy, libaio, pcre }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtscriptgenerator stdenv.cc.libc gettext curl libxml2 mysql.server/*libmysqld*/ - taglib taglib_extras loudmouth kdelibs phonon strigi soprano qca2 + taglib taglib_extras loudmouth kdelibs4 phonon strigi soprano qca2 libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core lz4 lzo snappy libaio pcre ]; @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { description = "Popular music player for KDE"; license = "GPL"; homepage = http://amarok.kde.org; - inherit (kdelibs.meta) platforms maintainers; + inherit (kdelibs4.meta) platforms; }; } diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index f4e1fe8b151c..89aadf49fb84 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -2,10 +2,6 @@ , withQt4 ? false, qt4 , withQt5 ? true, qtbase, qtsvg, qttools, makeQtWrapper -# I'm unable to make KDE work here, crashes at runtime so I simply -# make Qt4 the default until someone who wants KDE can figure it out. -, withKDE4 ? false, kde4 - # Cantata doesn't build with cdparanoia enabled so we disable that # default for now until I (or someone else) figure it out. , withCdda ? false, cdparanoia @@ -24,10 +20,9 @@ }: # One and only one front-end. -assert withQt5 -> withQt4 == false && withKDE4 == false; -assert withQt4 -> withQt5 == false && withKDE4 == false; -assert withKDE4 -> withQt4 == false && withQt5 == false; -assert withQt4 || withQt5 || withKDE4; +assert withQt5 -> withQt4 == false; +assert withQt4 -> withQt5 == false; +assert withQt4 || withQt5; # Inter-dependencies. assert withCddb -> withCdda && withTaglib; @@ -58,7 +53,6 @@ stdenv.mkDerivation rec { [ cmake ] ++ stdenv.lib.optional withQt4 qt4 ++ stdenv.lib.optionals withQt5 [ qtbase qtsvg qttools ] - ++ stdenv.lib.optional withKDE4 kde4.kdelibs ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ] ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ] ++ stdenv.lib.optional withCdda cdparanoia @@ -66,16 +60,14 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional withLame lame ++ stdenv.lib.optional withMtp libmtp ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5 - ++ stdenv.lib.optional (withTaglib && !withKDE4 && withDevices) udisks2; + ++ stdenv.lib.optional (withTaglib && withDevices) udisks2; nativeBuildInputs = stdenv.lib.optional withQt5 makeQtWrapper; unpackPhase = "tar -xvf $src"; sourceRoot = "${name}"; - # Qt4 is implicit when KDE is switched off. cmakeFlags = stdenv.lib.flatten [ - (fstats withKDE4 [ "KDE" "KWALLET" ]) (fstat withQt5 "QT5") (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ]) diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix index 8176a3404702..e9e3fd53e546 100644 --- a/pkgs/applications/audio/jackmix/default.nix +++ b/pkgs/applications/audio/jackmix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgs, jack ? pkgs.libjack2 }: +{ stdenv, fetchurl, pkgconfig, scons, qt4, lash, libjack2, jack ? libjack2 }: stdenv.mkDerivation rec { name = "jackmix-0.5.2"; @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgs.pkgconfig - pkgs.scons - pkgs.kde4.qt4 - pkgs.lash + pkgconfig + scons + qt4 + lash jack ]; diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index 7021cd165cfd..ca9f514eace1 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -3,12 +3,12 @@ , qtkeychain, quazip, sparsehash, taglib, websocketpp, makeWrapper , enableXMPP ? true, libjreen ? null -, enableKDE ? false, kdelibs ? null +, enableKDE ? false, kdelibs4 ? null , enableTelepathy ? false, telepathy_qt ? null }: assert enableXMPP -> libjreen != null; -assert enableKDE -> kdelibs != null; +assert enableKDE -> kdelibs4 != null; assert enableTelepathy -> telepathy_qt != null; stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { qca2 qjson qt4 qtkeychain quazip sparsehash taglib websocketpp makeWrapper ] ++ stdenv.lib.optional enableXMPP libjreen - ++ stdenv.lib.optional enableKDE kdelibs + ++ stdenv.lib.optional enableKDE kdelibs4 ++ stdenv.lib.optional enableTelepathy telepathy_qt; postInstall = let diff --git a/pkgs/applications/editors/kdevelop/default.nix b/pkgs/applications/editors/kdevelop/default.nix deleted file mode 100644 index 938a56518d5f..000000000000 --- a/pkgs/applications/editors/kdevelop/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, kdevplatform, cmake, pkgconfig, automoc4, shared_mime_info, - kdebase_workspace, gettext, perl, okteta, qjson, kate, konsole, kde_runtime, oxygen_icons }: - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "4.7.3"; - pname = "kdevelop"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; - sha256 = "9db388d1c8274da7d168c13db612c7e94ece7815757b945b0aa0371620a06b35"; - }; - - buildInputs = [ kdevplatform kdebase_workspace okteta qjson ]; - - nativeBuildInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ]; - - propagatedUserEnvPkgs = [ kdevplatform kate konsole kde_runtime oxygen_icons ]; - - patches = [ ./gettext.patch ]; - - NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE"; - - meta = with stdenv.lib; { - maintainers = [ maintainers.urkud ]; - platforms = platforms.linux; - description = "KDE official IDE"; - longDescription = - '' - A free, opensource IDE (Integrated Development Environment) - for MS Windows, Mac OsX, Linux, Solaris and FreeBSD. It is a - feature-full, plugin extendable IDE for C/C++ and other - programing languages. It is based on KDevPlatform, KDE and Qt - libraries and is under development since 1998. - ''; - homepage = https://www.kdevelop.org; - }; -} diff --git a/pkgs/applications/editors/kdevelop/gettext.patch b/pkgs/applications/editors/kdevelop/gettext.patch deleted file mode 100644 index cefbc743fc3e..000000000000 --- a/pkgs/applications/editors/kdevelop/gettext.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff -urN kdevelop-4.7.3.orig/po/CMakeLists.txt kdevelop-4.7.3/po/CMakeLists.txt ---- kdevelop-4.7.3.orig/po/CMakeLists.txt 2016-03-04 23:29:09.411886565 +0100 -+++ kdevelop-4.7.3/po/CMakeLists.txt 2016-03-04 23:28:35.108451713 +0100 -@@ -1,3 +1,4 @@ -+cmake_policy(SET CMP0002 OLD) - find_package(Gettext REQUIRED) - if (NOT GETTEXT_MSGMERGE_EXECUTABLE) - MESSAGE(FATAL_ERROR "Please install msgmerge binary") diff --git a/pkgs/applications/graphics/digikam/5.nix b/pkgs/applications/graphics/digikam/5.nix deleted file mode 100644 index a9d7d357ad71..000000000000 --- a/pkgs/applications/graphics/digikam/5.nix +++ /dev/null @@ -1,122 +0,0 @@ -{ stdenv, fetchurl, cmake, ecm, makeQtWrapper - -# For `digitaglinktree` -, perl, sqlite - -, qtbase -, qtxmlpatterns -, qtsvg -, qtwebkit - -, kconfigwidgets -, kcoreaddons -, kdoctools -, kfilemetadata -, knotifications -, knotifyconfig -, ktextwidgets -, kwidgetsaddons -, kxmlgui - -, bison -, boost -, eigen -, exiv2 -, flex -, jasper -, lcms2 -, lensfun -, libgphoto2 -, libkipi -, liblqr1 -, libusb1 -, marble -, mysql -, opencv -, threadweaver - -# For panorama and focus stacking -, enblend-enfuse -, hugin -, gnumake - -, oxygen -}: - -stdenv.mkDerivation rec { - name = "digikam-${version}"; - version = "5.4.0"; - - src = fetchurl { - url = "http://download.kde.org/stable/digikam/${name}.tar.xz"; - sha256 = "0dgsgji14l5zvxny36hrfsp889fsfrsbbn9bg57m18404xp903kg"; - }; - - nativeBuildInputs = [ cmake ecm makeQtWrapper ]; - - patches = [ ./0001-Disable-fno-operator-names.patch ]; - - buildInputs = [ - qtbase - qtxmlpatterns - qtsvg - qtwebkit - - kconfigwidgets - kcoreaddons - kdoctools - kfilemetadata - knotifications - knotifyconfig - ktextwidgets - kwidgetsaddons - kxmlgui - - bison - boost - eigen - exiv2 - flex - jasper - lcms2 - lensfun - libgphoto2 - libkipi - liblqr1 - libusb1 - marble.unwrapped - mysql - opencv - threadweaver - - oxygen - ]; - - enableParallelBuilding = true; - - cmakeFlags = [ - "-DLIBUSB_LIBRARIES=${libusb1.out}/lib" - "-DLIBUSB_INCLUDE_DIR=${libusb1.dev}/include/libusb-1.0" - "-DENABLE_MYSQLSUPPORT=1" - "-DENABLE_INTERNALMYSQL=1" - ]; - - fixupPhase = '' - substituteInPlace $out/bin/digitaglinktree \ - --replace "/usr/bin/perl" "${perl}/bin/perl" \ - --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3" - - wrapQtProgram $out/bin/digikam \ - --prefix PATH : "${gnumake}/bin:${hugin}/bin:${enblend-enfuse}/bin" - - wrapQtProgram $out/bin/showfoto - ''; - - meta = { - description = "Photo Management Program"; - license = stdenv.lib.licenses.gpl2; - homepage = http://www.digikam.org; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 9a9c0ff1d7f7..a9d7d357ad71 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -1,235 +1,122 @@ -{ stdenv, fetchurl, fetchpatch, automoc4, boost, shared_desktop_ontologies -, cmake, eigen, lcms, gettext, jasper, kdelibs, kdepimlibs, lensfun -, libgphoto2, libjpeg, libkdcraw, libkexiv2, libkipi, libpgf, libtiff -, libusb1, liblqr1, marble, mysql, opencv, perl, phonon, pkgconfig -, qca2, qimageblitz, qjson, qt4, soprano - -# Optional build time dependencies -, baloo, doxygen, kfilemetadata +{ stdenv, fetchurl, cmake, ecm, makeQtWrapper + +# For `digitaglinktree` +, perl, sqlite + +, qtbase +, qtxmlpatterns +, qtsvg +, qtwebkit + +, kconfigwidgets +, kcoreaddons +, kdoctools +, kfilemetadata +, knotifications +, knotifyconfig +, ktextwidgets +, kwidgetsaddons +, kxmlgui + +, bison +, boost +, eigen +, exiv2 +, flex +, jasper , lcms2 -, kfaceSupport ? true, libkface ? null -, kgeomapSupport ? true, libkgeomap ? null -, libxslt - -# Plugins optional build time dependencies -, gdk_pixbuf, imagemagick -, libgpod, libksane, libkvkontakte -, qt_gstreamer1 /*qt_soap, <https://github.com/commontk/QtSOAP> herqq <http://www.herqq.org> -> is missing its av part.*/ - /*qt_koauth <http://gitorious.org/kqoauth>*/ - -# Supplementary packages required only by the wrapper. -, bash, kde_runtime, kde_baseapps, makeWrapper, oxygen_icons -, phonon-backend-vlc /*phonon-backend-gstreamer,*/ -, ffmpegthumbs /*mplayerthumbs*/ -, runCommand, shared_mime_info, writeScriptBin +, lensfun +, libgphoto2 +, libkipi +, liblqr1 +, libusb1 +, marble +, mysql +, opencv +, threadweaver + +# For panorama and focus stacking +, enblend-enfuse +, hugin +, gnumake + +, oxygen }: -let - version = "4.12.0"; - pName = "digikam-${version}"; - - build = stdenv.mkDerivation rec { - name = "digikam-build-${version}"; - - src = fetchurl { - url = "http://download.kde.org/stable/digikam/${pName}.tar.bz2"; - sha256 = "081ldsaf3frf5khznjd3sxkjmi4dyp6w6nqnc2a0agkk0kxkl10m"; - }; - - patches = [ - (fetchpatch { - # Fix compilation against Lensfun 0.3.2 - url = "http://cgit.kde.org/digikam.git/patch/?id=0f159981176faa6da701f112bfe557b79804d468"; - sha256 = "1c8bg7s84vg4v620gbs16cjcbpml749018gy5dpvfacx5vl24wza"; - }) - ]; - - patchFlags = ["-p1" "-dcore"]; - - nativeBuildInputs = [ - automoc4 cmake gettext perl pkgconfig - ] ++ [ - # Optional - doxygen - ]; - - buildInputs = [ - boost eigen jasper kdelibs kdepimlibs lcms lensfun - libgphoto2 libjpeg libkdcraw libkexiv2 libkipi liblqr1 libpgf - libtiff marble mysql.lib opencv phonon qca2 qimageblitz qjson qt4 - shared_desktop_ontologies soprano ] - # Optional build time dependencies - ++ [ - baloo - kfilemetadata - lcms2 ] - ++ stdenv.lib.optional (kfaceSupport && null != libkface) [ libkface ] - ++ stdenv.lib.optional (kgeomapSupport && null != libkgeomap) [ libkgeomap ] ++ - [ libxslt ] - # Plugins optional build time dependencies - ++ [ - gdk_pixbuf imagemagick libgpod libksane - libkvkontakte - qt_gstreamer1 ]; - - # Make digikam find some FindXXXX.cmake - KDEDIRS="${marble}:${qjson}"; - - # Find kdepimlibs's upper case headers under `include/KDE`. - NIX_CFLAGS_COMPILE = "-I${kdepimlibs}/include/KDE"; - - # Help digiKam find libusb, otherwise gphoto2 support is disabled - cmakeFlags = [ - "-DLIBUSB_LIBRARIES=${libusb1.out}/lib" - "-DLIBUSB_INCLUDE_DIR=${libusb1.dev}/include/libusb-1.0" - "-DENABLE_BALOOSUPPORT=ON" - "-DENABLE_KDEPIMLIBSSUPPORT=ON" - "-DENABLE_LCMS2=ON" ] - ++ stdenv.lib.optional (kfaceSupport && null == libkface) [ "-DDIGIKAMSC_COMPILE_LIBKFACE=ON" ] - ++ stdenv.lib.optional (kgeomapSupport && null == libkgeomap) [ "-DDIGIKAMSC_COMPILE_LIBKGEOMAP=ON" ]; - - enableParallelBuilding = true; - - meta = { - description = "Photo Management Program"; - license = stdenv.lib.licenses.gpl2; - homepage = http://www.digikam.org; - maintainers = with stdenv.lib.maintainers; [ goibhniu viric urkud ]; - inherit (kdelibs.meta) platforms; - }; - }; +stdenv.mkDerivation rec { + name = "digikam-${version}"; + version = "5.4.0"; + src = fetchurl { + url = "http://download.kde.org/stable/digikam/${name}.tar.xz"; + sha256 = "0dgsgji14l5zvxny36hrfsp889fsfrsbbn9bg57m18404xp903kg"; + }; - kdePkgs = [ - build # digikam's own build - kdelibs kdepimlibs kde_runtime kde_baseapps libkdcraw oxygen_icons - /*phonon-backend-gstreamer*/ phonon-backend-vlc - ffmpegthumbs /*mplayerthumbs*/ shared_mime_info ] - # Optional build time dependencies - ++ [ - - baloo kfilemetadata ] - ++ stdenv.lib.optional (kfaceSupport && null != libkface) [ libkface ] - ++ stdenv.lib.optional (kgeomapSupport && null != libkgeomap) [ libkgeomap ] - ++ [ - libkipi ] - # Plugins optional build time dependencies - ++ [ - libksane libkvkontakte + nativeBuildInputs = [ cmake ecm makeQtWrapper ]; + + patches = [ ./0001-Disable-fno-operator-names.patch ]; + + buildInputs = [ + qtbase + qtxmlpatterns + qtsvg + qtwebkit + + kconfigwidgets + kcoreaddons + kdoctools + kfilemetadata + knotifications + knotifyconfig + ktextwidgets + kwidgetsaddons + kxmlgui + + bison + boost + eigen + exiv2 + flex + jasper + lcms2 + lensfun + libgphoto2 + libkipi + liblqr1 + libusb1 + marble.unwrapped + mysql + opencv + threadweaver + + oxygen ]; + enableParallelBuilding = true; - # TODO: It should be the responsability of these packages to add themselves to `KDEDIRS`. See - # <https://github.com/ttuegel/nixpkgs/commit/a0efeacc0ef2cf63bbb768bfb172a483307d080b> for - # a practical example. - # IMPORTANT: Note that using `XDG_DATA_DIRS` here instead of `KDEDIRS` won't work properly. - KDEDIRS = with stdenv.lib; concatStrings (intersperse ":" (map (x: "${x}") kdePkgs)); - - sycocaDirRelPath = "var/lib/kdesycoca"; - sycocaFileRelPath = "${sycocaDirRelPath}/${pName}.sycoca"; - - sycoca = runCommand "${pName}" { - - name = "digikam-sycoca-${version}"; - - nativeBuildInputs = [ kdelibs ]; - - dontPatchELF = true; - dontStrip = true; + cmakeFlags = [ + "-DLIBUSB_LIBRARIES=${libusb1.out}/lib" + "-DLIBUSB_INCLUDE_DIR=${libusb1.dev}/include/libusb-1.0" + "-DENABLE_MYSQLSUPPORT=1" + "-DENABLE_INTERNALMYSQL=1" + ]; - } '' - # Make sure kbuildsycoca4 does not attempt to write to user home directory. - export HOME=$PWD + fixupPhase = '' + substituteInPlace $out/bin/digitaglinktree \ + --replace "/usr/bin/perl" "${perl}/bin/perl" \ + --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3" - export KDESYCOCA="$out/${sycocaFileRelPath}" + wrapQtProgram $out/bin/digikam \ + --prefix PATH : "${gnumake}/bin:${hugin}/bin:${enblend-enfuse}/bin" - mkdir -p $out/${sycocaDirRelPath} - export XDG_DATA_DIRS="" - export KDEDIRS="${KDEDIRS}" - kbuildsycoca4 --noincremental --nosignal + wrapQtProgram $out/bin/showfoto ''; - - replaceExeListWithWrapped = - let f = exeName: '' - rm -f "$out/bin/${exeName}" - makeWrapper "${build}/bin/${exeName}" "$out/bin/${exeName}" \ - --set XDG_DATA_DIRS "" \ - --set KDEDIRS "${KDEDIRS}" \ - --set KDESYCOCA "${sycoca}/${sycocaFileRelPath}" - ''; - in - with stdenv.lib; exeNameList: concatStrings (intersperse "\n" (map f exeNameList)); - -in - - -with stdenv.lib; - -/* - Final derivation - ---------------- - - - Create symlinks to our original build derivation items. - - Wrap specific executables so that they know of the appropriate - sycoca database, `KDEDIRS` to use and block any interference - from `XDG_DATA_DIRS` (only `dnginfo` is not wrapped). -*/ -runCommand "${pName}" { - inherit build; - inherit sycoca; - - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = kdePkgs; - - dontPatchELF = true; - dontStrip = true; - meta = { description = "Photo Management Program"; license = stdenv.lib.licenses.gpl2; homepage = http://www.digikam.org; - maintainers = with stdenv.lib.maintainers; [ /*jraygauthier*/ ]; - inherit (kdelibs.meta) platforms; - broken = true; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + platforms = stdenv.lib.platforms.linux; }; - -} '' - pushd $build > /dev/null - for d in `find . -maxdepth 1 -name "*" -printf "%f\n" | tail -n+2`; do - mkdir -p $out/$d - for f in `find $d -maxdepth 1 -name "*" -printf "%f\n" | tail -n+2`; do - ln -s "$build/$d/$f" "$out/$d/$f" - done - done - popd > /dev/null - - ${replaceExeListWithWrapped [ "cleanup_digikamdb" "digitaglinktree" "digikam" "dngconverter" - "expoblending" "photolayoutseditor" "scangui" "showfoto" ]} -'' - -/* - -TODO ----- - -### Useful ### - - - Per lib `KDELIBS` environment variable export. See above in-code TODO comment. - - Missing optional `qt_soap` or `herqq` (av + normal package) dependencies. Those are not - yet (or not fully) packaged in nix. Mainly required for upnp export. - - Possibility to use the `phonon-backend-gstreamer` with its own user specified set of backend. - - Allow user to disable optional features or dependencies reacting properly. - - Compile `kipiplugins` as a separate package (so that it can be used by other kde packages - and so that this package's build time is reduced). - -### Not so useful ### - - - Missing optional `qt_koauth` (not packaged in nix). - - Missing optional `libmediawiki` (not packaged in nix).. - - For some reason the cmake build does not detect `libkvkontakte`. Fix this. - - Possibility to use `mplayerthumbs` thumbnail creator backend. In digikam dev docs, - it is however suggested to use `ffmpegthumbs`. Maybe we should stick to it. - -*/ +} diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix index 6eb57c3dd5f1..ea0fe51cc85a 100644 --- a/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/pkgs/applications/graphics/kgraphviewer/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig -, kdelibs, boost, graphviz +, kdelibs4, boost, graphviz }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "13zhjs57xavzrj4nrlqs35n35ihvzij7hgbszf5fhlp2a4d4rrqs"; }; - buildInputs = [ kdelibs boost graphviz ]; + buildInputs = [ kdelibs4 boost graphviz ]; nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/graphics/kipi-plugins/5.x.nix b/pkgs/applications/graphics/kipi-plugins/5.x.nix deleted file mode 100644 index 2f6cc8e4ece0..000000000000 --- a/pkgs/applications/graphics/kipi-plugins/5.x.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - stdenv, fetchurl, - ecm, - karchive, kconfig, ki18n, kiconthemes, kio, kservice, kwindowsystem, kxmlgui, - libkipi, qtbase, qtsvg, qtxmlpatterns -}: - -stdenv.mkDerivation rec { - name = "kipi-plugins-${version}"; - version = "5.2.0"; - - src = fetchurl { - url = "http://download.kde.org/stable/digikam/digikam-${version}.tar.xz"; - sha256 = "0q4j7iv20cxgfsr14qwzx05wbp2zkgc7cg2pi7ibcnwba70ky96g"; - }; - - prePatch = '' - cd extra/kipi-plugins - ''; - - nativeBuildInputs = [ ecm ]; - buildInputs = [ - karchive kconfig ki18n kiconthemes kio kservice kwindowsystem kxmlgui libkipi - qtbase qtsvg qtxmlpatterns - ]; - - meta = { - description = "Plugins for KDE-based image applications"; - license = stdenv.lib.licenses.gpl2; - homepage = http://www.digikam.org; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix index b69105fba7c8..2f6cc8e4ece0 100644 --- a/pkgs/applications/graphics/kipi-plugins/default.nix +++ b/pkgs/applications/graphics/kipi-plugins/default.nix @@ -1,30 +1,34 @@ -{ stdenv, fetchurl, kdelibs, qimageblitz, qca2, kdepimlibs, libxml2, libxslt -, gettext, opencv, libgpod, gdk_pixbuf , qjson, pkgconfig -, cmake, automoc4 -, kdegraphics, libkexiv2 ? kdegraphics, libkdcraw ? kdegraphics -, libkipi ? kdegraphics, libksane ? kdegraphics }: +{ + stdenv, fetchurl, + ecm, + karchive, kconfig, ki18n, kiconthemes, kio, kservice, kwindowsystem, kxmlgui, + libkipi, qtbase, qtsvg, qtxmlpatterns +}: stdenv.mkDerivation rec { - name = "kipi-plugins-1.9.0"; + name = "kipi-plugins-${version}"; + version = "5.2.0"; src = fetchurl { - url = "mirror://sourceforge/kipi/${name}.tar.bz2"; - sha256 = "0k4k9v1rj7129n0s0i5pvv4rabx0prxqs6sca642fj95cxc6c96m"; + url = "http://download.kde.org/stable/digikam/digikam-${version}.tar.xz"; + sha256 = "0q4j7iv20cxgfsr14qwzx05wbp2zkgc7cg2pi7ibcnwba70ky96g"; }; - buildInputs = - [ kdelibs libkexiv2 libkdcraw libkipi qimageblitz qca2 kdepimlibs libxml2 - libksane libxslt gettext opencv libgpod gdk_pixbuf qjson - ]; + prePatch = '' + cd extra/kipi-plugins + ''; - nativeBuildInputs = [ pkgconfig cmake automoc4 ]; + nativeBuildInputs = [ ecm ]; + buildInputs = [ + karchive kconfig ki18n kiconthemes kio kservice kwindowsystem kxmlgui libkipi + qtbase qtsvg qtxmlpatterns + ]; meta = { - description = "Photo Management Program"; - license = "GPL"; - homepage = http://www.kipi-plugins.org; - inherit (kdelibs.meta) platforms; - maintainers = with stdenv.lib.maintainers; [ viric urkud ]; - broken = true; # it should be built from digikam sources, perhaps together + description = "Plugins for KDE-based image applications"; + license = stdenv.lib.licenses.gpl2; + homepage = http://www.digikam.org; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/kuickshow/default.nix b/pkgs/applications/graphics/kuickshow/default.nix deleted file mode 100644 index cfecd19df46d..000000000000 --- a/pkgs/applications/graphics/kuickshow/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ stdenv, fetchurl, automoc4, kdelibs, imlib, cmake, pkgconfig, gettext }: - -stdenv.mkDerivation rec { - name = "kuickshow-0.9.1"; - - src = fetchurl { - url = "http://hosti.leonde.de/~gis/${name}.tar.bz2"; - sha256 = "0l488a6p0ligbhv6p1lnx5k2d00x9bkkvms30winifa8rmisa9wl"; - }; - - buildInputs = [ kdelibs imlib ]; - - nativeBuildInputs = [ automoc4 cmake gettext pkgconfig ]; -} diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index ce35593d91d1..907c9d612b85 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = "http://dfilemanager.sourceforge.net/"; - description = "File manager written in Qt/C++, it does use one library from kdelibs, the solid lib for easy device handling"; + description = "File manager written in Qt/C++"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.eduarrrd ]; diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix index 8c69e36a4e49..bda647659416 100644 --- a/pkgs/applications/misc/k3b/default.nix +++ b/pkgs/applications/misc/k3b/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchurl, makeWrapper, automoc4, cmake, perl, pkgconfig , shared_mime_info, libvorbis, taglib, flac, libsamplerate , libdvdread, lame, libsndfile, libmad, gettext , transcode, cdrdao -, dvdplusrwtools, vcdimager, cdparanoia, kdelibs, libdvdcss, ffmpeg -, kdemultimedia, phonon, libkcddb ? null +, dvdplusrwtools, vcdimager, cdparanoia, kdelibs4, libdvdcss, ffmpeg +, libkcddb, phonon }: let @@ -24,8 +24,8 @@ in stdenv.mkDerivation rec { buildInputs = [ shared_mime_info libvorbis taglib flac libsamplerate libdvdread - lame libsndfile libmad stdenv.cc.libc kdelibs - kdemultimedia phonon libkcddb makeWrapper cdparanoia + lame libsndfile libmad stdenv.cc.libc kdelibs4 + phonon libkcddb makeWrapper cdparanoia libdvdcss ffmpeg ]; diff --git a/pkgs/applications/misc/kde-wacomtablet/default.nix b/pkgs/applications/misc/kde-wacomtablet/default.nix deleted file mode 100644 index 013efee8ec91..000000000000 --- a/pkgs/applications/misc/kde-wacomtablet/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig -, kdelibs, xf86_input_wacom }: - -stdenv.mkDerivation rec { - name = "wacomtablet-2.1.0"; - - src = fetchurl { - url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.1.0.tar.xz"; - sha256 = "17n1p5v2yx517hkqd13pyl3wnrdnh6pfzwf2y2csrfckyndhwk8w"; - }; - - buildInputs = [ kdelibs xf86_input_wacom ]; - - nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; - - meta = with stdenv.lib; { - description = "KDE Wacom graphic tablet configuration tool"; - license = licenses.gpl2Plus; - homepage = http://kde-apps.org/content/show.php/wacom+tablet?content=114856; - platforms = platforms.linux; - maintainers = [ maintainers.goibhniu maintainers.urkud ]; - }; -} diff --git a/pkgs/applications/misc/kdeconnect/0.7.nix b/pkgs/applications/misc/kdeconnect/0.7.nix deleted file mode 100644 index 551d7c06468a..000000000000 --- a/pkgs/applications/misc/kdeconnect/0.7.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig -, gettext, kdelibs, libXtst, libfakekey, makeWrapper, qca2, qjson -}: - -stdenv.mkDerivation rec { - name = "kdeconnect-${version}"; - version = "0.7.3"; - - src = fetchurl { - url = "http://download.kde.org/unstable/kdeconnect/${version}/src/kdeconnect-kde-${version}.tar.xz"; - sha256 = "1vrr047bq5skxvibv5pb9ch9dxh005zmar017jzbyb9hilxr8kg4"; - }; - - buildInputs = [ gettext kdelibs libXtst libfakekey makeWrapper qca2 qjson ]; - - nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; - - meta = with stdenv.lib; { - description = "A tool to connect and sync your devices with KDE"; - longDescription = '' - The corresponding Android app, "KDE Connect", is available in - F-Droid and Google play and has the following features: - - - Share files and URLs to KDE from any app - - Clipboard share: copy from or to your desktop - - Notifications sync (4.3+): Read your Android notifications from KDE - - Multimedia remote control: Use your phone as a remote control - - WiFi connection: no usb wire or bluetooth needed - - RSA Encryption: your information is safe - ''; - license = licenses.gpl2; - homepage = https://projects.kde.org/projects/playground/base/kdeconnect-kde; - platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; - }; -} diff --git a/pkgs/applications/misc/kgocode/default.nix b/pkgs/applications/misc/kgocode/default.nix index 3088b5b3c653..b12c9fe25510 100644 --- a/pkgs/applications/misc/kgocode/default.nix +++ b/pkgs/applications/misc/kgocode/default.nix @@ -1,9 +1,9 @@ -{ fetchgit, stdenv, cmake, kdelibs, automoc4 } : +{ fetchgit, stdenv, cmake, kdelibs4, automoc4 } : stdenv.mkDerivation rec { name = "kgocode-0.0.1"; - buildInputs = [ cmake kdelibs automoc4 ]; + buildInputs = [ cmake kdelibs4 automoc4 ]; src = fetchgit { url = https://bitbucket.org/lucashnegri/kgocode.git; diff --git a/pkgs/applications/misc/krename/kde5.nix b/pkgs/applications/misc/krename/default.nix index a2137060ef64..a2137060ef64 100644 --- a/pkgs/applications/misc/krename/kde5.nix +++ b/pkgs/applications/misc/krename/default.nix diff --git a/pkgs/applications/misc/krename/kde4.nix b/pkgs/applications/misc/krename/kde4.nix deleted file mode 100644 index 1e4da7fa11f7..000000000000 --- a/pkgs/applications/misc/krename/kde4.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig -, kdelibs, taglib, exiv2, podofo, qt4, phonon -}: - -stdenv.mkDerivation rec { - name = "krename-4.0.9"; - - src = fetchurl { - url = "mirror://sourceforge/krename/${name}.tar.bz2"; - sha256 = "11bdg5vdcs393n0aibhm3jh3wxlk5kz78jhkwf7cj9086qkg9wds"; - }; - - buildInputs = [ kdelibs taglib exiv2 podofo qt4 phonon ]; - nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; - - meta = { - homepage = http://www.krename.net; - description = "A powerful batch renamer for KDE"; - inherit (kdelibs.meta) platforms; - maintainers = [ stdenv.lib.maintainers.urkud ]; - }; -} diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix index 2a9c6305d42e..75b2da6e8a25 100644 --- a/pkgs/applications/misc/krusader/default.nix +++ b/pkgs/applications/misc/krusader/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig -, kdelibs, kde_baseapps +, kdelibs4, kde_baseapps }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/krusader/${name}.tar.bz2"; sha256 = "1q1m4cjzz2m41pdpxnwrsiczc7990785b700lv64midjjgjnr7j6"; }; - buildInputs = [ kdelibs kde_baseapps ]; + buildInputs = [ kdelibs4 kde_baseapps ]; nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions meta = { @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { license = "GPL"; homepage = http://www.krusader.org; maintainers = with stdenv.lib.maintainers; [ sander urkud ]; - inherit (kdelibs.meta) platforms; + inherit (kdelibs4.meta) platforms; }; } diff --git a/pkgs/applications/misc/rsibreak/default.nix b/pkgs/applications/misc/rsibreak/default.nix deleted file mode 100644 index 42247572c246..000000000000 --- a/pkgs/applications/misc/rsibreak/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig -, kdelibs, kdebase_workspace }: - -let version = "0.11"; -in -stdenv.mkDerivation rec { - name = "rsibreak-${version}"; - - src = fetchurl { - url = "mirror://debian/pool/main/r/rsibreak/rsibreak_${version}.orig.tar.gz"; - sha256 = "0g27aswh8iz5v67v1wkjny4p100vs2gm0lw0qzfkg6sw1pb4i519"; - }; - - nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; - - buildInputs = [ kdelibs kdebase_workspace ]; - - meta = { - homepage = http://userbase.kde.org/RSIBreak; # http://www.rsibreak.org/ is down since 2011 - description = "Utility to help prevent repetitive strain injury for KDE 4"; - inherit (kdelibs.meta) platforms maintainers; - }; -} diff --git a/pkgs/applications/misc/semnotes/default.nix b/pkgs/applications/misc/semnotes/default.nix deleted file mode 100644 index 52a575130c0e..000000000000 --- a/pkgs/applications/misc/semnotes/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, cmake, qt4, kdelibs, soprano, automoc4, phonon, shared_desktop_ontologies }: -stdenv.mkDerivation { - name = "semnotes-0.4.0-1"; - - src = fetchurl { - url = "mirror://sourceforge/semn/0.4.0/semnotes-0.4.0-1-src.tar.bz2"; - sha256 = "1zh5jfh7pyhyz5fbzcgzyckdg0ny7sf8s16yy6rjw9n021zz5i7m"; - }; - - buildInputs = [ cmake qt4 kdelibs automoc4 phonon soprano shared_desktop_ontologies ]; - - meta = with stdenv.lib; { - description = "Semantic note-taking tool for KDE based on Nepomuk-KDE"; - longDescription = '' - SemNotes links notes to the data that is available on the user's desktop. - The data stored about a note consists of: a title, content, tags, creation - and last modification time. The notes and all the information about them - are stored as RDF resources in the Nepomuk repository. They are - automatically linked to the resources they reference. - ''; - license = "GPL"; - homepage = http://smile.deri.ie/projects/semn; - maintainers = [ maintainers.phreedom ]; - platforms = platforms.linux; - }; -} \ No newline at end of file diff --git a/pkgs/applications/misc/yakuake/3.0.nix b/pkgs/applications/misc/yakuake/3.0.nix deleted file mode 100644 index 8bce26deefc3..000000000000 --- a/pkgs/applications/misc/yakuake/3.0.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ kdeDerivation -, lib -, fetchurl -, kdoctools -, kdeWrapper -, ecm -, karchive -, kcrash -, kdbusaddons -, ki18n -, kiconthemes -, knewstuff -, knotifications -, knotifyconfig -, konsole -, kparts -, kwindowsystem -}: - -let - unwrapped = let - pname = "yakuake"; - version = "3.0.2"; - in kdeDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "0vcdji1k8d3pz7k6lkw8ighkj94zff2l2cf9v1avf83f4hjyfhg5"; - }; - - buildInputs = [ - karchive - kcrash - kdbusaddons - ki18n - kiconthemes - knewstuff - knotifications - knotifyconfig - kparts - kwindowsystem - ]; - - nativeBuildInputs = [ - ecm kdoctools - ]; - - meta = { - homepage = https://yakuake.kde.org; - description = "Quad-style terminal emulator for KDE"; - maintainers = with lib.maintainers; [ fridh ]; - }; - }; - - -in -kdeWrapper -{ - inherit unwrapped; - targets = [ "bin/yakuake" ]; - paths = [ konsole.unwrapped ]; -} diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix index e48201b914c5..8bce26deefc3 100644 --- a/pkgs/applications/misc/yakuake/default.nix +++ b/pkgs/applications/misc/yakuake/default.nix @@ -1,28 +1,63 @@ -{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig -, kdelibs, konsole }: +{ kdeDerivation +, lib +, fetchurl +, kdoctools +, kdeWrapper +, ecm +, karchive +, kcrash +, kdbusaddons +, ki18n +, kiconthemes +, knewstuff +, knotifications +, knotifyconfig +, konsole +, kparts +, kwindowsystem +}: let - pname = "yakuake"; - version = "2.9.9"; -in -stdenv.mkDerivation { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "0e0e4994c568f8091c9424e4aab35645436a9ff341c00b1cd1eab0ada0bf61ce"; - }; + unwrapped = let + pname = "yakuake"; + version = "3.0.2"; + in kdeDerivation rec { + name = "${pname}-${version}"; - buildInputs = [ kdelibs ]; + src = fetchurl { + url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz"; + sha256 = "0vcdji1k8d3pz7k6lkw8ighkj94zff2l2cf9v1avf83f4hjyfhg5"; + }; - nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; + buildInputs = [ + karchive + kcrash + kdbusaddons + ki18n + kiconthemes + knewstuff + knotifications + knotifyconfig + kparts + kwindowsystem + ]; - propagatedUserEnvPkgs = [ konsole ]; + nativeBuildInputs = [ + ecm kdoctools + ]; - meta = { - homepage = http://yakuake.kde.org; - description = "Quad-style terminal emulator for KDE"; - inherit (kdelibs.meta) platforms; - maintainers = [ stdenv.lib.maintainers.urkud ]; + meta = { + homepage = https://yakuake.kde.org; + description = "Quad-style terminal emulator for KDE"; + maintainers = with lib.maintainers; [ fridh ]; + }; }; + + +in +kdeWrapper +{ + inherit unwrapped; + targets = [ "bin/yakuake" ]; + paths = [ konsole.unwrapped ]; } diff --git a/pkgs/applications/networking/browsers/kwebkitpart/CVE-2014-8600.diff b/pkgs/applications/networking/browsers/kwebkitpart/CVE-2014-8600.diff deleted file mode 100644 index 0c65e68f2167..000000000000 --- a/pkgs/applications/networking/browsers/kwebkitpart/CVE-2014-8600.diff +++ /dev/null @@ -1,33 +0,0 @@ ---- a/src/webpage.cpp -+++ b/src/webpage.cpp -@@ -226,23 +226,26 @@ - doc += QL1S( "<h3>" ); - doc += i18n( "Details of the Request:" ); - doc += QL1S( "</h3><ul><li>" ); -- doc += i18n( "URL: %1", reqUrl.url() ); -+ // escape URL twice: once for i18n, and once for HTML. -+ doc += i18n( "URL: %1", Qt::escape( Qt::escape( reqUrl.prettyUrl() ) ) ); - doc += QL1S( "</li><li>" ); - - const QString protocol (reqUrl.protocol()); - if ( !protocol.isNull() ) { -- doc += i18n( "Protocol: %1", protocol ); -+ // escape protocol twice: once for i18n, and once for HTML. -+ doc += i18n( "Protocol: %1", Qt::escape( Qt::escape( protocol ) ) ); - doc += QL1S( "</li><li>" ); - } - - doc += i18n( "Date and Time: %1", - KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), KLocale::LongDate) ); - doc += QL1S( "</li><li>" ); -- doc += i18n( "Additional Information: %1" , text ); -+ // escape text twice: once for i18n, and once for HTML. -+ doc += i18n( "Additional Information: %1", Qt::escape( Qt::escape( text ) ) ); - doc += QL1S( "</li></ul><h3>" ); - doc += i18n( "Description:" ); - doc += QL1S( "</h3><p>" ); -- doc += description; -+ doc += Qt::escape( description ); - doc += QL1S( "</p>" ); - - if ( causes.count() ) { diff --git a/pkgs/applications/networking/browsers/kwebkitpart/default.nix b/pkgs/applications/networking/browsers/kwebkitpart/default.nix deleted file mode 100644 index 1cbffdd25446..000000000000 --- a/pkgs/applications/networking/browsers/kwebkitpart/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchgit, automoc4, cmake, perl, pkgconfig, kdelibs }: - -stdenv.mkDerivation rec { - name = "kwebkitpart-${version}"; - version = "1.3.3"; - - src = fetchgit { - url = git://anongit.kde.org/kwebkitpart; - rev = "refs/tags/v${version}"; - sha256 = "13vfv88njml7x67a37ymmlv9qs30fkmvkq0278lp7llmvp5qnxcj"; - }; - - patches = [ ./CVE-2014-8600.diff ]; - - buildInputs = [ kdelibs ]; - - nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = [ maintainers.phreedom ]; - description = "A WebKit KPart for Konqueror, Akregator and other KDE applications"; - homepage = https://projects.kde.org/projects/extragear/base/kwebkitpart; - }; -} diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix deleted file mode 100644 index 70aa648ccc50..000000000000 --- a/pkgs/applications/networking/browsers/rekonq/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig -, kde4, shared_desktop_ontologies, qca2, qoauth }: - -assert builtins.compareVersions "4.8.3" kde4.release != 1; # https://bugs.kde.org/show_bug.cgi?id=306077 - -stdenv.mkDerivation rec { - name = "rekonq-2.4.2"; # >=1.80 need kde >=4.9.0 - - src = fetchurl { - url = "mirror://sourceforge/rekonq/${name}.tar.xz"; - sha256 = "09jihyf4xl7bwfwahwwbx6f11h3zqljccchnpl4mijljylr5p079"; - }; - - buildInputs = [ kde4.kdelibs qca2 qoauth ]; - - nativeBuildInputs = [ - automoc4 cmake gettext perl pkgconfig shared_desktop_ontologies - ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = [ maintainers.urkud ]; - description = "KDE Webkit browser"; - homepage = https://rekonq.kde.org/; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/choqok/default.nix b/pkgs/applications/networking/instant-messengers/choqok/default.nix deleted file mode 100644 index a50779f53dd0..000000000000 --- a/pkgs/applications/networking/instant-messengers/choqok/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, cmake, qt4, perl, gettext, libXScrnSaver -, kdelibs, kdepimlibs, automoc4, pkgconfig, phonon, qca2, qjson, qoauth }: - -let - pn = "choqok"; - v = "1.5"; -in - -stdenv.mkDerivation rec { - name = "${pn}-${v}"; - - src = fetchurl { - url = "mirror://sourceforge/project/choqok/Choqok/choqok-1.5.tar.xz"; - sha256 = "5cb97ac4cdf9db4699bb7445a9411393073d213fea649ab0713f659f1308efe4"; - }; - - buildInputs = [ cmake qt4 perl gettext libXScrnSaver kdelibs kdepimlibs - automoc4 pkgconfig phonon qca2 qjson qoauth ]; - - meta = with stdenv.lib; { - description = "A KDE microblogging client"; - repositories.git = git://anongit.kde.org/choqok; - license = "GPL"; - inherit (kdelibs.meta) maintainers platforms; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix index 84ced8f62c6e..c79f939dc73c 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, automoc4, cmake, gettext, perl, pkgconfig -, telepathy_qt, kdelibs, kde_workspace, dbus_glib, dbus_libs, farstream +, telepathy_qt, kdelibs4, kde_workspace, dbus_glib, dbus_libs, farstream , qt_gstreamer1, telepathy_glib, telepathy_logger , qjson, flex, bison, qca2 }: @@ -48,12 +48,12 @@ let nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ] ++ (stdenv.lib.attrByPath [ key ] [] extraNativeBuildInputs); - buildInputs = [ kdelibs telepathy_qt ] + buildInputs = [ kdelibs4 telepathy_qt ] ++ stdenv.lib.optional (name != "ktp-common-internals") ktp.common_internals ++ (stdenv.lib.attrByPath [ key ] [] extraBuildInputs); meta = { - inherit (kdelibs.meta) platforms; + inherit (kdelibs4.meta) platforms; maintainers = [ stdenv.lib.maintainers.urkud ]; }; } diff --git a/pkgs/applications/networking/irc/konversation/1.6.nix b/pkgs/applications/networking/irc/konversation/1.6.nix deleted file mode 100644 index 9724ae5f4bf0..000000000000 --- a/pkgs/applications/networking/irc/konversation/1.6.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ kdeDerivation -, lib -, fetchurl -, ecm -, kbookmarks -, karchive -, kconfig -, kconfigwidgets -, kcoreaddons -, kdbusaddons -, kdeWrapper -, kdoctools -, kemoticons -, kglobalaccel -, ki18n -, kiconthemes -, kidletime -, kitemviews -, knotifications -, knotifyconfig -, kio -, kparts -, kwallet -, makeQtWrapper -, solid -, sonnet -, phonon -}: - -let - unwrapped = let - pname = "konversation"; - version = "1.6.2"; - in kdeDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "1798sslwz7a3h1v524ra33p0j5iqvcg0v1insyvb5qp4kv11slmn"; - }; - - buildInputs = [ - kbookmarks - karchive - kconfig - kconfigwidgets - kcoreaddons - kdbusaddons - kdoctools - kemoticons - kglobalaccel - ki18n - kiconthemes - kidletime - kitemviews - knotifications - knotifyconfig - kio - kparts - kwallet - solid - sonnet - phonon - ]; - - nativeBuildInputs = [ - ecm - kdoctools - ]; - - meta = { - description = "Integrated IRC client for KDE"; - license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ fridh ]; - homepage = https://konversation.kde.org; - }; - }; -in kdeWrapper { - inherit unwrapped; - targets = [ "bin/konversation" ]; -} - diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix index cbe4e3be28d4..9724ae5f4bf0 100644 --- a/pkgs/applications/networking/irc/konversation/default.nix +++ b/pkgs/applications/networking/irc/konversation/default.nix @@ -1,26 +1,82 @@ -{ stdenv, fetchurl, cmake, qt4, perl, gettext, libXScrnSaver -, kdelibs, kdepimlibs, automoc4, phonon, qca2}: +{ kdeDerivation +, lib +, fetchurl +, ecm +, kbookmarks +, karchive +, kconfig +, kconfigwidgets +, kcoreaddons +, kdbusaddons +, kdeWrapper +, kdoctools +, kemoticons +, kglobalaccel +, ki18n +, kiconthemes +, kidletime +, kitemviews +, knotifications +, knotifyconfig +, kio +, kparts +, kwallet +, makeQtWrapper +, solid +, sonnet +, phonon +}: let - pn = "konversation"; - v = "1.5.1"; -in + unwrapped = let + pname = "konversation"; + version = "1.6.2"; + in kdeDerivation rec { + name = "${pname}-${version}"; -stdenv.mkDerivation rec { - name = "${pn}-${v}"; + src = fetchurl { + url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + sha256 = "1798sslwz7a3h1v524ra33p0j5iqvcg0v1insyvb5qp4kv11slmn"; + }; - src = fetchurl { - url = "mirror://kde/stable/${pn}/${v}/src/${name}.tar.xz"; - sha256 = "11hrjrq4r6v1v14ybx9llgzmrl3a45z26n292nb0q887rg1qv0wp"; - }; + buildInputs = [ + kbookmarks + karchive + kconfig + kconfigwidgets + kcoreaddons + kdbusaddons + kdoctools + kemoticons + kglobalaccel + ki18n + kiconthemes + kidletime + kitemviews + knotifications + knotifyconfig + kio + kparts + kwallet + solid + sonnet + phonon + ]; - buildInputs = [ cmake qt4 perl gettext libXScrnSaver kdelibs kdepimlibs - automoc4 phonon qca2 ]; + nativeBuildInputs = [ + ecm + kdoctools + ]; - meta = with stdenv.lib; { - description = "Integrated IRC client for KDE"; - repositories.git = git://anongit.kde.org/konversation; - license = "GPL"; - inherit (kdelibs.meta) maintainers platforms; + meta = { + description = "Integrated IRC client for KDE"; + license = with lib.licenses; [ gpl2 ]; + maintainers = with lib.maintainers; [ fridh ]; + homepage = https://konversation.kde.org; + }; }; +in kdeWrapper { + inherit unwrapped; + targets = [ "bin/konversation" ]; } + diff --git a/pkgs/applications/networking/irc/kvirc/default.nix b/pkgs/applications/networking/irc/kvirc/default.nix deleted file mode 100644 index f4b451e66e07..000000000000 --- a/pkgs/applications/networking/irc/kvirc/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, cmake, qt4, perl, gettext, kdelibs, openssl, zlib}: - -let - pn = "kvirc"; - v = "4.2.0"; -in - -stdenv.mkDerivation { - name = "${pn}-${v}"; - - src = fetchurl { - url = "ftp://ftp.kvirc.de/pub/${pn}/${v}/source/${pn}-${v}.tar.bz2"; - sha256 = "9a547d52d804e39c9635c8dc58bccaf4d34341ef16a9a652a5eb5568d4d762cb"; - }; - - buildInputs = [ cmake qt4 perl gettext kdelibs openssl zlib ]; - - meta = with stdenv.lib; { - description = "Graphic IRC client with Qt"; - license = licenses.gpl3; - homepage = http://www.kvirc.net/; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index f48309d0b049..d631f4aa2146 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -1,15 +1,26 @@ { monolithic ? true # build monolithic Quassel , daemon ? false # build Quassel daemon , client ? false # build Quassel client -, previews ? false # enable webpage previews on hovering over URLs , tag ? "" # tag added to the package name -, withKDE ? stdenv.isLinux # enable KDE integration -, kdelibs ? null , static ? false # link statically -, stdenv, fetchurl, cmake, makeWrapper, qt, automoc4, phonon, dconf, qca2 }: +, stdenv, fetchurl, cmake, makeWrapper, dconf +, qtbase, qtscript +, phonon, libdbusmenu, qca-qt5 + +, withKDE ? stdenv.isLinux # enable KDE integration +, extra-cmake-modules +, kconfigwidgets +, kcoreaddons +, knotifications +, knotifyconfig +, ktextwidgets +, kwidgetsaddons +, kxmlgui +}: -let buildClient = monolithic || client; +let + buildClient = monolithic || client; buildCore = monolithic || daemon; in @@ -17,7 +28,6 @@ assert stdenv.isLinux; assert monolithic -> !client && !daemon; assert client || daemon -> !monolithic; -assert withKDE -> kdelibs != null; assert !buildClient -> !withKDE; # KDE is used by the client only let @@ -31,21 +41,28 @@ in with stdenv; mkDerivation rec { enableParallelBuilding = true; - buildInputs = - [ cmake makeWrapper qt ] - ++ lib.optionals buildCore [qca2] - ++ lib.optionals withKDE [automoc4 kdelibs phonon]; + # Prevent ``undefined reference to `qt_version_tag''' in SSL check + NIX_CFLAGS_COMPILE = [ "-DQT_NO_VERSION_TAGGING=1" ]; - NIX_CFLAGS_COMPILE = "-fPIC"; + buildInputs = + [ cmake makeWrapper qtbase ] + ++ lib.optionals buildCore [qtscript qca-qt5] + ++ lib.optionals buildClient [libdbusmenu phonon] + ++ lib.optionals (buildClient && withKDE) [ + extra-cmake-modules kconfigwidgets kcoreaddons + knotifications knotifyconfig ktextwidgets kwidgetsaddons + kxmlgui + ]; cmakeFlags = [ - "-DEMBED_DATA=OFF" ] + "-DEMBED_DATA=OFF" + "-DUSE_QT5=ON" + ] ++ edf static "STATIC" ++ edf monolithic "WANT_MONO" ++ edf daemon "WANT_CORE" ++ edf client "WANT_QTCLIENT" - ++ edf withKDE "WITH_KDE" - ++ edf previews "WITH_WEBKIT"; + ++ edf withKDE "WITH_KDE"; preFixup = lib.optionalString buildClient '' @@ -66,6 +83,6 @@ in with stdenv; mkDerivation rec { license = stdenv.lib.licenses.gpl3; maintainers = with maintainers; [ phreedom ttuegel ]; repositories.git = https://github.com/quassel/quassel.git; - inherit (qt.meta) platforms; + inherit (qtbase.meta) platforms; }; } diff --git a/pkgs/applications/networking/irc/quassel/qt-5.nix b/pkgs/applications/networking/irc/quassel/qt-5.nix deleted file mode 100644 index d631f4aa2146..000000000000 --- a/pkgs/applications/networking/irc/quassel/qt-5.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ monolithic ? true # build monolithic Quassel -, daemon ? false # build Quassel daemon -, client ? false # build Quassel client -, tag ? "" # tag added to the package name -, static ? false # link statically - -, stdenv, fetchurl, cmake, makeWrapper, dconf -, qtbase, qtscript -, phonon, libdbusmenu, qca-qt5 - -, withKDE ? stdenv.isLinux # enable KDE integration -, extra-cmake-modules -, kconfigwidgets -, kcoreaddons -, knotifications -, knotifyconfig -, ktextwidgets -, kwidgetsaddons -, kxmlgui -}: - -let - buildClient = monolithic || client; - buildCore = monolithic || daemon; -in - -assert stdenv.isLinux; - -assert monolithic -> !client && !daemon; -assert client || daemon -> !monolithic; -assert !buildClient -> !withKDE; # KDE is used by the client only - -let - edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))]; - source = import ./source.nix { inherit fetchurl; }; - -in with stdenv; mkDerivation rec { - inherit (source) src version; - - name = "quassel${tag}-${version}"; - - enableParallelBuilding = true; - - # Prevent ``undefined reference to `qt_version_tag''' in SSL check - NIX_CFLAGS_COMPILE = [ "-DQT_NO_VERSION_TAGGING=1" ]; - - buildInputs = - [ cmake makeWrapper qtbase ] - ++ lib.optionals buildCore [qtscript qca-qt5] - ++ lib.optionals buildClient [libdbusmenu phonon] - ++ lib.optionals (buildClient && withKDE) [ - extra-cmake-modules kconfigwidgets kcoreaddons - knotifications knotifyconfig ktextwidgets kwidgetsaddons - kxmlgui - ]; - - cmakeFlags = [ - "-DEMBED_DATA=OFF" - "-DUSE_QT5=ON" - ] - ++ edf static "STATIC" - ++ edf monolithic "WANT_MONO" - ++ edf daemon "WANT_CORE" - ++ edf client "WANT_QTCLIENT" - ++ edf withKDE "WITH_KDE"; - - preFixup = - lib.optionalString buildClient '' - wrapProgram "$out/bin/quassel${lib.optionalString client "client"}" \ - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" - ''; - - meta = with stdenv.lib; { - homepage = http://quassel-irc.org/; - description = "Qt/KDE distributed IRC client suppporting a remote daemon"; - longDescription = '' - Quassel IRC is a cross-platform, distributed IRC client, - meaning that one (or multiple) client(s) can attach to - and detach from a central core -- much like the popular - combination of screen and a text-based IRC client such - as WeeChat, but graphical (based on Qt4/KDE4 or Qt5/KF5). - ''; - license = stdenv.lib.licenses.gpl3; - maintainers = with maintainers; [ phreedom ttuegel ]; - repositories.git = https://github.com/quassel/quassel.git; - inherit (qtbase.meta) platforms; - }; -} diff --git a/pkgs/applications/networking/newsreaders/kwooty/0001-search-paths.patch b/pkgs/applications/networking/newsreaders/kwooty/0001-search-paths.patch deleted file mode 100644 index 6d1d2bac409b..000000000000 --- a/pkgs/applications/networking/newsreaders/kwooty/0001-search-paths.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6b5730e729d72c8d9242163e7061b956abee61f5 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Sat, 12 Sep 2015 16:14:10 -0500 -Subject: [PATCH] search paths - ---- - src/utilities/utility.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/utilities/utility.cpp b/src/utilities/utility.cpp -index 2e322aa..2e9e4d2 100644 ---- a/src/utilities/utility.cpp -+++ b/src/utilities/utility.cpp -@@ -299,6 +299,7 @@ QString Utility::searchExternalPrograms(const QString& programToSearch, bool& pr - - QString programPathName; - QStringList searchPathList = Settings::searchPathList(); -+ searchPathList << "/usr/bin/unpar" << "/usr/bin/unrar" << "/usr/bin/7z"; - - QStringList programsWithDifferentNames = programToSearch.split(";"); - -@@ -368,7 +369,7 @@ QStringList Utility::buildPriorityArgument(const int& processPriority, const int - QStringList niceProcessArgs; - - // look for 'nice' location : -- QString nicePath = KStandardDirs::findExe("nice"); -+ QString nicePath = QString("/usr/bin/nice"); - niceProcessArgs.append(nicePath); - niceProcessArgs.append("-n"); - --- -2.5.0 - diff --git a/pkgs/applications/networking/newsreaders/kwooty/default.nix b/pkgs/applications/networking/newsreaders/kwooty/default.nix deleted file mode 100644 index f4bd04e8a2d1..000000000000 --- a/pkgs/applications/networking/newsreaders/kwooty/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, cmake, qt4, gettext -, kdelibs, kdebase_workspace, perl -, openssl, phonon, automoc4 -, libX11, libXext, libXft -, unrar, p7zip, par2cmdline, coreutils -}: - -let version = "1.1.0"; - name = "kwooty-${version}"; -in stdenv.mkDerivation { - inherit name; - - src = fetchurl { - url = "https://dl.opendesktop.org/api/files/download/id/1466631747/114385-${name}.tar.gz"; - sha256 = "10a9asjv6ja1xdjli2399dyka2rbia3qdm5bdpmcng6xdsbhx3ap"; - }; - - patches = [ ./0001-search-paths.patch ]; - - postPatch = '' - echo "Changing paths to archive utilities to the nix store"; - substituteInPlace "src/utility.cpp" \ - --replace "/usr/bin/unrar" "${unrar}/bin" \ - --replace "/usr/bin/unpar" "${par2cmdline}/bin" \ - --replace "/usr/bin/7z" "${p7zip}/bin" \ - --replace "/usr/bin/nice" "${coreutils}/bin/nice" - ''; - - buildInputs = - [ stdenv perl cmake qt4 gettext automoc4 openssl - kdelibs kdebase_workspace phonon - libX11 libXext libXft - ]; - - meta = { - description = "Binary news reader of KDE"; - broken = true; - }; -} diff --git a/pkgs/applications/networking/p2p/ktorrent/5.nix b/pkgs/applications/networking/p2p/ktorrent/5.nix deleted file mode 100644 index 7e47838c4f98..000000000000 --- a/pkgs/applications/networking/p2p/ktorrent/5.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, cmake -, ecm, qtbase, qtscript -, ki18n, kio, knotifications, knotifyconfig, kdoctools, kross, kcmutils, kdelibs4support -, libktorrent, boost, taglib -}: - -stdenv.mkDerivation rec { - name = pname + "-" + version; - - pname = "ktorrent"; - version = "5.0.1"; - - src = fetchurl { - url = http://download.kde.org/stable/ktorrent/5.0/ktorrent-5.0.1.tar.xz; - sha256 = "1rbr932djmn1la6vs2sy1zdf39fmla8vwzfn76h7csncbp5fw3yh"; - }; - - patches = - [ (fetchurl { - url = https://cgit.kde.org/ktorrent.git/patch/?id=f48acc22f0105ce6bac63294d248873ae231c6cc; - sha256 = "0jm4y35w2ypbjzf165rnjr224nq4w651ydnpd9zdn3inxh8r4s0v"; - }) - ]; - - nativeBuildInputs = [ kdoctools ecm ]; - - buildInputs = - [ cmake qtbase qtscript - ki18n kio knotifications knotifyconfig kross kcmutils kdelibs4support - libktorrent taglib - ]; - - enableParallelBuilding = true; - - meta = { - description = "KDE integrated BtTorrent client"; - homepage = https://www.kde.org/applications/internet/ktorrent/; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix index e53fda089111..7e47838c4f98 100644 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ b/pkgs/applications/networking/p2p/ktorrent/default.nix @@ -1,32 +1,41 @@ -{ stdenv, fetchurl, cmake, automoc4, libktorrent, taglib, kdepimlibs, boost -, gettext, kdebase_workspace, qt4, kdelibs, phonon }: +{ stdenv, fetchurl, cmake +, ecm, qtbase, qtscript +, ki18n, kio, knotifications, knotifyconfig, kdoctools, kross, kcmutils, kdelibs4support +, libktorrent, boost, taglib +}: stdenv.mkDerivation rec { name = pname + "-" + version; pname = "ktorrent"; - version = "4.3.1"; + version = "5.0.1"; src = fetchurl { - url = "${meta.homepage}/downloads/${version}/${name}.tar.bz2"; - sha256 = "66094f6833347afb0c49e332f0ec15ec48db652cbe66476840846ffd5ca0e4a1"; + url = http://download.kde.org/stable/ktorrent/5.0/ktorrent-5.0.1.tar.xz; + sha256 = "1rbr932djmn1la6vs2sy1zdf39fmla8vwzfn76h7csncbp5fw3yh"; }; - patches = [ ./find-workspace.diff ]; + patches = + [ (fetchurl { + url = https://cgit.kde.org/ktorrent.git/patch/?id=f48acc22f0105ce6bac63294d248873ae231c6cc; + sha256 = "0jm4y35w2ypbjzf165rnjr224nq4w651ydnpd9zdn3inxh8r4s0v"; + }) + ]; - KDEDIRS = libktorrent; + nativeBuildInputs = [ kdoctools ecm ]; buildInputs = - [ cmake qt4 kdelibs automoc4 phonon libktorrent boost taglib kdepimlibs - gettext kdebase_workspace + [ cmake qtbase qtscript + ki18n kio knotifications knotifyconfig kross kcmutils kdelibs4support + libktorrent taglib ]; enableParallelBuilding = true; meta = { description = "KDE integrated BtTorrent client"; - homepage = http://ktorrent.pwsp.net; - maintainers = with stdenv.lib.maintainers; [ sander urkud ]; - inherit (libktorrent.meta) platforms; + homepage = https://www.kde.org/applications/internet/ktorrent/; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/ktorrent/find-workspace.diff b/pkgs/applications/networking/p2p/ktorrent/find-workspace.diff deleted file mode 100644 index b07c1ca1b83c..000000000000 --- a/pkgs/applications/networking/p2p/ktorrent/find-workspace.diff +++ /dev/null @@ -1,29 +0,0 @@ -Fix finding kworkspace.h -diff --git a/plugins/shutdown/CMakeLists.txt b/plugins/shutdown/CMakeLists.txt -index 59e5470..5b932ff 100644 ---- a/plugins/shutdown/CMakeLists.txt -+++ b/plugins/shutdown/CMakeLists.txt -@@ -1,6 +1,8 @@ - set(KWORKSPACE_FOUND FALSE) --FIND_PATH(KWORKSPACE_INCLUDE_DIR NAMES kworkspace.h PATHS ${KDE4_INCLUDE_DIR}/kworkspace ${INCLUDE_INSTALL_DIR}/kworkspace.h) --FIND_LIBRARY(KWORKSPACE_LIBRARY NAMES kworkspace PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR}) -+FIND_PATH(KWORKSPACE_INCLUDE_DIR -+ NAMES kworkspace/kworkspace.h -+ HINTS ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR}) -+FIND_LIBRARY(KWORKSPACE_LIBRARY NAMES kworkspace HINTS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR}) - - if(KWORKSPACE_INCLUDE_DIR AND KWORKSPACE_LIBRARY) - set(KWORKSPACE_FOUND TRUE) -diff --git a/plugins/shutdown/shutdownplugin.cpp b/plugins/shutdown/shutdownplugin.cpp -index e233353..1efc20b 100644 ---- a/plugins/shutdown/shutdownplugin.cpp -+++ b/plugins/shutdown/shutdownplugin.cpp -@@ -19,7 +19,7 @@ - ***************************************************************************/ - #include <kjob.h> - #include <kgenericfactory.h> --#include <kworkspace.h> -+#include <kworkspace/kworkspace.h> - #include <ktoggleaction.h> - #include <kactioncollection.h> - #include <kmessagebox.h> diff --git a/pkgs/applications/office/basket/default.nix b/pkgs/applications/office/basket/default.nix deleted file mode 100644 index 2417e263d442..000000000000 --- a/pkgs/applications/office/basket/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig -, kdelibs, qimageblitz, kdepimlibs, gpgme -}: - -stdenv.mkDerivation rec { - name = "basket-1.81"; - - src = fetchurl { - url = "http://basket.kde.org/downloads/${name}.tar.bz2"; - sha256 = "10zxlgz96iwmqz30sw6f20pzjmnjvqhx7b5ihfwz47agyfdb98v0"; - }; - - KDEDIRS = kdepimlibs; - - buildInputs = [ kdelibs qimageblitz kdepimlibs gpgme ]; - - nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; - - meta = { - description = "A multi-purpose note-taking application"; - homepage = http://basket.kde.org/; - maintainers = [ stdenv.lib.maintainers.urkud ]; - inherit (kdelibs.meta) platforms; - }; -} diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 99107787493f..ad9cb9e5ff01 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs, lcms2, libpng, eigen +{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs4, lcms2, libpng, eigen , exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg , libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql , freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ automoc4 cmake perl pkgconfig makeWrapper ]; buildInputs = [ - kdelibs lcms2 libpng eigen + kdelibs4 lcms2 libpng eigen exiv2 boost sqlite icu vc shared_mime_info librevenge libodfgen libwpg libwpd poppler_qt4 ilmbase gsl qca2 marble libvisio libmysql postgresql freetds fftw glew libkdcraw opencolorio kdepimlibs @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ''; homepage = http://calligra.org; maintainers = with maintainers; [ urkud phreedom ebzzry ]; - inherit (kdelibs.meta) platforms; + inherit (kdelibs4.meta) platforms; license = licenses.gpl2; }; } diff --git a/pkgs/applications/office/eventlist/default.nix b/pkgs/applications/office/eventlist/default.nix deleted file mode 100644 index 395cb3d0a914..000000000000 --- a/pkgs/applications/office/eventlist/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig -, kdelibs, kdepimlibs, akonadi, boost }: - -stdenv.mkDerivation rec { - name = "plasmoid-eventlist-0.6.96"; - - src = fetchurl { - url = "http://kde-look.org/CONTENT/content-files/107779-plasmoid-eventlist-0.6.96.tar.bz2"; - sha256 = "26cc7bd1c465bf1379fd0ba1fa8592eaa62f2553734d1b283e17359103908eea"; - }; - - nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; - buildInputs = [ kdelibs kdepimlibs akonadi boost ]; - - meta = { - inherit (kdelibs.meta) platforms; - description = "KDE Plasmoid to show events and todos on the desktop"; - longDescription = '' - This is a plasmoid to show the events and todos from Akonadi resources (KOrganizer, Birthdays etc.). - With a google resource also Google calendar items can be shown. - Also possible with a CalDAV resource. - A facebook resource is also available. - - Incidences can be filtered, added, edited, deleted via context menu. - ''; - homepage = "http://kde-look.org/content/show.php/Eventlist?content=107779"; - license = stdenv.lib.licenses.gpl3Plus; - - }; -} diff --git a/pkgs/applications/office/kbibtex/default.nix b/pkgs/applications/office/kbibtex/default.nix deleted file mode 100644 index a18ba50cabe2..000000000000 --- a/pkgs/applications/office/kbibtex/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig -, kdelibs, libxslt, poppler_qt4 -}: - -stdenv.mkDerivation rec { - pname = "kbibtex"; - version = "0.4"; - name = "${pname}-${version}"; - - src = fetchurl { - url = "http://download.gna.org/${pname}/${version}/${name}.tar.bz2"; - sha256 = "1hq0az0dp96195z26wjfwj9ynd57pfv13f1xcl5vbsswcjfrczws"; - }; - - patchPhase = '' - sed -e '25i#include <QModelIndex>' -i src/gui/preferences/settingsabstractwidget.h - ''; - - buildInputs = [ kdelibs libxslt poppler_qt4 ]; - nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; -} diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix deleted file mode 100644 index f375da175044..000000000000 --- a/pkgs/applications/office/kmymoney/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext, pkgconfig -, shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical -, doxygen, aqbanking, gwenhywfar }: - -stdenv.mkDerivation rec { - name = "kmymoney-${version}"; - version = "4.8.0"; - - src = fetchurl { - url = "mirror://kde/stable/kmymoney/${version}/src/${name}.tar.xz"; - sha256 = "1hlayhcmdfayma4hchv2bfyg82ry0h74hg4095d959mg19qkb9n2"; - }; - - cmakeFlags = [ - "-DENABLE_KBANKING='true'" - ]; - - buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical - doxygen aqbanking gwenhywfar ]; - nativeBuildInputs = [ cmake automoc4 gettext shared_mime_info pkgconfig ]; - - KDEDIRS = libalkimia; - - patches = [ - ./qgpgme.patch - ./seqaccessmgrtest.patch - ]; - - meta = { - homepage = http://kmymoney2.sourceforge.net/; - description = "KDE personal money manager"; - inherit (kdelibs.meta) platforms maintainers; - }; -} diff --git a/pkgs/applications/office/kmymoney/qgpgme.patch b/pkgs/applications/office/kmymoney/qgpgme.patch deleted file mode 100644 index 59ed37edaf8e..000000000000 --- a/pkgs/applications/office/kmymoney/qgpgme.patch +++ /dev/null @@ -1,17 +0,0 @@ -KMymoney tries to find qgpgme before kdepimlibs. This is wrong because -FindQGpgme is installed by kdepimlibs, thus can be invisible until kdepimlibs -found. -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f6d7305..88bac67 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -59,8 +59,8 @@ else (WIN32) - find_package(Boost "1.33.1" COMPONENTS graph) - endif (WIN32) - # needed by libkgpgfile --find_package(QGpgme REQUIRED) - find_package(KdepimLibs REQUIRED) -+find_package(QGpgme REQUIRED) - find_package(SharedMimeInfo REQUIRED) - - add_definitions( ${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS}) diff --git a/pkgs/applications/office/kmymoney/seqaccessmgrtest.patch b/pkgs/applications/office/kmymoney/seqaccessmgrtest.patch deleted file mode 100644 index d01a433ba09a..000000000000 --- a/pkgs/applications/office/kmymoney/seqaccessmgrtest.patch +++ /dev/null @@ -1,26 +0,0 @@ -Fix tests for 32bit builds until we can bring these upstream -diff --git a/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp b/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp -index dcb4b4a..e803203 100644 ---- a/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp -+++ b/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp -@@ -58,13 +58,13 @@ void MyMoneySeqAccessMgrTest::testEmptyConstructor() - QCOMPARE(m->m_nextPayeeID, 0ul); - QCOMPARE(m->m_nextScheduleID, 0ul); - QCOMPARE(m->m_nextReportID, 0ul); -- QCOMPARE(m->m_institutionList.count(), 0ul); -- QCOMPARE(m->m_accountList.count(), 5ul); -- QCOMPARE(m->m_transactionList.count(), 0ul); -- QCOMPARE(m->m_transactionKeys.count(), 0ul); -- QCOMPARE(m->m_payeeList.count(), 0ul); -- QCOMPARE(m->m_tagList.count(), 0ul); -- QCOMPARE(m->m_scheduleList.count(), 0ul); -+ QCOMPARE(m->m_institutionList.count(), (size_t)0); -+ QCOMPARE(m->m_accountList.count(), (size_t)5); -+ QCOMPARE(m->m_transactionList.count(), (size_t)0); -+ QCOMPARE(m->m_transactionKeys.count(), (size_t)0); -+ QCOMPARE(m->m_payeeList.count(), (size_t)0); -+ QCOMPARE(m->m_tagList.count(), (size_t)0); -+ QCOMPARE(m->m_scheduleList.count(), (size_t)0); - - QCOMPARE(m->m_dirty, false); - QCOMPARE(m->m_creationDate, QDate::currentDate()); diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 989cf17e2761..f583660c6232 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -6,7 +6,7 @@ , openssl, gperf, cppunit, GConf, ORBit2, poppler , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr -, libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra +, libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio , fontsConf, pkgconfig, libzip, bluez5, libtool, maven , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf @@ -252,7 +252,7 @@ in stdenv.mkDerivation rec { libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper gdb ] - ++ lib.optional kdeIntegration kde4.kdelibs; + ++ lib.optional kdeIntegration kdelibs4; passthru = { inherit srcs; diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 26bb53c9b389..329b292da27c 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -6,7 +6,7 @@ , openssl, gperf, cppunit, GConf, ORBit2, poppler , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr -, libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra +, libwpg, dbus_glib, glibc, qt4, kdelibs4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio , fontsConf, pkgconfig, libzip, bluez5, libtool, maven , libatomic_ops, graphite2, harfbuzz, libodfgen @@ -247,7 +247,7 @@ in stdenv.mkDerivation rec { librevenge libe-book libmwaw glm glew ncurses libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper ] - ++ lib.optional kdeIntegration kde4.kdelibs; + ++ lib.optional kdeIntegration kdelibs4; passthru = { inherit srcs; diff --git a/pkgs/applications/office/skrooge/2.nix b/pkgs/applications/office/skrooge/2.nix deleted file mode 100644 index 42cc9b0c6eb1..000000000000 --- a/pkgs/applications/office/skrooge/2.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, cmake, ecm, makeQtWrapper, qtwebkit, qtscript, grantlee, - kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin, - kiconthemes, knewstuff, sqlcipher, qca-qt5, kdelibs4support, kactivities, - knotifyconfig, krunner, libofx }: - -stdenv.mkDerivation rec { - name = "skrooge-${version}"; - version = "2.7.0"; - - src = fetchurl { - url = "http://download.kde.org/stable/skrooge/${name}.tar.xz"; - sha256 = "1xrh9nal122rzlv4m0x8qah6zpqb6891al3351piarpk2xgjgj4x"; - }; - - nativeBuildInputs = [ cmake ecm makeQtWrapper ]; - - buildInputs = [ qtwebkit qtscript grantlee kxmlgui kwallet kparts kdoctools - kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5 - kdelibs4support kactivities knotifyconfig krunner libofx - ]; - - enableParallelBuilding = true; - - postInstall = '' - wrapQtProgram "$out/bin/skrooge" - wrapQtProgram "$out/bin/skroogeconvert" - ''; - - meta = with stdenv.lib; { - description = "A personal finances manager, powered by KDE"; - license = with licenses; [ gpl3 ]; - maintainers = with maintainers; [ joko ]; - homepage = https://skrooge.org/; - }; -} diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index b0d7f1399376..42cc9b0c6eb1 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -1,22 +1,35 @@ -{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig, shared_mime_info -, libxslt, kdelibs, kdepimlibs, grantlee, qjson, qca2, libofx, sqlite, boost }: +{ stdenv, fetchurl, cmake, ecm, makeQtWrapper, qtwebkit, qtscript, grantlee, + kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin, + kiconthemes, knewstuff, sqlcipher, qca-qt5, kdelibs4support, kactivities, + knotifyconfig, krunner, libofx }: stdenv.mkDerivation rec { - name = "skrooge-1.12.5"; + name = "skrooge-${version}"; + version = "2.7.0"; src = fetchurl { url = "http://download.kde.org/stable/skrooge/${name}.tar.xz"; - sha256 = "1mnkm0367knh0a65gifr20p42ql9zndw7d6kmbvfshvpfsmghl40"; + sha256 = "1xrh9nal122rzlv4m0x8qah6zpqb6891al3351piarpk2xgjgj4x"; }; - buildInputs = [ libxslt kdelibs kdepimlibs grantlee qjson qca2 libofx sqlite boost ]; + nativeBuildInputs = [ cmake ecm makeQtWrapper ]; - nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig shared_mime_info ]; + buildInputs = [ qtwebkit qtscript grantlee kxmlgui kwallet kparts kdoctools + kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5 + kdelibs4support kactivities knotifyconfig krunner libofx + ]; - meta = { - inherit (kdelibs.meta) platforms; - description = "A personal finance manager for KDE"; - maintainers = [ stdenv.lib.maintainers.urkud ]; - license = stdenv.lib.licenses.gpl3; + enableParallelBuilding = true; + + postInstall = '' + wrapQtProgram "$out/bin/skrooge" + wrapQtProgram "$out/bin/skroogeconvert" + ''; + + meta = with stdenv.lib; { + description = "A personal finances manager, powered by KDE"; + license = with licenses; [ gpl3 ]; + maintainers = with maintainers; [ joko ]; + homepage = https://skrooge.org/; }; } diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix index a16ab1baef4e..71f38bb8d3cc 100644 --- a/pkgs/applications/office/zanshin/default.nix +++ b/pkgs/applications/office/zanshin/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, automoc4, cmake, perl, pkgconfig -, kdelibs, kdepimlibs, boost, baloo }: +, kdelibs4, kdepimlibs, boost, baloo }: stdenv.mkDerivation rec { name = "zanshin-0.3.1"; @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; - buildInputs = [ kdelibs kdepimlibs boost baloo ]; + buildInputs = [ kdelibs4 kdepimlibs boost baloo ]; meta = { description = "GTD for KDE"; maintainers = [ stdenv.lib.maintainers.urkud ]; - inherit (kdelibs.meta) platforms; + inherit (kdelibs4.meta) platforms; }; } diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix index e8b3bcb16a26..6cefb156d1df 100644 --- a/pkgs/applications/science/robotics/gazebo/default.nix +++ b/pkgs/applications/science/robotics/gazebo/default.nix @@ -5,7 +5,7 @@ , pythonPackages, utillinux # these deps are hidden; cmake doesn't catch them - , gazeboSimulator, sdformat ? gazeboSimulator.sdformat, curl, tinyxml, kde4, x11 + , gazeboSimulator, sdformat ? gazeboSimulator.sdformat, curl, tinyxml, qt4, x11 , withIgnitionTransport ? true , libav, withLibAvSupport ? true , openal, withAudioSupport ? false @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { curl tinyxml x11 - kde4.qt4 + qt4 ] ++ optional stdenv.isLinux utillinux # on Linux needs uuid/uuid.h ++ optional withDocs doxygen ++ optional withLibAvSupport libav #TODO: package rubygem-ronn and put it here diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix deleted file mode 100644 index d4c67776b529..000000000000 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig -, apr, aprutil, subversion, db, kdelibs, expat -}: - -# the homepage mentions this is the final release. -# from now on, kdesvn will be part of the official kde software distribution -stdenv.mkDerivation rec { - name = "kdesvn-1.6.0"; - - src = fetchurl rec { - url = "http://pkgs.fedoraproject.org/repo/pkgs/kdesvn/${name}.tar.bz2/7e6adc98ff4777a06d5752d3f2b58fa3/${name}.tar.bz2"; - sha256 = "15hg6xyx5rqldfhi1yhq5ss15y6crm2is3zqm680z0bndcj6ys05"; - }; - - prePatch = '' - sed -i -e "s|/usr|${subversion.dev}|g" src/svnqt/cmakemodules/FindSubversion.cmake - ''; - - buildInputs = [ apr aprutil subversion db kdelibs expat ]; - - nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; - - meta = { - description = "KDE SVN front-end"; - license = "GPL"; - homepage = http://kdesvn.alwins-world.de; - maintainers = [ stdenv.lib.maintainers.sander ]; - inherit (kdelibs.meta) platforms; - }; -} diff --git a/pkgs/applications/video/bangarang/default.nix b/pkgs/applications/video/bangarang/default.nix deleted file mode 100644 index ceece8879dcb..000000000000 --- a/pkgs/applications/video/bangarang/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig -, kdelibs, phonon, soprano, shared_desktop_ontologies -, kdemultimedia, taglib, glibc, gettext -}: - -stdenv.mkDerivation rec { - name = "bangarang-2.1"; - - src = fetchurl { - url = "http://bangarangissuetracking.googlecode.com/files/${name}.tar.gz"; - sha256 = "1g4pap79k8qaqi0py34xqvisxln1nc5hbvph692ah3af06n6cly1"; - }; - - buildInputs = [ - kdelibs phonon soprano shared_desktop_ontologies kdemultimedia - taglib gettext - ]; - - nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; - - patches = [ ./gcc-4.7.patch ]; - - meta = with stdenv.lib; { - description = "A media player for KDE based on Nepomuk and Phonon"; - longDescription = '' - Bangarang offers a minimalistic media center user interface, - media collection management, playlists and statistics. - ''; - homepage = http://bangarangkde.wordpress.com/; - license = stdenv.lib.licenses.gpl3; - maintainers = [ maintainers.phreedom maintainers.urkud ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/video/bangarang/gcc-4.7.patch b/pkgs/applications/video/bangarang/gcc-4.7.patch deleted file mode 100644 index d4f650b9caf5..000000000000 --- a/pkgs/applications/video/bangarang/gcc-4.7.patch +++ /dev/null @@ -1,45 +0,0 @@ -commit b893fcdb7ddfc8c59fd29a29b7265a713c3dbab1 -Author: Alex Fiestas <afiestas@kde.org> -Date: Thu Mar 29 10:09:22 2012 +0200 - - Build fix: Add unistd.h include since sleep is defined there - -diff --git a/src/platform/infofetchers/lastfminfofetcher.cpp b/src/platform/infofetchers/lastfminfofetcher.cpp -index 0c49d69..fcc4cd3 100644 ---- a/src/platform/infofetchers/lastfminfofetcher.cpp -+++ b/src/platform/infofetchers/lastfminfofetcher.cpp -@@ -32,6 +32,8 @@ - #include <QFile> - #include <QTextEdit> - -+#include <unistd.h> -+ - LastfmInfoFetcher::LastfmInfoFetcher(QObject *parent) : - InfoFetcher(parent) - { -diff --git a/src/platform/infofetchers/tmdbinfofetcher.cpp b/src/platform/infofetchers/tmdbinfofetcher.cpp -index 7801644..3c01960 100644 ---- a/src/platform/infofetchers/tmdbinfofetcher.cpp -+++ b/src/platform/infofetchers/tmdbinfofetcher.cpp -@@ -30,6 +30,8 @@ - #include <QDomDocument> - #include <QFile> - -+#include <unistd.h> -+ - TMDBInfoFetcher::TMDBInfoFetcher(QObject *parent) : - InfoFetcher(parent) - { -diff --git a/src/platform/infofetchers/tvdbinfofetcher.cpp b/src/platform/infofetchers/tvdbinfofetcher.cpp -index ff351b0..670ed18 100644 ---- a/src/platform/infofetchers/tvdbinfofetcher.cpp -+++ b/src/platform/infofetchers/tvdbinfofetcher.cpp -@@ -30,6 +30,8 @@ - #include <QDomDocument> - #include <QFile> - -+#include <unistd.h> -+ - TVDBInfoFetcher::TVDBInfoFetcher(QObject *parent) : - InfoFetcher(parent) - { diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix deleted file mode 100644 index 3da5180352c6..000000000000 --- a/pkgs/applications/video/kdenlive/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, frei0r, lib, cmake, qt4, perl, kdelibs, automoc4 -, phonon , makeWrapper, mlt, gettext , qimageblitz, qjson -, shared_mime_info, soprano, pkgconfig, shared_desktop_ontologies -, libv4l, oxygen_icons -}: - -stdenv.mkDerivation rec { - name = "kdenlive-${version}"; - version = "0.9.10"; - - src = fetchurl { - url = "mirror://kde/stable/kdenlive/${version}/src/${name}.tar.bz2"; - sha256 = "0qxpxnfbr8g6xq0h32skgqqi2xylrv2bnmyx5x1cws9y2wwxp3zn"; - }; - - buildInputs = [ - frei0r kdelibs libv4l mlt phonon qimageblitz qjson qt4 - shared_desktop_ontologies soprano - ]; - - nativeBuildInputs = [ - automoc4 cmake gettext makeWrapper perl pkgconfig shared_mime_info - ]; - - propagatedUserEnvPkgs = [ oxygen_icons ]; - - enableParallelBuilding = true; - - postInstall = '' - wrapProgram $out/bin/kdenlive --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 - wrapProgram $out/bin/kdenlive_render --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 - ''; - - meta = { - description = "Free and open source video editor"; - license = stdenv.lib.licenses.gpl2Plus; - homepage = http://www.kdenlive.org/; - maintainers = with stdenv.lib.maintainers; [ goibhniu viric ]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix index cbd0347078ef..59b9893ded14 100644 --- a/pkgs/applications/video/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , automoc4, cmake, gettext, makeWrapper, perl, pkgconfig -, kdelibs, cairo, dbus_glib, mplayer +, kdelibs4, cairo, dbus_glib, mplayer }: stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "1yvbkb1hh5y7fqfvixjf2rryzm0fm0fpkx4lmvhi7k7d0v4wpgky"; }; - buildInputs = [ kdelibs cairo dbus_glib ]; + buildInputs = [ kdelibs4 cairo dbus_glib ]; nativeBuildInputs = [ automoc4 cmake gettext makeWrapper perl pkgconfig ]; diff --git a/pkgs/build-support/kdewrapper/default.nix b/pkgs/build-support/kdewrapper/default.nix deleted file mode 100644 index 64dfd7d0ca6b..000000000000 --- a/pkgs/build-support/kdewrapper/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, kde4, shared_mime_info, extraLibs ? [] }: - -/* Supply a KDE program, and it will have the necessary KDE vars to - get icons, mime types, etc. working. - For example: - - packageOverrides = pkgs : { - kdenliveWrapped = kde4.wrapper kde4.kdenlive; - }; - */ -program: - -let - libs = with kde4; [ kdelibs kde_runtime oxygen_icons shared_mime_info ] - ++ extraLibs; -in -stdenv.mkDerivation { - name = program.name + "-wrapped"; - - inherit libs; - - buildCommand = '' - mkdir -p $out/bin - - KDEDIRS=${program} - QT_PLUGIN_PATH=${program}/lib/qt4/plugins:${program}/lib/kde4/plugins - for a in $libs; do - KDEDIRS=$a''${KDEDIRS:+:}$KDEDIRS - QT_PLUGIN_PATH=$a/lib/qt4/plugins:$a/lib/kde4/plugins''${QT_PLUGIN_PATH:+:}$QT_PLUGIN_PATH - done - for a in ${program}/bin/*; do - PROG=$out/bin/`basename $a` - cat > $PROG << END - #!/bin/sh - export KDEDIRS=$KDEDIRS\''${KDEDIRS:+:}\$KDEDIRS - export QT_PLUGIN_PATH=$QT_PLUGIN_PATH\''${QT_PLUGIN_PATH:+:}\$QT_PLUGIN_PATH - exec $a "\$@" - END - chmod +x $PROG - done - ''; - - preferLocalBuild = true; -} diff --git a/pkgs/desktops/kde-4.14/applications/kate.nix b/pkgs/desktops/kde-4.14/applications/kate.nix deleted file mode 100644 index ddeb89063e50..000000000000 --- a/pkgs/desktops/kde-4.14/applications/kate.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, kde, kdelibs, kactivities, qjson, pythonPackages, pykde4}: - -kde { - - buildInputs = [ kdelibs kactivities qjson pythonPackages.pyqt4 pythonPackages.python pykde4 ]; - - meta = { - description = "Kate, the KDE Advanced Text Editor, as well as KWrite"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/applications/konsole.nix b/pkgs/desktops/kde-4.14/applications/konsole.nix deleted file mode 100644 index bd4e9e58cd05..000000000000 --- a/pkgs/desktops/kde-4.14/applications/konsole.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, kde, kdelibs, kde_baseapps }: - -kde { - - buildInputs = [ kdelibs kde_baseapps ]; - - meta = { - description = "Konsole, the KDE terminal emulator"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/default.nix b/pkgs/desktops/kde-4.14/default.nix index f11a139aec72..02cd509537d1 100644 --- a/pkgs/desktops/kde-4.14/default.nix +++ b/pkgs/desktops/kde-4.14/default.nix @@ -25,20 +25,10 @@ in kde.modules // kde.individual // { - inherit (kde) manifest modules individual splittedModuleList; - - inherit kdelibs; - akonadi = callPackage ./support/akonadi { }; - qt4 = qt48; - - kdebase_workspace = kde.modules.kde_workspace; - inherit release; - full = stdenv.lib.attrValues kde.modules; - l10n = callPackage ./l10n { inherit release branch; inherit (kde.manifest) stable; diff --git a/pkgs/desktops/kde-4.14/files/kde-wallpapers-buildsystem.patch b/pkgs/desktops/kde-4.14/files/kde-wallpapers-buildsystem.patch deleted file mode 100644 index 378cdb646940..000000000000 --- a/pkgs/desktops/kde-4.14/files/kde-wallpapers-buildsystem.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3d3e247..f78db67 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,10 @@ --find_package(KDE4 REQUIRED) --include(KDE4Defaults) -+project(kde-wallpapers NONE) -+if( WALLPAPER_INSTALL_DIR ) -+ message(STATUS "Installing wallpapers to user-supplied directory ${WALLPAPER_INSTALL_DIR}") -+else() -+ find_package(KDE4 REQUIRED) -+ include(KDE4Defaults) -+endif() - - install(DIRECTORY Air DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE) - diff --git a/pkgs/desktops/kde-4.14/files/rocs-0001-duplicate-add_test.patch b/pkgs/desktops/kde-4.14/files/rocs-0001-duplicate-add_test.patch deleted file mode 100644 index 4127b16d5f6d..000000000000 --- a/pkgs/desktops/kde-4.14/files/rocs-0001-duplicate-add_test.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 93081f817f20bbc26b55e1b37b22d60535d153f7 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Thu, 10 Sep 2015 18:41:57 -0500 -Subject: [PATCH] duplicate add_test - ---- - RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt | 1 - - RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt | 1 - - RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt | 1 - - RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt | 1 - - RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt | 1 - - 5 files changed, 5 deletions(-) - -diff --git a/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt -index 32a2504..4fbb838 100644 ---- a/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt -+++ b/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt -@@ -33,4 +33,3 @@ target_link_libraries(TestDotFileFormatPlugin - ${QT_QTTEST_LIBRARY} - ${KDE4_KDECORE_LIBS} - ) --add_test(TestDotFileFormatPlugin TestDotFileFormatPlugin) -diff --git a/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt -index 615004c..6383bd8 100644 ---- a/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt -+++ b/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt -@@ -32,4 +32,3 @@ target_link_libraries(TestGmlFileFormatPlugin - ${QT_QTTEST_LIBRARY} - ${KDE4_KDECORE_LIBS} - ) --add_test(TestGmlFileFormatPlugin TestGmlFileFormatPlugin) -diff --git a/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt -index f9cdbfa..842d14b 100644 ---- a/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt -+++ b/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt -@@ -30,4 +30,3 @@ target_link_libraries(TestKmlFileFormatPlugin - ${QT_QTTEST_LIBRARY} - ${KDE4_KDECORE_LIBS} - ) --add_test(TestKmlFileFormatPlugin TestKmlFileFormatPlugin) -diff --git a/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt -index 33c0da8..70cab8d 100644 ---- a/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt -+++ b/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt -@@ -35,4 +35,3 @@ target_link_libraries(TestTgfFileFormatPlugin - ${QT_QTTEST_LIBRARY} - ${KDE4_KDECORE_LIBS} - ) --add_test(TestTgfFileFormatPlugin TestTgfFileFormatPlugin) -diff --git a/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt -index b52736e..58ee40e 100644 ---- a/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt -+++ b/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt -@@ -29,5 +29,4 @@ target_link_libraries(TestTikzFileFormatPlugin - ${QT_QTTEST_LIBRARY} - ${KDE4_KDECORE_LIBS} - ) --add_test(TestTikzFileFormatPlugin TestTikzFileFormatPlugin) - --- -2.5.0 - diff --git a/pkgs/desktops/kde-4.14/kactivities.nix b/pkgs/desktops/kde-4.14/kactivities.nix index a1f9d0d81719..dd14e0429ddb 100644 --- a/pkgs/desktops/kde-4.14/kactivities.nix +++ b/pkgs/desktops/kde-4.14/kactivities.nix @@ -1,4 +1,4 @@ -{ fetchurl, kde, kdelibs, nepomuk_core }: +{ fetchurl, kde, kdelibs }: kde { @@ -13,7 +13,7 @@ kde { setOutputFlags = false; - propagatedBuildInputs = [ kdelibs nepomuk_core ]; + propagatedBuildInputs = [ kdelibs ]; meta = { description = "KDE activities library and daemon"; diff --git a/pkgs/desktops/kde-4.14/kde-base-artwork.nix b/pkgs/desktops/kde-4.14/kde-base-artwork.nix deleted file mode 100644 index 3f416cebddc4..000000000000 --- a/pkgs/desktops/kde-4.14/kde-base-artwork.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kde, kdelibs }: - -kde { - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "0mrd3w7rhsj0v92c8rh9zjxyifq7wyvwszksf2gyn53dzd06blk8"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE Base artwork"; - license = "GPL"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix index 98fab7d25592..df211f491993 100644 --- a/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix +++ b/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix @@ -1,5 +1,4 @@ -{ stdenv, kde, kdelibs, html-tidy, kactivities -, nepomuk_core, nepomuk_widgets, libXt }: +{ stdenv, kde, kdelibs, html-tidy, kactivities, libXt }: kde { postPatch = '' @@ -7,7 +6,7 @@ kde { --replace buffio.h tidybuffio.h ''; - buildInputs = [ kdelibs nepomuk_core nepomuk_widgets html-tidy kactivities libXt ]; + buildInputs = [ kdelibs html-tidy kactivities libXt ]; meta = { description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser"; diff --git a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix index a78041c5a0cc..a05e6d0c62a2 100644 --- a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix +++ b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix @@ -1,380 +1,48 @@ {stable=true; hashes=builtins.listToAttrs[ - {name="amor";value="1n9qhy7pcprhh7a5v5i9xi5pr3a3lbg08j315kbahn89py2wqk6x";} - {name="analitza";value="08p4rky4q4c1r5mkw087s31k38xvc8k50fyahf6y0bkc03v7q8h0";} - {name="ark";value="1p5q96i7hxp80c3hzxaqfixc3rn16cdnhhhjdaqz7k5zkgmgfbnb";} - {name="artikulate";value="1spb3qwf62agc76vnji7hgm1xsahb7i2fg818gmqwd9ndd4rf0fk";} - {name="audiocd-kio";value="0572hwlzn4l53d3xi2w20pgdf6wsyankr49q4522ckfjw9zh2p33";} {name="baloo";value="0p3awsrc20q79kq04x0vjz84acxz6gjm9jc7j2al4kybkyzx5p4y";} - {name="baloo-widgets";value="1lxwm8cb1f1dy91zr1d54alw0f67d30kixhr7hnbpqlanfw44sbv";} - {name="blinken";value="0zmfvj64xzgi9mmdx92csknm6nrgq57z458dmqr82glvdq6sy53w";} - {name="bomber";value="09bwp2fnyhi2jq6j36ssvcd02gxihd162b14hj4h76p50q9142ly";} - {name="bovo";value="0pflfpnxni01nfmljrb356bvb9sq7xg1yx7ylli8ws591s1wjv2f";} - {name="cantor";value="1qb58pnrpn23qr94j1nrdyj87yxc6gr9drra76mq583acra19j4g";} - {name="cervisia";value="1dgg0m8l2vb1ypkzq2lvp8d5faxn005z9fylf4pg6yczgj51y2m0";} - {name="dolphin-plugins";value="1vb5q9xwxplwxwfs57fqy1bi2hsq96cy1z705lbyiy1pq1g0xw5p";} - {name="dragon";value="195hv0l3w6n32qghdbqj3jzl4833lkbw90q53rnay56ia3azd7nk";} - {name="ffmpegthumbs";value="1waj02snh48qk8h021p1agy9pifpb7k7848ni9cyr1q76xmqbw3r";} - {name="filelight";value="16pp16zdvm8l6aaywj0cvvmpc1fgwr1ik1nf9s3vnj6pnqw91mc1";} - {name="granatier";value="08fs7nvhgg33cr54v2ib5p64lc9kmzshl12swsa88sp1fzakpdlj";} - {name="gwenview";value="1817nhd3qwghimbh4v57nxpbk9y2z9gh33i9s7rr190fqa5x2ci0";} - {name="jovie";value="06cvnycbab5w1vgws6fyfbpdnps63mvss2gnsv6ig1gm18pq8kh4";} - {name="juk";value="02dv0v34dbac9wpfj0p1kh438b380025qg0mpnhdisw9ng4igx83";} - {name="kaccessible";value="0blkyalm45c1q670wp9jn6mmqq4igw16hlsa39bv1dj82m5f0bkb";} - {name="kajongg";value="1f4fv1s1x2bg9ghf317br0kl6lgj9nacmck6fv1g3r14j60z5sfn";} - {name="kalgebra";value="0zgnppmnm2g0anq4yldlyd4bncjabr72b66h4s9ns6wd7kk9z6rs";} - {name="kalzium";value="1r8phdshq9whcglb7nyjcg8qjqnqya8rj1rm91mwax18jin0i3ab";} - {name="kamera";value="09n11d1hvl6xxfsp9j72q6ja103vda54gmrl7lqscnp5nvlfl2vg";} - {name="kanagram";value="0ns95365rdzx4v7akrsnbz1vgyl10d5h4jnavg1x08yrq7sm3rcm";} - {name="kapman";value="1c27dlpdnnmvxqwsr5359ixl386z54ijs5ysb5vd7f0nw980kjk0";} - {name="kapptemplate";value="089znigfd0c4gb318qjbxhyk3gc6j9z4vb4lw76g3nwjkk52s35s";} - {name="kate";value="0zbhgrhpa3f9zaf8a9b0s69p05m17rg6harvmyfbb9kgqgi4lgai";} - {name="katomic";value="1j3y0zfwcms2wfv2v3jpn6lisl2qw5zhvwswhyc2k44wq934vwq6";} - {name="kblackbox";value="1vlc37il59xh6k4zcap7cs25b1r70cbzi0b6jybpwhxrq2zh1zmz";} - {name="kblocks";value="16k8j3h8dvjz2yqdb22dkb9z6mi3k28c4wkhpa1l5q151kb8q6ba";} - {name="kbounce";value="16g2f6vvax74gqz3jn1b9rfwcdaia7dphnwg37d03ayflp2s7mji";} - {name="kbreakout";value="1011gcbajlk4h5z16nyr8xxkqz5k86vwgn1h5k4fqqpbl2g9aryr";} - {name="kbruch";value="0jrd0hqqiaghyhj1rw66j0skqs1f7p21czx3adiy2v50ni70i84z";} - {name="kcachegrind";value="0954zvzzhfc76msbs7pc10c9nqd4ganqwqdyn051n4204np1fyd6";} - {name="kcalc";value="03px8j0ga6bbla6bxbj3ahcw4jxwb4kkqhls0rxldbfkjwz2q1wz";} - {name="kcharselect";value="0js5wxdjmzg2yq83m0kpil9mdjwb1bschh8d9hsk044327i9wmz7";} - {name="kcolorchooser";value="1z5snm4vxn6whdhxh64kd18bvl58i65qb4p4xdznrc0gyrgnl92a";} - {name="kcron";value="1d685808rya0fjysn2smh0d1p6xqcg7a1r3ah54hnj58y4r3rxyc";} - {name="kdeartwork";value="1x0fz21xi54gxz4dkk7qhpv9a5j3nc0crgvygpq32jrkvv5ygp4k";} {name="kde-baseapps";value="1nz6mm257rd916dklnbrix4r25scylvjil99b1djb35blx1aynqj";} - {name="kde-base-artwork";value="14l83fd6drwpl9j4v876afp3k7na3dirpjwh03c1a7lcn27grzkn";} - {name="kde-dev-scripts";value="17zw6ckbvq5iqykc3ijdnp7j0nh4k06jgqwfsrnqnvp5fqqcf1vn";} - {name="kde-dev-utils";value="16kdr5i48jlflzdv1y5n2xca2kws5whwlymliqdqy7wlcgy0lh7q";} - {name="kdegraphics-mobipocket";value="0m41s8scy5hym6mk0kfmjj54dc3yxahsdrliaadixhp0fx02cx0v";} - {name="kdegraphics-strigi-analyzer";value="08d2vrghwqkw4mg4vmgsynfnhygxpavxnscvs3z70hdff7i001f0";} - {name="kdegraphics-thumbnailers";value="1lhb7m298mbz7dk50savqdz3p6lkbscn0gi6bqapji24464vlb8k";} - {name="kdenetwork-filesharing";value="0a8vw6jj0kz0lq96mj3mfzpdvb6xpw8xvccwxhjqp164bzqdz66d";} - {name="kdenetwork-strigi-analyzers";value="14px6ddp8flqd40bww0sl71jmn5bfqm9j3v6rqm63ii7z87qk6xl";} - {name="kdepim";value="0i7r68r5nzflmpdkkzpj5xc3fwxg5903g1fj5g1yn79v5zx1gzd3";} {name="kdepimlibs";value="1mv8k0wr0wr0hnlb1al50nmz8d77vbm73p2hhipipgliq6zb3vb5";} - {name="kdepim-runtime";value="03xmm9c5whr96bwrdrdmaq8w53qg251g0kd479g02x3br20yi3rd";} - {name="kdeplasma-addons";value="094gj8z1xx4d5vlkq8izifpgvh6sfq36bh08n8ylfa976qq8xm8j";} - {name="kde-runtime";value="01c6pjsq4xp75yma8wbfpg92lrvvppp9ighlxvy7z2afkd8lx9vq";} - {name="kdesdk-kioslaves";value="0k0ff1nq10z0gajr3rnrbhm1rml42d2fi9ahwxdjnxyaav31ml24";} - {name="kdesdk-strigi-analyzers";value="12r17q7mg74prir52h80prc61bn5rq1031cbp3xswh658srf1lg0";} - {name="kdesdk-thumbnailers";value="1kmdpb52kg04smgp9v5a51bjjrw6fsh347ajnxhr8ygg7d8zw763";} - {name="kde-wallpapers";value="05jb5ry6ziz64lqxrmi7c53n8j5hpgrz3lii4y1wnr204342ln6k";} - {name="kdewebdev";value="0sclb72i6nbrsz4a5jlxf7mgngdn7wbd669fqa7xw6axrsjj1cgn";} {name="kde-workspace";value="00bf708i0vzl47dgcr8mp61n7k0xjzqnlb8j1smliy5bydiaa86g";} - {name="kdf";value="0y5d6d6wl5ycmcswrkgwc301jbj77jnb46sgl38i9q4nf7b3ham0";} - {name="kdiamond";value="0z8c07vx3k466ysri1syka0wm0bkz581kb72d5sns86np0rg0wmp";} {name="kfilemetadata";value="0wak1nphnphcam8r6pba7m2gld4w04dkk8qn23myjammv3myc59i";} - {name="kfloppy";value="02sv0k6cqvd9zf7hwsjxgb6l3jawx5fkg1siffbb62cgp49y8fw0";} - {name="kfourinline";value="0zhvpbgmk89cn7pjzgdzc4kah8rkjj3w97yym205phc8fc36nwa4";} - {name="kgamma";value="1cpm1d0sr3zphkqpfg11farqal2h2hl6gcdnf8p1b10np1b8rxwk";} - {name="kgeography";value="125772x1kbh136ymja903w2k7vgahs2d1nw471nr8fx511pnxcj4";} - {name="kget";value="1v1j5sfsym1sz8w6ll23il0n4qq74sjx9c9ij29zhdwxy21xasv9";} - {name="kgoldrunner";value="1mc93hwl1diygjlpalf2wdzhdnhcjq1mj9srlxhr5f1w0687pzar";} - {name="kgpg";value="0ihc5pp1mxsa67ynrvf2mpxwhyni6lkcdarj1xmvpcf56nlkfzdw";} - {name="khangman";value="0wddflgsfslbhdpkl39qipnc2xx6b23ci1gr19ipyiyif8d74zix";} - {name="kig";value="1kp3rhsfprp9c9f0wp264x9d6n454ff26ysfnli9gl5l2imxhw9f";} - {name="kigo";value="1gdsr31ybc07bkcyfrrm4fz081l3l5h5rv46ld0f6rfmxm3xv01j";} - {name="killbots";value="1d31pxvjls5a9m521a9n7rynl317585ald1nn4bpk2f138475d12";} - {name="kimono";value="17n1nx66kqcc2wfp6ql7xpn8lq9y3b6djf6y1n3ajvyjh8m357jf";} - {name="kiriki";value="00iis3vx95nlcarysy9mrbz4jnw4rbxgmjpy48z85imdd7yydd8x";} - {name="kiten";value="17n6q1kan8dlxqhnhk73nzn4jg39yw1hh88vsndswmx1s4k68x7r";} - {name="kjumpingcube";value="0p9kswv2wnxqgmlvwbcwxrb27b0h6by1zx91k5vmv16qm789gfk9";} - {name="klettres";value="01vf6cdiafncv0n35cp5v44azxkjjzn1rp1r8rw05vlmh2296p0l";} - {name="klickety";value="0c156fkchcpfybmvc3qkvdqizc62b758drkdqc8pawal8766ff27";} - {name="klines";value="1w8k18azfqsb0q90aijn7xfkkfrbnrnfwn6w66wc8xn2b6hibahl";} - {name="kmag";value="091h7vb3wcp5zg06mp240a2vdhj18xqw40i25djkl7a861xxhpb8";} - {name="kmahjongg";value="0qb933kjv205narrkgr83ha516pldpfxi65l8yhm7801nhljhpsg";} - {name="kmines";value="103lzgr7p2ic29afn8imk6mh7ab0pfpcrdwlsg21zkvrrbrcaq6k";} - {name="kmix";value="153fif25m7w94g8g20ahg5fjppkf3bi8rn4njq1zl1g0bsnrgpfp";} - {name="kmousetool";value="1z62h71mcxdrp4y2dl497x89295m6mlilaqnvp9ijpw6fm4b9czd";} - {name="kmouth";value="06n6srd6011bk29w5xnqihvs6pbhmg0sf5h7mwfwp4szvm167hc4";} - {name="kmplot";value="1xajighandffidp85rjjch4si0gb3mfjks3yh5i8sig8j4797b86";} - {name="knavalbattle";value="1fmh6qds3ql5w3nsw6zk18ia0z4immpwj8sl35qq2kkx1g0hbv0c";} - {name="knetwalk";value="0h17ck55fdwipvsdqfdhmn612jb1nrq6vkj0g9i3qchvw9qz0hcs";} - {name="kolf";value="006h7iqwn55bjrgsc9p6316lgvxvda0kvcdxxfd4sqg2ain64h7q";} - {name="kollision";value="1hc07r3z4w8gqby0pyb5m1ylp8izmvx0ib3dlpmh2jd5khp0qyhj";} - {name="kolourpaint";value="0kf6wjxcd80mc4hxb4nhpksxj0bm9339i835iwpsbjfn8xs1s55h";} - {name="kompare";value="0zhpw7kz1c9hcmqfhnvsg39xw4zhi36q39bgifcbyfvjs0ymbvi4";} - {name="konquest";value="125ciy00h77y7byrlnqv0zhw3pxp9a5i5clz12dlc1z251z3l588";} - {name="konsole";value="0mgi0fw5sc216cy8j45g4zd733d02l2d6z4wjcxqm7rh61lhwx9g";} - {name="kopete";value="0i9qq7k19vyss1k22ppr6xq3y3bb6mndg8b5323f0cvjlpgcc8xs";} - {name="korundum";value="0zapd60frhq652p1xnpaj680vpaqr595dqbhha552c4dfabvgv4j";} - {name="kpat";value="0kfvhkwamrfllgmd8yl6p3xlc0jmivxy0rsdrxpabvpb0vcqh9ml";} - {name="kppp";value="01pj8q1m3gwww6wvgwnd24lgbyvzfm6gskv2c802lzjcj7p9218m";} - {name="kqtquickcharts";value="1vml9scxva9gr8bb6rkxl8gaaghx3lyvwcwcifq5hz0154q875d5";} - {name="krdc";value="07p67z8gh9xnnr71kjy8g6ki07w22c767qbrk2fzar2zvc8dgnw6";} - {name="kremotecontrol";value="06nkg9chkimmzs1ww0sbxglssibby3157jkw6bncg661yfbsd48r";} - {name="kreversi";value="1pjjw3vim3pjazcxggs9axglkl7l1g0fpzqgjdxxn0p8vfh84jgg";} - {name="krfb";value="08qpw93slflx7whp9jbq1bsq1ikm0pgdvys11idvhmzl2lg86j1d";} - {name="kross-interpreters";value="1v6xjdpflzx3gi12vaf6ywzhb4ycrnawb839pjbpw3cy83p1m6pa";} - {name="kruler";value="08b54gimg0z4hl9lgndsbl797r5h88mjlamzzv10k0rf7rsd0924";} - {name="ksaneplugin";value="1rcmjkzr3yxanpvkfvbvf06dg57m1mmfmmy4n6ixy51ir0mh1v5j";} - {name="kscd";value="01nchy6pb4spvbhgmkfqglmrm8jgkslg6k1q1vzvahyns4lv8b6d";} - {name="kshisen";value="0i9imqb4zz2yvc80dgvbz08s3pxncm8dnvvwxjaw674nks0jxlh8";} - {name="ksirk";value="1lnsz5fg86vqdks3d5dfsxzkdxs8kzakjrwx4ixpab5xhq05vzls";} - {name="ksnakeduel";value="0721xwg3rjwib3aazgzhdmph0bpl2p5zkha8jbmq7aqr5i8ddkx0";} - {name="ksnapshot";value="10grzlp7sq367g91858d16sadzipzmgwczhnb5xvy0437lqhhz7c";} - {name="kspaceduel";value="0cwgmpv2xcjwz914hqx6rivi5sk4x66imcdqy7pjnj5vk4f197m7";} - {name="ksquares";value="1zzg6y6zfqd1a0939hd1wy7ix4wld7ixp5pz2qs315g51m9lpn7i";} - {name="ksudoku";value="0qgjx7fbawhn63vv37wv4z56jf0gi4chs64aw9bllbq52syirmgb";} - {name="ksystemlog";value="11xh1psqhq7vimymb394kxjk83yax3gzi9fdckjspk6p10cycln2";} - {name="kteatime";value="16rrlxc67afkin3afdf1s9dlr7z2281dfsja64pdrrdilwwpyqwi";} - {name="ktimer";value="02yw6zgp5wbgfvq38adbnn8mqpjc69chz4rndphmyskvflszz6n4";} - {name="ktouch";value="110haqrk8ixq7hmsb8hymkbqw7jygybxh467p4ag0pczr09gr3d3";} - {name="ktuberling";value="1jpnzb6dbmcv2f0hb7y3alqn9jqq589jzz2chbvlsm7p7xnpv2h2";} - {name="kturtle";value="1z6mx1ls5ymh5biyzf5f99q6qapr4a2jgxdi2za0qclqjsla4hrf";} - {name="ktux";value="1n854lccqs540c0lsg6794g0ir25zli1h6z92vyccsvranjb6k9r";} - {name="kubrick";value="1sa53z2bdk4rnvr5fs73nazl1aisbcg9yyianazggqshhy0l6w8k";} - {name="kuser";value="1rkjah60cwpkp355ldcbvb7cwap9ib1mvj1aska9zn2kad0dg8n1";} - {name="kwalletmanager";value="1w3csapcddpzn7l7v4a2802wwh6d1zm8vqx9lz3wmajczpx6xjab";} - {name="kwordquiz";value="0zvxzva65cvqin64v105zh9hwbv0yi8mx9lll4ybbp915dw8701q";} {name="libkcddb";value="0xrmg53p5lh4ral2l5zh96angaf9czhih3zzvwr9qr9h9ks5vrn1";} - {name="libkcompactdisc";value="14hjlql1vzzszfpxhz0rzvjpi0q7f20ry5857lpdbqhnrc0p3bmg";} {name="libkdcraw";value="0ksarwq8aaxc77cp0ryfnw1n311wkykzdlhj03rln8jjlbdm3j3q";} - {name="libkdeedu";value="1i2sfby6ya8cfkdk28a9ia5zixwbixy56ql488v41w29mf1jnvzx";} - {name="libkdegames";value="0rd24v67fg09h5ilr4r7g9q21z165q1pm37y17l2qgjzr04czwn4";} {name="libkexiv2";value="1z8fmxfphx7szf4a17fs7zfjyxj6wncbvsphfvf6i5rlqy60g1y4";} - {name="libkipi";value="0fjm96pwird4km4wlhag1b67czwi03vsc2anng9iw3l4avavmvfw";} - {name="libkmahjongg";value="1ab66zgxya23yi7l3ga78yrm1kkr0l6hl709khyyk667kgzfqf16";} - {name="libkomparediff2";value="0bx672rysz78y2322lmm8a0i1k9v755wx8vmh538amk5smq936mz";} - {name="libksane";value="18nd90hrfmrgwmm6p5hgdr9dwc7z9978v2ibmjiim8dv44myk2is";} - {name="lokalize";value="1ig5mvzcspyz6ihr43fmwnhw560pby2kij0bz598xjkvb5hwfn8g";} - {name="lskat";value="01vgf40apf9x322k4f3i78n9ha01maga3xh3zvw4kmbs8kd662bi";} {name="marble";value="1w603miykq0s84jk6j17b7pg44rd4az0dhzgq7j7d6dfcz7nfrjd";} - {name="mplayerthumbs";value="0zin10mah7wm7f5v3hqffbwq2pqs7v39i2qhdizrijp85wsp925v";} - {name="nepomuk-core";value="0gdb7vk3qjvv04a5xqwlv0f4bjn391a3k3hkgibkql9ggxbjbrvl";} - {name="nepomuk-widgets";value="1qbrs56af9zdzhfb8964p44706gdf4j0bmj378xy5jva7km9cypx";} - {name="okteta";value="1vgs9kwp1bb5fvp1ja5hzvgll1s7n3ds5gg4500khy47k2z2cvmx";} {name="okular";value="0ijw71vkk1lj873hqczc23vllhkc9s0miipsbllxblx57rgi5qp6";} - {name="oxygen-icons";value="1nwjjcm0isjnn3i8xf75nk6mhbg1zm20farlmyrzx261r2cj68lv";} - {name="pairs";value="124rpv22cx6bi65ixz5889zk46q17913w4l80d94pp9l6aypn4fm";} - {name="palapeli";value="08rklllik0zsrw19ff6b6l0ijxkyxy8wn5mxm3i07h9pbzv1ga5k";} - {name="parley";value="1mx0s7dmcmprrr44iim3pzr782cacndqiqiy7zz1zdw41mif3q16";} - {name="perlkde";value="0aiv8wmv08yp19rk228m7wirh43dagz4yapp3f7bgg50f4c6rpkb";} - {name="perlqt";value="0villxkgqwscx0sipfqnacxdyi3kzkmma4p9fkjq0hvqzq1b4pd0";} - {name="picmi";value="0x6nv6ahgsb90brckgv97grsmdb4za5m9izrkcyz6rg5gnn848c4";} - {name="poxml";value="020lf3wc7vn9d01pqqn1ygvvx7699vxkk5n9hq8zw7rf6n25gifx";} - {name="print-manager";value="0df1zca0cdk3qdyjfsymhghdadixz3fwm5w4h833iwf7fgr3c5q8";} {name="pykde4";value="1z40gnkyjlv6ds3cmpzvv99394rhmydr6rxx7qj33m83xnsxgfbz";} - {name="qtruby";value="179wjl7w8vdm1606m1dzphhmcqxynfbdrcnrjzpyyvhibsdyfl10";} - {name="qyoto";value="0inwdnwhmi3cf82z0ni1abf621l6322r84kq447cqia6rkmf59j4";} - {name="rocs";value="1z6lk3xzbrw6581gy8hd3lm3ry4vkphg9wcdl8l03az1nyk2xp61";} - {name="smokegen";value="1if43r4icp7fz8ngmfw8i5wdylak48j79pp3bdvizfwn4pazl2s3";} - {name="smokekde";value="099c4qkpwwhbj9yibsm5zkgczv22qs4vd6s84v1p347kxr5in1hd";} - {name="smokeqt";value="02drfr1bnhac27a4c8pvbvvag250pmg71iz7ig968bp2gqvxcf99";} - {name="step";value="14f4a2k2al21ynkmwqrh5c33fgn6bhw3g461yhvmnq2sf8fwg8wb";} - {name="superkaramba";value="1jf3dck707svpbnbpwv46mlcgf5x52djnix5wjsg3wmkipgs4w88";} {name="svgpart";value="1bj9gaaj6nqdgchmqnn381288aqw09ky0kbm1naddqa82pk196f6";} - {name="sweeper";value="0fhq9n1ffhcka37j6m9gs0rdxs0dzfn7lnl66v9wpgw075lfiaxx";} - {name="umbrello";value="0cvks49ij449grh3ldbpmmagz3yx61zq1g0fsg2ii9pqzbd6hn3x";} - {name="zeroconf-ioslave";value="0hhm5jj0kbi1y18m4x50hnpnfi1cjgh6mglggbscp8xr32jgmgjm";} ]; versions=builtins.listToAttrs[ - {name="amor";value="4.14.3";} - {name="analitza";value="4.14.3";} - {name="ark";value="4.14.3";} - {name="artikulate";value="4.14.3";} - {name="audiocd-kio";value="4.14.3";} {name="baloo";value="4.14.3";} - {name="baloo-widgets";value="4.14.3";} - {name="blinken";value="4.14.3";} - {name="bomber";value="4.14.3";} - {name="bovo";value="4.14.3";} - {name="cantor";value="4.14.3";} - {name="cervisia";value="4.14.3";} - {name="dolphin-plugins";value="4.14.3";} - {name="dragon";value="4.14.3";} - {name="ffmpegthumbs";value="4.14.3";} - {name="filelight";value="4.14.3";} - {name="granatier";value="4.14.3";} - {name="gwenview";value="4.14.3";} - {name="jovie";value="4.14.3";} - {name="juk";value="4.14.3";} - {name="kaccessible";value="4.14.3";} {name="kactivities";value="4.13.3";} - {name="kajongg";value="4.14.3";} - {name="kalgebra";value="4.14.3";} - {name="kalzium";value="4.14.3";} - {name="kamera";value="4.14.3";} - {name="kanagram";value="4.14.3";} - {name="kapman";value="4.14.3";} - {name="kapptemplate";value="4.14.3";} - {name="kate";value="4.14.3";} - {name="katomic";value="4.14.3";} - {name="kblackbox";value="4.14.3";} - {name="kblocks";value="4.14.3";} - {name="kbounce";value="4.14.3";} - {name="kbreakout";value="4.14.3";} - {name="kbruch";value="4.14.3";} - {name="kcachegrind";value="4.14.3";} - {name="kcalc";value="4.14.3";} - {name="kcharselect";value="4.14.3";} - {name="kcolorchooser";value="4.14.3";} - {name="kcron";value="4.14.3";} - {name="kdeartwork";value="4.14.3";} {name="kde-baseapps";value="4.14.3";} - {name="kde-base-artwork";value="4.14.3";} - {name="kde-dev-scripts";value="4.14.3";} - {name="kde-dev-utils";value="4.14.3";} - {name="kdegraphics-mobipocket";value="4.14.3";} - {name="kdegraphics-strigi-analyzer";value="4.14.3";} - {name="kdegraphics-thumbnailers";value="4.14.3";} - {name="kdenetwork-filesharing";value="4.14.3";} - {name="kdenetwork-strigi-analyzers";value="4.14.3";} - {name="kdepim";value="4.14.3";} {name="kdepimlibs";value="4.14.3";} - {name="kdepim-runtime";value="4.14.3";} - {name="kdeplasma-addons";value="4.14.3";} {name="kde-runtime";value="4.14.3";} - {name="kdesdk-kioslaves";value="4.14.3";} - {name="kdesdk-strigi-analyzers";value="4.14.3";} - {name="kdesdk-thumbnailers";value="4.14.3";} - {name="kde-wallpapers";value="4.14.3";} - {name="kdewebdev";value="4.14.3";} {name="kde-workspace";value="4.11.14";} - {name="kdf";value="4.14.3";} - {name="kdiamond";value="4.14.3";} {name="kfilemetadata";value="4.14.3";} - {name="kfloppy";value="4.14.3";} - {name="kfourinline";value="4.14.3";} - {name="kgamma";value="4.14.3";} - {name="kgeography";value="4.14.3";} - {name="kget";value="4.14.3";} - {name="kgoldrunner";value="4.14.3";} - {name="kgpg";value="4.14.3";} - {name="khangman";value="4.14.3";} - {name="kig";value="4.14.3";} - {name="kigo";value="4.14.3";} - {name="killbots";value="4.14.3";} - {name="kimono";value="4.14.3";} - {name="kiriki";value="4.14.3";} - {name="kiten";value="4.14.3";} - {name="kjumpingcube";value="4.14.3";} - {name="klettres";value="4.14.3";} - {name="klickety";value="4.14.3";} - {name="klines";value="4.14.3";} - {name="kmag";value="4.14.3";} - {name="kmahjongg";value="4.14.3";} - {name="kmines";value="4.14.3";} - {name="kmix";value="4.14.3";} - {name="kmousetool";value="4.14.3";} - {name="kmouth";value="4.14.3";} - {name="kmplot";value="4.14.3";} - {name="knavalbattle";value="4.14.3";} - {name="knetwalk";value="4.14.3";} - {name="kolf";value="4.14.3";} - {name="kollision";value="4.14.3";} - {name="kolourpaint";value="4.14.3";} - {name="kompare";value="4.14.3";} - {name="konquest";value="4.14.3";} - {name="konsole";value="4.14.3";} - {name="kopete";value="4.14.3";} - {name="korundum";value="4.14.3";} - {name="kpat";value="4.14.3";} - {name="kppp";value="4.14.3";} - {name="kqtquickcharts";value="4.14.3";} - {name="krdc";value="4.14.3";} - {name="kremotecontrol";value="4.14.3";} - {name="kreversi";value="4.14.3";} - {name="krfb";value="4.14.3";} - {name="kross-interpreters";value="4.14.3";} - {name="kruler";value="4.14.3";} - {name="ksaneplugin";value="4.14.3";} - {name="kscd";value="4.14.3";} - {name="kshisen";value="4.14.3";} - {name="ksirk";value="4.14.3";} - {name="ksnakeduel";value="4.14.3";} - {name="ksnapshot";value="4.14.3";} - {name="kspaceduel";value="4.14.3";} - {name="ksquares";value="4.14.3";} - {name="ksudoku";value="4.14.3";} - {name="ksystemlog";value="4.14.3";} - {name="kteatime";value="4.14.3";} - {name="ktimer";value="4.14.3";} - {name="ktouch";value="4.14.3";} - {name="ktuberling";value="4.14.3";} - {name="kturtle";value="4.14.3";} - {name="ktux";value="4.14.3";} - {name="kubrick";value="4.14.3";} - {name="kuser";value="4.14.3";} - {name="kwalletmanager";value="4.14.3";} - {name="kwordquiz";value="4.14.3";} {name="libkcddb";value="4.14.3";} - {name="libkcompactdisc";value="4.14.3";} {name="libkdcraw";value="4.14.3";} - {name="libkdeedu";value="4.14.3";} - {name="libkdegames";value="4.14.3";} {name="libkexiv2";value="4.14.3";} - {name="libkipi";value="4.14.3";} - {name="libkmahjongg";value="4.14.3";} - {name="libkomparediff2";value="4.14.3";} - {name="libksane";value="4.14.3";} - {name="lokalize";value="4.14.3";} - {name="lskat";value="4.14.3";} {name="marble";value="4.14.3";} - {name="mplayerthumbs";value="4.14.3";} - {name="nepomuk-core";value="4.14.3";} - {name="nepomuk-widgets";value="4.14.3";} - {name="okteta";value="4.14.3";} {name="okular";value="4.14.3";} - {name="oxygen-icons";value="4.14.3";} - {name="pairs";value="4.14.3";} - {name="palapeli";value="4.14.3";} - {name="parley";value="4.14.3";} - {name="perlkde";value="4.14.3";} - {name="perlqt";value="4.14.3";} - {name="picmi";value="4.14.3";} - {name="poxml";value="4.14.3";} - {name="print-manager";value="4.14.3";} {name="pykde4";value="4.14.3";} - {name="qtruby";value="4.14.3";} - {name="qyoto";value="4.14.3";} - {name="rocs";value="4.14.3";} - {name="smokegen";value="4.14.3";} - {name="smokekde";value="4.14.3";} - {name="smokeqt";value="4.14.3";} - {name="step";value="4.14.3";} - {name="superkaramba";value="4.14.3";} {name="svgpart";value="4.14.3";} - {name="sweeper";value="4.14.3";} - {name="umbrello";value="4.14.3";} - {name="zeroconf-ioslave";value="4.14.3";} ]; modules=[ { module="kdemultimedia"; split=true; pkgs=[ - { name="audiocd-kio"; sane="audiocd_kio"; } - { name="dragon"; } - { name="ffmpegthumbs"; } - { name="juk"; } - { name="kmix"; } - { name="kscd"; } { name="libkcddb"; } - { name="libkcompactdisc"; } - { name="mplayerthumbs"; } ]; } { module="kdegraphics"; split=true; pkgs=[ - { name="gwenview"; } - { name="kamera"; } - { name="kcolorchooser"; } - { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; } - { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; } - { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; } - { name="kgamma"; } - { name="kolourpaint"; } - { name="kruler"; } - { name="ksaneplugin"; } - { name="ksnapshot"; } { name="libkdcraw"; } { name="libkexiv2"; } - { name="libkipi"; } - { name="libksane"; } { name="okular"; } { name="svgpart"; } ]; @@ -383,196 +51,22 @@ modules=[ module="kdelibs"; split=true; pkgs=[ - { name="baloo"; } - { name="baloo-widgets"; sane="baloo_widgets"; } - { name="kfilemetadata"; } - { name="nepomuk-core"; sane="nepomuk_core"; } - { name="nepomuk-widgets"; sane="nepomuk_widgets"; } - ]; -} -{ - module="kdenetwork"; - split=true; - pkgs=[ - { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; } - { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; } - { name="kget"; } - { name="kopete"; } - { name="kppp"; } - { name="krdc"; } - { name="krfb"; } - { name="zeroconf-ioslave"; sane="zeroconf_ioslave"; } - ]; -} -{ - module="kdeutils"; - split=true; - pkgs=[ - { name="ark"; } - { name="filelight"; } - { name="kcalc"; } - { name="kcharselect"; } - { name="kdf"; } - { name="kfloppy"; } - { name="kgpg"; } - { name="kremotecontrol"; } - { name="ktimer"; } - { name="kwalletmanager"; } - { name="print-manager"; sane="print_manager"; } - { name="superkaramba"; } - { name="sweeper"; } - ]; -} -{ - module="applications"; - split=true; - pkgs=[ - { name="kate"; } - { name="konsole"; } - ]; -} -{ - module="kdetoys"; - split=true; - pkgs=[ - { name="amor"; } - { name="kteatime"; } - { name="ktux"; } - ]; -} -{ - module="kdesdk"; - split=true; - pkgs=[ - { name="cervisia"; } - { name="dolphin-plugins"; sane="dolphin_plugins"; } - { name="kapptemplate"; } - { name="kcachegrind"; } - { name="kde-dev-scripts"; sane="kde_dev_scripts"; } - { name="kde-dev-utils"; sane="kde_dev_utils"; } - { name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; } - { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; } - { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; } - { name="kompare"; } - { name="libkomparediff2"; } - { name="lokalize"; } - { name="okteta"; } - { name="poxml"; } - { name="umbrello"; } - ]; -} -{ - module="kdegames"; - split=true; - pkgs=[ - { name="bomber"; } - { name="bovo"; } - { name="granatier"; } - { name="kajongg"; } - { name="kapman"; } - { name="katomic"; } - { name="kblackbox"; } - { name="kblocks"; } - { name="kbounce"; } - { name="kbreakout"; } - { name="kdiamond"; } - { name="kfourinline"; } - { name="kgoldrunner"; } - { name="kigo"; } - { name="killbots"; } - { name="kiriki"; } - { name="kjumpingcube"; } - { name="klickety"; } - { name="klines"; } - { name="kmahjongg"; } - { name="kmines"; } - { name="knavalbattle"; } - { name="knetwalk"; } - { name="kolf"; } - { name="kollision"; } - { name="konquest"; } - { name="kpat"; } - { name="kreversi"; } - { name="kshisen"; } - { name="ksirk"; } - { name="ksnakeduel"; } - { name="kspaceduel"; } - { name="ksquares"; } - { name="ksudoku"; } - { name="ktuberling"; } - { name="kubrick"; } - { name="libkdegames"; } - { name="libkmahjongg"; } - { name="lskat"; } - { name="palapeli"; } - { name="picmi"; } + { name = "baloo"; } + { name = "kfilemetadata"; } ]; } { module="kdeedu"; split=true; pkgs=[ - { name="analitza"; } - { name="artikulate"; } - { name="blinken"; } - { name="cantor"; } - { name="kalgebra"; } - { name="kalzium"; } - { name="kanagram"; } - { name="kbruch"; } - { name="kgeography"; } - { name="khangman"; } - { name="kig"; } - { name="kiten"; } - { name="klettres"; } - { name="kmplot"; } - { name="kqtquickcharts"; } - { name="ktouch"; } - { name="kturtle"; } - { name="kwordquiz"; } - { name="libkdeedu"; } { name="marble"; } - { name="pairs"; } - { name="parley"; } - { name="rocs"; } - { name="step"; } - ]; -} -{ - module="kdeadmin"; - split=true; - pkgs=[ - { name="kcron"; } - { name="ksystemlog"; } - { name="kuser"; } ]; } { module="kdebindings"; split=true; pkgs=[ - { name="kimono"; } - { name="korundum"; } - { name="kross-interpreters"; sane="kross_interpreters"; } - { name="perlkde"; } - { name="perlqt"; } { name="pykde4"; } - { name="qtruby"; } - { name="qyoto"; } - { name="smokegen"; } - { name="smokekde"; } - { name="smokeqt"; } - ]; -} -{ - module="kdeaccessibility"; - split=true; - pkgs=[ - { name="jovie"; } - { name="kaccessible"; } - { name="kmag"; } - { name="kmousetool"; } - { name="kmouth"; } ]; } { @@ -583,38 +77,7 @@ sane="kde_baseapps"; split=true; ]; } { module="kactivities"; split=false;} -{ module="kdeartwork"; split=false; - pkgs=[ - { name="ColorSchemes"; } - { name="IconThemes"; } - { name="emoticons"; } - { name="kscreensaver"; } - { name="kwin-styles"; sane="kwin_styles";} - { name="styles"; } - { name="wallpapers"; } - { name="HighResolutionWallpapers"; } - { name="WeatherWallpapers"; } - { name="desktopthemes"; } - ]; - -} -{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;} -{ module="kdepim"; split=false;} { module="kdepimlibs"; split=false;} -{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;} -{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;} -{ module="kde-runtime"; sane="kde_runtime"; split=false;} -{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;} -{ module="kdewebdev"; split=false; - pkgs=[ - { name="klinkstatus"; } - { name="kfilereplace"; } - { name="kimagemapeditor"; } - { name="kommander"; } - ]; - -} { module="kde-workspace"; sane="kde_workspace"; split=false;} -{ module="oxygen-icons"; sane="oxygen_icons"; split=false;} ]; } diff --git a/pkgs/desktops/kde-4.14/kde-package/default.nix b/pkgs/desktops/kde-4.14/kde-package/default.nix index 4bb961b8d2e7..d5de6f5f6bc1 100644 --- a/pkgs/desktops/kde-4.14/kde-package/default.nix +++ b/pkgs/desktops/kde-4.14/kde-package/default.nix @@ -113,14 +113,18 @@ rec { removeNames = subst: big: fold (s: out: filter (x: x.name != s) out) big subst; - modules = listToAttrs (map kdeModuleNV manifest.modules); + allModules = listToAttrs (map kdeModuleNV manifest.modules); + + modules = + let unsplit = filter (a: ! (a ? pkgs)) manifest.modules; + in listToAttrs (map kdeModuleNV unsplit); splittedModuleList = let splitted = filter (a: a ? pkgs) manifest.modules; names = map ({module, sane ? module, ...}: sane) splitted; in - map (m: m.projects) (stdenv.lib.attrVals names modules); + map (m: m.projects) (stdenv.lib.attrVals names allModules); individual = stdenv.lib.zipAttrsWith diff --git a/pkgs/desktops/kde-4.14/kde-runtime.nix b/pkgs/desktops/kde-4.14/kde-runtime.nix deleted file mode 100644 index a66d189a6007..000000000000 --- a/pkgs/desktops/kde-4.14/kde-runtime.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ kde, kdelibs, bzip2, libssh, exiv2, attica, qca2, shared_mime_info -, libcanberra, samba, libjpeg, ntrack, pkgconfig, xz, libpulseaudio -, networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme, glib -}: - -kde { - patches = [ ./CVE-2014-8600.diff ]; - - buildInputs = [ - kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack - qca2 samba libcanberra libpulseaudio gpgme - networkmanager kactivities kdepimlibs openexr -#todo: add openslp -#todo: gpgme can't be found because cmake module is provided by kdepimlibs which are found too late - ]; - - nativeBuildInputs = [ shared_mime_info ]; - - NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; - - meta = { - license = "LGPL"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kde-wallpapers.nix b/pkgs/desktops/kde-4.14/kde-wallpapers.nix deleted file mode 100644 index 875eb6769c0e..000000000000 --- a/pkgs/desktops/kde-4.14/kde-wallpapers.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kde, cmake }: - -kde { - nativeBuildInputs = [ cmake ]; - - patches = [ ./files/kde-wallpapers-buildsystem.patch ]; - - cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers"; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "1mzj7jk0ag7yas2wm2x60z3ymv64g9jrjsz3nwlr719b4bhmgwjj"; - - meta = { - description = "Wallpapers for KDE"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeaccessibility/jovie.nix b/pkgs/desktops/kde-4.14/kdeaccessibility/jovie.nix deleted file mode 100644 index d38c80c4c36a..000000000000 --- a/pkgs/desktops/kde-4.14/kdeaccessibility/jovie.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, speechd }: - -kde { - buildInputs = [ kdelibs speechd ]; - - meta = { - description = "Text-to-speech synthesis daemon"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeaccessibility/kaccessible.nix b/pkgs/desktops/kde-4.14/kdeaccessibility/kaccessible.nix deleted file mode 100644 index 98fae7c983f8..000000000000 --- a/pkgs/desktops/kde-4.14/kdeaccessibility/kaccessible.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, speechd }: - -kde { - buildInputs = [ kdelibs speechd ]; - - meta = { - description = "Bridge that provides accessibility services to applications"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeaccessibility/kmag.nix b/pkgs/desktops/kde-4.14/kdeaccessibility/kmag.nix deleted file mode 100644 index 606c61cddb63..000000000000 --- a/pkgs/desktops/kde-4.14/kdeaccessibility/kmag.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs }: - -kde { -#todo: package qaccessibilityclient - buildInputs = [ kdelibs ]; - - meta = { - description = "Screen magnifier for KDE"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeaccessibility/kmousetool.nix b/pkgs/desktops/kde-4.14/kdeaccessibility/kmousetool.nix deleted file mode 100644 index 8e0caa76ed9c..000000000000 --- a/pkgs/desktops/kde-4.14/kdeaccessibility/kmousetool.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libXtst, libXt }: - -kde { - buildInputs = [ kdelibs libXtst libXt ]; - - meta = { - description = "A program that clicks the mouse for you"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeaccessibility/kmouth.nix b/pkgs/desktops/kde-4.14/kdeaccessibility/kmouth.nix deleted file mode 100644 index 4159501967cd..000000000000 --- a/pkgs/desktops/kde-4.14/kdeaccessibility/kmouth.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A type-and-say front end for speech synthesizers"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeadmin/kcron.nix b/pkgs/desktops/kde-4.14/kdeadmin/kcron.nix deleted file mode 100644 index f585461af381..000000000000 --- a/pkgs/desktops/kde-4.14/kdeadmin/kcron.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Configure and schedule tasks"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeadmin/ksystemlog.nix b/pkgs/desktops/kde-4.14/kdeadmin/ksystemlog.nix deleted file mode 100644 index 88757a6b91c7..000000000000 --- a/pkgs/desktops/kde-4.14/kdeadmin/ksystemlog.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "System log viewer tool"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeadmin/kuser.nix b/pkgs/desktops/kde-4.14/kdeadmin/kuser.nix deleted file mode 100644 index 6118cf558bbd..000000000000 --- a/pkgs/desktops/kde-4.14/kdeadmin/kuser.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, kdepimlibs }: - -kde { - buildInputs = [ kdelibs kdepimlibs ]; - - meta = { - description = "User management tool"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeartwork/ColorSchemes.nix b/pkgs/desktops/kde-4.14/kdeartwork/ColorSchemes.nix deleted file mode 100644 index acccf66976fc..000000000000 --- a/pkgs/desktops/kde-4.14/kdeartwork/ColorSchemes.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde { - name = "kde-color-schemes"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Additional KDE color schemes"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeartwork/FindXscreensaver.cmake b/pkgs/desktops/kde-4.14/kdeartwork/FindXscreensaver.cmake deleted file mode 100644 index 499ed75268e9..000000000000 --- a/pkgs/desktops/kde-4.14/kdeartwork/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.14/kdeartwork/HighResolutionWallpapers.nix b/pkgs/desktops/kde-4.14/kdeartwork/HighResolutionWallpapers.nix deleted file mode 100644 index edffca1562e1..000000000000 --- a/pkgs/desktops/kde-4.14/kdeartwork/HighResolutionWallpapers.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde rec { - name = "kde-wallpapers-high-resolution"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE wallpapers in high resolution"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeartwork/IconThemes.nix b/pkgs/desktops/kde-4.14/kdeartwork/IconThemes.nix deleted file mode 100644 index 43071e8bd142..000000000000 --- a/pkgs/desktops/kde-4.14/kdeartwork/IconThemes.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs }: - -kde { - name = "kdeartwork-icon-themes"; - - # Sources contain primary and kdeclassic as well but they're not installed - - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE nuvola and mono icon themes"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeartwork/WeatherWallpapers.nix b/pkgs/desktops/kde-4.14/kdeartwork/WeatherWallpapers.nix deleted file mode 100644 index 947e5e17ab0c..000000000000 --- a/pkgs/desktops/kde-4.14/kdeartwork/WeatherWallpapers.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde rec { - name = "kde-weather-wallpapers"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Additional KDE wallpapers (weather)"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeartwork/desktopthemes.nix b/pkgs/desktops/kde-4.14/kdeartwork/desktopthemes.nix deleted file mode 100644 index 93dd361af738..000000000000 --- a/pkgs/desktops/kde-4.14/kdeartwork/desktopthemes.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde { - name = "kde-desktop-themes"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Additional KDE desktop themes"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeartwork/emoticons.nix b/pkgs/desktops/kde-4.14/kdeartwork/emoticons.nix deleted file mode 100644 index 5ef9f78a7195..000000000000 --- a/pkgs/desktops/kde-4.14/kdeartwork/emoticons.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde { - name = "kde-emotion-icons"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Additional KDE emotion icons (smiles)"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.14/kdeartwork/kscreensaver.nix deleted file mode 100644 index 84cb008056e4..000000000000 --- a/pkgs/desktops/kde-4.14/kdeartwork/kscreensaver.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt, pkgconfig }: - -kde { - buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ]; - - nativeBuildInputs = [ pkgconfig ]; - - prePatch = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake"; - - cmakeFlags = [ "-DBUILD_asciiquarium:BOOL=ON" ]; - - meta = { - description = "KDE screensavers"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeartwork/kwin-styles.nix b/pkgs/desktops/kde-4.14/kdeartwork/kwin-styles.nix deleted file mode 100644 index b5d769b216db..000000000000 --- a/pkgs/desktops/kde-4.14/kdeartwork/kwin-styles.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, kde_workspace }: - -kde { - buildInputs = [ kdelibs kde_workspace ]; - - meta = { - description = "Styles for KWin"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeartwork/styles.nix b/pkgs/desktops/kde-4.14/kdeartwork/styles.nix deleted file mode 100644 index 6a1306c37100..000000000000 --- a/pkgs/desktops/kde-4.14/kdeartwork/styles.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde rec { - name = "kde-style-phase"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Phase, a widget style for KDE"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeartwork/wallpapers.nix b/pkgs/desktops/kde-4.14/kdeartwork/wallpapers.nix deleted file mode 100644 index 7c9846fbf9e8..000000000000 --- a/pkgs/desktops/kde-4.14/kdeartwork/wallpapers.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs }: - -kde rec { - name = "kdeartwork-wallpapers"; - - buildInputs = [ kdelibs ]; - - meta = { - description = "Additional KDE wallpapers"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdebindings/perlqt.nix b/pkgs/desktops/kde-4.14/kdebindings/perlqt.nix deleted file mode 100644 index 48eed141ce64..000000000000 --- a/pkgs/desktops/kde-4.14/kdebindings/perlqt.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kde, cmake, smokeqt, perl }: - -kde { - - # TODO: qscintilla2, qwt5 - - buildInputs = [ smokeqt perl ]; - - nativeBuildInputs = [ cmake ]; - - meta = { - description = "Perl bindings for Qt library"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdebindings/qtruby-install-prefix.patch b/pkgs/desktops/kde-4.14/kdebindings/qtruby-install-prefix.patch deleted file mode 100644 index bd95a0d8bd3d..000000000000 --- a/pkgs/desktops/kde-4.14/kdebindings/qtruby-install-prefix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 33078b4..30aec0e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -31,8 +31,8 @@ if (NOT COMPILE_RUBY) - return() - endif (NOT COMPILE_RUBY) - --SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR} CACHE DIR "custom installation directory for ruby binary extension" ) --SET(CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR} CACHE DIR "custom installation directory for ruby extension" ) -+string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR}) -+string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR}) - - # compute an overall version number which can be compared at once - MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 + ${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}") diff --git a/pkgs/desktops/kde-4.14/kdebindings/qtruby.nix b/pkgs/desktops/kde-4.14/kdebindings/qtruby.nix deleted file mode 100644 index ed83dd03eca1..000000000000 --- a/pkgs/desktops/kde-4.14/kdebindings/qtruby.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ kde, cmake, smokeqt, ruby_2_2 }: - -kde { - - # TODO: scintilla2, qwt5 - - buildInputs = [ smokeqt ruby_2_2 ]; - - nativeBuildInputs = [ cmake ]; - - hardeningDisable = [ "all" ]; - - # The patch is not ready for upstream submmission. - # I should add an option() instead. - patches = [ ./qtruby-install-prefix.patch ]; - - cmakeFlags="-DRUBY_ROOT_DIR=${ruby_2_2}"; - - meta = { - description = "Ruby bindings for Qt library"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch b/pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch deleted file mode 100644 index 7436b6112d57..000000000000 --- a/pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naur smokegen-4.14.3-upstream/CMakeLists.txt smokegen-4.14.3/CMakeLists.txt ---- smokegen-4.14.3-upstream/CMakeLists.txt 2014-09-15 13:23:01.000000000 -0430 -+++ smokegen-4.14.3/CMakeLists.txt 2015-03-29 16:41:59.295598992 -0430 -@@ -32,9 +32,9 @@ - type.cpp - ) - --# force RPATH so that the binary is usable from within the build tree --set (CMAKE_SKIP_BUILD_RPATH FALSE) --set (CMAKE_SKIP_RPATH FALSE) -+# add the automatically determined parts of the RPATH -+# which point to directories outside the build tree to the install RPATH -+set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - - configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY ) - diff --git a/pkgs/desktops/kde-4.14/kdebindings/smokegen-nix.patch b/pkgs/desktops/kde-4.14/kdebindings/smokegen-nix.patch deleted file mode 100644 index 53257e836e04..000000000000 --- a/pkgs/desktops/kde-4.14/kdebindings/smokegen-nix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urN smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in smokegen-4.10.5/cmake/SmokeConfig.cmake.in ---- smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in 2013-06-28 17:14:50.000000000 +0000 -+++ smokegen-4.10.5/cmake/SmokeConfig.cmake.in 2013-07-30 21:26:33.000000000 +0000 -@@ -80,8 +80,7 @@ - set(SMOKE_API_BIN "@SMOKE_API_BIN@") - - find_library(SMOKE_BASE_LIBRARY smokebase -- PATHS "@SMOKE_LIBRARY_PREFIX@" -- NO_DEFAULT_PATH) -+ PATHS "@SMOKE_LIBRARY_PREFIX@") - - if (NOT SMOKE_BASE_LIBRARY) - if (Smoke_FIND_REQUIRED) diff --git a/pkgs/desktops/kde-4.14/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.14/kdebindings/smokegen.nix deleted file mode 100644 index 5708d0f96eb2..000000000000 --- a/pkgs/desktops/kde-4.14/kdebindings/smokegen.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ stdenv, kde, qt4, cmake }: - -kde { - buildInputs = [ qt4 ]; - nativeBuildInputs = [ cmake ]; - - patches = [ ./smokegen-nix.patch ./smokegen-CMakeLists.txt-nix.patch ]; - - meta = { - description = "C++ parser used to generate language bindings for Qt/KDE"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.14/kdebindings/smokekde.nix deleted file mode 100644 index 4474c1d9731e..000000000000 --- a/pkgs/desktops/kde-4.14/kdebindings/smokekde.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ kde, cmake, smokeqt, kdelibs, akonadi, kdepimlibs, okular -, shared_desktop_ontologies, attica, pkgconfig }: - -kde { - - # TODO: attica, akonadi and kdepimlibs are disabled due to smokegen crash - # okular is disabled because the code generated is broken - buildInputs = [ - smokeqt kdelibs shared_desktop_ontologies - ]; - - nativeBuildInputs = [ cmake pkgconfig ]; - - LD_LIBRARY_PATH = "${smokeqt}/lib/"; - - meta = { - description = "SMOKE bindings for kdelibs"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.14/kdebindings/smokeqt.nix deleted file mode 100644 index 494bc85e6465..000000000000 --- a/pkgs/desktops/kde-4.14/kdebindings/smokeqt.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, kde, qt4, cmake, phonon, qimageblitz, smokegen }: - -kde { - -# TODO: Qwt5, QScintilla2 - - propagatedBuildInputs = [ qt4 phonon qimageblitz ]; - nativeBuildInputs = [ cmake ]; - propagatedNativeBuildInputs = [ smokegen ]; - - meta = { - description = "C++ parser used to generate language bindings for Qt/KDE"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeedu/analitza.nix b/pkgs/desktops/kde-4.14/kdeedu/analitza.nix deleted file mode 100644 index 74c3a1ebb200..000000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/analitza.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, readline }: -kde { - buildInputs = [ kdelibs readline ]; - - meta = { - description = "Library part of KAlgebra"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeedu/artikulate.nix b/pkgs/desktops/kde-4.14/kdeedu/artikulate.nix deleted file mode 100644 index 8674a774443f..000000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/artikulate.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, qt_gstreamer1 }: -kde { - buildInputs = [ kdelibs qt_gstreamer1 ]; - - meta = { - description = "A pronunciation learning program for KDE"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeedu/blinken.nix b/pkgs/desktops/kde-4.14/kdeedu/blinken.nix deleted file mode 100644 index cdf9728833c2..000000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/blinken.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Memory Enhancement Game"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeedu/cantor.nix b/pkgs/desktops/kde-4.14/kdeedu/cantor.nix deleted file mode 100644 index 625a2678e48b..000000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/cantor.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, kdelibs, libspectre, analitza, R, pkgconfig, libqalculate, python }: -kde { - -# TODO: R is not found - - buildInputs = [ kdelibs libspectre analitza R libqalculate python ]; - - nativeBuildInputs = [ pkgconfig ]; - - patches = [ ./commit-846cf02 ]; - - meta = { - description = "KDE Frontend to Mathematical Software"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeedu/commit-846cf02 b/pkgs/desktops/kde-4.14/kdeedu/commit-846cf02 deleted file mode 100644 index 66e756e21bb8..000000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/commit-846cf02 +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/src/backends/R/rserver/rcallbacks.h b/src/backends/R/rserver/rcallbacks.h -index 8f4752c..6d0e9a2 100644 ---- a/src/backends/R/rserver/rcallbacks.h -+++ b/src/backends/R/rserver/rcallbacks.h -@@ -30,7 +30,6 @@ class Expression; - #include <Rversion.h> - #include <Rdefines.h> - #define R_INTERFACE_PTRS --#include <Rinterface.h> - #include <R_ext/Parse.h> - - //This File implements the necessary callbacks for R -commit 846cf02ab1618b9322b83eafc18dff3264988b72 -Author: Raymond Wooninck <tittiatcoke@gmail.com> -Date: Mon Apr 27 16:08:51 2015 +0200 - - Also build against R >= 3.2. - -diff --git a/src/backends/R/rserver/rcallbacks.cpp b/src/backends/R/rserver/rcallbacks.cpp -index 2c86531..492f270 100644 ---- a/src/backends/R/rserver/rcallbacks.cpp -+++ b/src/backends/R/rserver/rcallbacks.cpp -@@ -26,6 +26,7 @@ - #include <QStringList> - - #include <stdio.h> -+#include <Rinterface.h> - - RServer* server; - Expression* currentExpression; -diff --git a/src/backends/R/rserver/rserver.cpp b/src/backends/R/rserver/rserver.cpp -index 30cdb70..f689f42 100644 ---- a/src/backends/R/rserver/rserver.cpp -+++ b/src/backends/R/rserver/rserver.cpp -@@ -42,7 +42,6 @@ - #include <Rversion.h> - #include <Rdefines.h> - #define R_INTERFACE_PTRS --#include <Rinterface.h> - #include <R_ext/Parse.h> - - // Not making a member to prevent pulling R headers into rserver.h diff --git a/pkgs/desktops/kde-4.14/kdeedu/kalgebra.nix b/pkgs/desktops/kde-4.14/kdeedu/kalgebra.nix deleted file mode 100644 index 3675c3a225f4..000000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/kalgebra.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, libkdeedu, analitza }: -kde { - buildInputs = [ kdelibs libkdeedu analitza ]; - - meta = { - description = "2D and 3D Graph Calculator"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeedu/kalzium.nix b/pkgs/desktops/kde-4.14/kdeedu/kalzium.nix deleted file mode 100644 index 8338eee55110..000000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/kalzium.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs, facile, ocaml, eigen2, eigen, openbabel, avogadro, pkgconfig }: -kde { - -# TODO: chemical mime data - - buildInputs = [ kdelibs facile ocaml eigen2 eigen openbabel avogadro ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "Periodic Table of Elements"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeedu/kanagram.nix b/pkgs/desktops/kde-4.14/kdeedu/kanagram.nix deleted file mode 100644 index 8759c96d78c4..000000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/kanagram.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, libkdeedu }: -kde { - buildInputs = [ kdelibs libkdeedu ]; - - meta = { - description = "Letter Order Game"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeedu/kbruch.nix b/pkgs/desktops/kde-4.14/kdeedu/kbruch.nix deleted file mode 100644 index dc50f1e85a37..000000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/kbruch.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Practice Fractions"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeedu/kgeography.nix b/pkgs/desktops/kde-4.14/kdeedu/kgeography.nix deleted file mode 100644 index bd8d27c8d6e2..000000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/kgeography.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Geography Trainer"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeedu/khangman.nix b/pkgs/desktops/kde-4.14/kdeedu/khangman.nix deleted file mode 100644 index 997b50e906a2..000000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/khangman.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, libkdeedu }: -kde { - buildInputs = [ kdelibs libkdeedu ]; - - meta = { - description = "KDE hangman game"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeedu/kig.nix b/pkgs/desktops/kde-4.14/kdeedu/kig.nix deleted file mode 100644 index 37906c32bcb2..000000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/kig.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, boost, python}: -kde { - buildInputs = [ kdelibs boost python ]; - - cmakeFlags = "-DKIG_ENABLE_PYTHON_SCRIPTING=1"; - meta = { - description = "KDE Interactive Geometry"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeedu/kiten.nix b/pkgs/desktops/kde-4.14/kdeedu/kiten.nix deleted file mode 100644 index 939b7a9f77a2..000000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/kiten.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Japanese Reference/Study Tool"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeedu/klettres.nix b/pkgs/desktops/kde-4.14/kdeedu/klettres.nix deleted file mode 100644 index 7a0fa83078e3..000000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/klettres.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A KDE alphabet tutorial"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeedu/kmplot.nix b/pkgs/desktops/kde-4.14/kdeedu/kmplot.nix deleted file mode 100644 index fc7b0578c27b..000000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/kmplot.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A KDE mathematical function plotter"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeedu/kqtquickcharts.nix b/pkgs/desktops/kde-4.14/kdeedu/kqtquickcharts.nix deleted file mode 100644 index 3e243b8c4032..000000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/kqtquickcharts.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Qt Quick 1 plugin for beautiful and interactive charts"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeedu/ktouch.nix b/pkgs/desktops/kde-4.14/kdeedu/ktouch.nix deleted file mode 100644 index 9e606adde336..000000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/ktouch.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libxkbfile }: - -kde { - buildInputs = [ kdelibs libxkbfile ]; - - meta = { - description = "Touch Typing Tutor"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeedu/kturtle.nix b/pkgs/desktops/kde-4.14/kdeedu/kturtle.nix deleted file mode 100644 index 1e1922b1410d..000000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/kturtle.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Educational Programming Environment"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeedu/kwordquiz.nix b/pkgs/desktops/kde-4.14/kdeedu/kwordquiz.nix deleted file mode 100644 index 1b33ba2e469f..000000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/kwordquiz.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libkdeedu }: - -kde { - buildInputs = [ kdelibs libkdeedu ]; - - meta = { - description = "Flash Card Trainer"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeedu/libkdeedu.nix b/pkgs/desktops/kde-4.14/kdeedu/libkdeedu.nix deleted file mode 100644 index def6c85fefe2..000000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/libkdeedu.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Libraries used by KDE Education applications"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeedu/pairs.nix b/pkgs/desktops/kde-4.14/kdeedu/pairs.nix deleted file mode 100644 index 36c4aba9604b..000000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/pairs.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A memory and pairs game"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeedu/parley.nix b/pkgs/desktops/kde-4.14/kdeedu/parley.nix deleted file mode 100644 index f9f86dde150d..000000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/parley.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libkdeedu, attica }: - -kde { - buildInputs = [ kdelibs libkdeedu attica ]; - - meta = { - description = "Vocabulary Trainer"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeedu/rocs.nix b/pkgs/desktops/kde-4.14/kdeedu/rocs.nix deleted file mode 100644 index 76131d8f0f0f..000000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/rocs.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ kde, kdelibs, boost, grantlee }: - -kde { - patches = [ ../files/rocs-0001-duplicate-add_test.patch ]; - - buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) grantlee ]; - - NIX_CFLAGS_COMPILE = "-fexceptions"; - - meta = { - description = "A KDE graph theory viewer"; - kde = { - name = "rocs"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeedu/step.nix b/pkgs/desktops/kde-4.14/kdeedu/step.nix deleted file mode 100644 index 95e991e84815..000000000000 --- a/pkgs/desktops/kde-4.14/kdeedu/step.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kde, kdelibs, gsl, libqalculate, eigen2, pkgconfig }: - -kde { - - buildInputs = [ kdelibs gsl libqalculate eigen2 ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "A KDE interactive physical simulator"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/bomber.nix b/pkgs/desktops/kde-4.14/kdegames/bomber.nix deleted file mode 100644 index 542ff24f5e65..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/bomber.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A single player arcade game. The player is invading various cities in a plane that is decreasing in height"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/bovo.nix b/pkgs/desktops/kde-4.14/kdegames/bovo.nix deleted file mode 100644 index 89dff46129b6..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/bovo.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A Gomoku (from Japanese 五目並べ - lit. \"five points\") like game for two players, where the opponents alternate in placing their respective pictogram on the game board"; - }; - -} diff --git a/pkgs/desktops/kde-4.14/kdegames/granatier.nix b/pkgs/desktops/kde-4.14/kdegames/granatier.nix deleted file mode 100644 index 50c3bf985b5b..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/granatier.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A clone of the classic Bomberman game, inspired by the work of the Clanbomber clone"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/kajongg.nix b/pkgs/desktops/kde-4.14/kdegames/kajongg.nix deleted file mode 100644 index cea4fb38b4fb..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/kajongg.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs, libkdegames, pythonPackages, sqlite, pykde4 }: -kde rec { - - buildInputs = [ kdelibs libkdegames pythonPackages.python pythonPackages.wrapPython sqlite ] ++ pythonPath; - - pythonPath = [ pythonPackages.twisted pykde4 ]; - - postInstall = "wrapPythonPrograms"; - - meta = { - description = "An ancient Chinese board game for 4 players"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/kapman.nix b/pkgs/desktops/kde-4.14/kdegames/kapman.nix deleted file mode 100644 index 616533911ff8..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/kapman.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A clone of the well known game Pac-Man"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/katomic.nix b/pkgs/desktops/kde-4.14/kdegames/katomic.nix deleted file mode 100644 index 3f7c1343289a..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/katomic.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A fun and educational puzzle game built around molecular geometry"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix b/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix deleted file mode 100644 index 1e20cf0051ea..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A game of hide and seek played on an grid of boxes, where the player shoots rays into the grid to deduce the positions of hidden objects"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/kblocks.nix b/pkgs/desktops/kde-4.14/kdegames/kblocks.nix deleted file mode 100644 index 08e8c62d2629..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/kblocks.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A classic single player falling blocks puzzle game"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/kbounce.nix b/pkgs/desktops/kde-4.14/kdegames/kbounce.nix deleted file mode 100644 index 291e4c65a43a..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/kbounce.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A single player arcade game with the elements of puzzle"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix b/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix deleted file mode 100644 index 4c5b2f62852f..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A Breakout-like game. Its object is to destroy as many bricks as possible without losing the ball"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix b/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix deleted file mode 100644 index b21a945a64b9..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A single player puzzle game. The object of the game is to build lines of three similar diamonds"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix b/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix deleted file mode 100644 index 6504d069660b..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A board game for two players based on the Connect-Four game"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix b/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix deleted file mode 100644 index 86aff7e77ace..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "An action game where the hero runs through a maze, climbs stairs, dig holes and dodges enemies in order to collect all the gold nuggets and escape to the next level"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/kigo.nix b/pkgs/desktops/kde-4.14/kdegames/kigo.nix deleted file mode 100644 index e417e89a0078..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/kigo.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "An open-source implementation of the popular Go game"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/killbots.nix b/pkgs/desktops/kde-4.14/kdegames/killbots.nix deleted file mode 100644 index 9d8b307be756..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/killbots.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A simple game of evading killer robots"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/kiriki.nix b/pkgs/desktops/kde-4.14/kdegames/kiriki.nix deleted file mode 100644 index 433991abd75b..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/kiriki.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "An addictive and fun dice game, designed to be played by as many as six players"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix b/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix deleted file mode 100644 index 888dba71b662..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A simple dice driven tactical game"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/klickety.nix b/pkgs/desktops/kde-4.14/kdegames/klickety.nix deleted file mode 100644 index 87415f9a4f81..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/klickety.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A puzzle game where the player removes groups of colored marbles to clear the board"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/klines.nix b/pkgs/desktops/kde-4.14/kdegames/klines.nix deleted file mode 100644 index e5c32d3fa9ab..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/klines.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A simple but highly addictive one player game. The player has to move the colored balls around the game board, gathering them into the lines of the same color by five"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix b/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix deleted file mode 100644 index 6aca3c229946..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames, libkmahjongg }: -kde { - buildInputs = [ kdelibs libkdegames libkmahjongg ]; - meta = { - description = "The tiles are scrambled and staked on top of each other to resemble a certain shape. The player is then expected to remove all the tiles off the game board by locating each tile's matching pair"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/kmines.nix b/pkgs/desktops/kde-4.14/kdegames/kmines.nix deleted file mode 100644 index c02a61506d75..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/kmines.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A classic Minesweeper game"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix b/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix deleted file mode 100644 index aed9b48511ac..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A Battle Ship game"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix b/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix deleted file mode 100644 index d7a80f133168..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A small game where you have to build up a computer network by rotating the wires to connect the terminals to the server"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/kolf.nix b/pkgs/desktops/kde-4.14/kdegames/kolf.nix deleted file mode 100644 index 67a75cb9a36f..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/kolf.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A miniature golf game"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/kollision.nix b/pkgs/desktops/kde-4.14/kdegames/kollision.nix deleted file mode 100644 index b0911d093ddd..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/kollision.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A simple ball dodging game"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/konquest.nix b/pkgs/desktops/kde-4.14/kdegames/konquest.nix deleted file mode 100644 index 974730a46d0b..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/konquest.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "The KDE version of Gnu-Lactic Konquest"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/kpat.nix b/pkgs/desktops/kde-4.14/kdegames/kpat.nix deleted file mode 100644 index f33ddfb8570c..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/kpat.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ kde, kdelibs, libkdegames, shared_mime_info }: -kde { - buildInputs = [ kdelibs libkdegames ]; - nativeBuildInputs = [ shared_mime_info ]; - meta = { - description = "A relaxing card sorting game"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/kreversi.nix b/pkgs/desktops/kde-4.14/kdegames/kreversi.nix deleted file mode 100644 index 065ee4bb657c..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/kreversi.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A simple one player strategy game played against the computer. If a player's piece is captured by an opposing player, that piece is turned over to reveal the color of that player"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/kshisen.nix b/pkgs/desktops/kde-4.14/kdegames/kshisen.nix deleted file mode 100644 index 085b91584c70..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/kshisen.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames, libkmahjongg }: -kde { - buildInputs = [ kdelibs libkdegames libkmahjongg ]; - meta = { - description = "A solitaire-like game played using the standard set of Mahjong tiles"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/ksirk.nix b/pkgs/desktops/kde-4.14/kdegames/ksirk.nix deleted file mode 100644 index bfdd8f358dd1..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/ksirk.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames, qca2 }: -kde { - buildInputs = [ kdelibs libkdegames qca2 ]; - meta = { - description = "A computerized version of the well known strategic board game Risk"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix b/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix deleted file mode 100644 index ce5e75336c97..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A simple Tron-Clone"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix b/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix deleted file mode 100644 index 692eb1c085af..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "Each of two possible players control a satellite spaceship orbiting the sun. As the game progresses players have to eliminate the opponent's spacecraft with bullets or mines"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/ksquares.nix b/pkgs/desktops/kde-4.14/kdegames/ksquares.nix deleted file mode 100644 index 7cad6bf0e5ae..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/ksquares.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A game modeled after the well known pen and paper based game of Dots and Boxes"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix b/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix deleted file mode 100644 index 72a6a72b66d5..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A logic-based symbol placement puzzle"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix b/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix deleted file mode 100644 index a4480864fd8b..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A simple constructor game suitable for children and adults alike"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/kubrick.nix b/pkgs/desktops/kde-4.14/kdegames/kubrick.nix deleted file mode 100644 index f80cf4a8b356..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/kubrick.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A game based on the Rubik's Cube™ puzzle"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/libkdegames.nix b/pkgs/desktops/kde-4.14/kdegames/libkdegames.nix deleted file mode 100644 index 3819dcdc9ae2..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/libkdegames.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, openal, libsndfile }: -kde { - buildInputs = [ kdelibs openal libsndfile ]; - meta = { - description = "KDE games library"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix b/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix deleted file mode 100644 index d7687c1435f7..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A library for KMahjongg game"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/lskat.nix b/pkgs/desktops/kde-4.14/kdegames/lskat.nix deleted file mode 100644 index d3e8268784bb..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/lskat.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A fun and engaging card game for two players, where the second player is either live opponent, or a built in artificial intelligence"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/palapeli.nix b/pkgs/desktops/kde-4.14/kdegames/palapeli.nix deleted file mode 100644 index a73fcf100eb7..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/palapeli.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs, libkdegames, shared_mime_info }: -kde { - -# TODO: package qvoronoi - - nativeBuildInputs = [ shared_mime_info ]; - - buildInputs = [ kdelibs libkdegames ]; - - meta = { - description = "A single-player jigsaw puzzle game"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegames/picmi.nix b/pkgs/desktops/kde-4.14/kdegames/picmi.nix deleted file mode 100644 index 77dcdcf48dce..000000000000 --- a/pkgs/desktops/kde-4.14/kdegames/picmi.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkdegames }: -kde { - buildInputs = [ kdelibs libkdegames ]; - meta = { - description = "A single player logic-based puzzle game"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.14/kdegraphics/gwenview.nix deleted file mode 100644 index 66a7c79a42bc..000000000000 --- a/pkgs/desktops/kde-4.14/kdegraphics/gwenview.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, kde, kdelibs, exiv2, kde_baseapps, libkipi, nepomuk_core -, libjpeg, pkgconfig, kactivities, lcms2, baloo, kfilemetadata, libkdcraw }: - -kde { - - buildInputs = - [ kdelibs exiv2 nepomuk_core kactivities kde_baseapps libkipi libjpeg lcms2 - baloo kfilemetadata libkdcraw ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "Gwenview, the KDE image viewer"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kamera.nix b/pkgs/desktops/kde-4.14/kdegraphics/kamera.nix deleted file mode 100644 index d9aa11c54afa..000000000000 --- a/pkgs/desktops/kde-4.14/kdegraphics/kamera.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, libgphoto2 }: - -kde { - buildInputs = [ kdelibs libgphoto2 ]; - - meta = { - description = "KDE camera interface library"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.14/kdegraphics/kcolorchooser.nix deleted file mode 100644 index e06c1b5d307c..000000000000 --- a/pkgs/desktops/kde-4.14/kdegraphics/kcolorchooser.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A small utility to select a color"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-mobipocket.nix b/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-mobipocket.nix deleted file mode 100644 index e834762feb52..000000000000 --- a/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-mobipocket.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, okular }: - -kde { - buildInputs = [ kdelibs okular ]; - - meta = { - description = "A collection of plugins to handle mobipocket files"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-strigi-analyzer.nix b/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-strigi-analyzer.nix deleted file mode 100644 index d9d35808ac50..000000000000 --- a/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-strigi-analyzer.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, libtiff }: - -kde { - buildInputs = [ kdelibs libtiff ]; - - meta = { - description = "Strigi analyzers for various graphics file formats"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-thumbnailers.nix deleted file mode 100644 index d6207689512f..000000000000 --- a/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-thumbnailers.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ stdenv, kde, kdelibs, libkexiv2, libkdcraw, pkgconfig }: - -kde { - - buildInputs = [ kdelibs libkexiv2 libkdcraw ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "Thumbnailers for various graphics file formats"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kgamma.nix b/pkgs/desktops/kde-4.14/kdegraphics/kgamma.nix deleted file mode 100644 index 016312c199e5..000000000000 --- a/pkgs/desktops/kde-4.14/kdegraphics/kgamma.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, libXxf86vm }: - -kde { - buildInputs = [ kdelibs libXxf86vm ]; - - meta = { - description = "KDE monitor calibration tool"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kolourpaint.nix b/pkgs/desktops/kde-4.14/kdegraphics/kolourpaint.nix deleted file mode 100644 index ecf34e5ae9e5..000000000000 --- a/pkgs/desktops/kde-4.14/kdegraphics/kolourpaint.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, qimageblitz }: - -kde { - buildInputs = [ kdelibs qimageblitz ]; - - meta = { - description = "KDE paint program"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kruler.nix b/pkgs/desktops/kde-4.14/kdegraphics/kruler.nix deleted file mode 100644 index 209331d9e83d..000000000000 --- a/pkgs/desktops/kde-4.14/kdegraphics/kruler.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE screen ruler"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegraphics/ksaneplugin.nix b/pkgs/desktops/kde-4.14/kdegraphics/ksaneplugin.nix deleted file mode 100644 index f541c4bdb4df..000000000000 --- a/pkgs/desktops/kde-4.14/kdegraphics/ksaneplugin.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, libksane }: - -kde { - buildInputs = [ kdelibs libksane ]; - - meta = { - description = "A KScan plugin that implements the scanning through libksane"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegraphics/ksnapshot.nix b/pkgs/desktops/kde-4.14/kdegraphics/ksnapshot.nix deleted file mode 100644 index a9897d270bb6..000000000000 --- a/pkgs/desktops/kde-4.14/kdegraphics/ksnapshot.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, libkipi }: - -kde { - buildInputs = [ kdelibs libkipi ]; - - meta = { - description = "KDE screenshot utility"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegraphics/libkipi.nix b/pkgs/desktops/kde-4.14/kdegraphics/libkipi.nix deleted file mode 100644 index 65e6c52bd44f..000000000000 --- a/pkgs/desktops/kde-4.14/kdegraphics/libkipi.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Interface library to kipi-plugins"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.14/kdegraphics/libksane.nix deleted file mode 100644 index d55419f02c75..000000000000 --- a/pkgs/desktops/kde-4.14/kdegraphics/libksane.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, kde, kdelibs, sane-backends }: - -kde { - buildInputs = [ kdelibs sane-backends ]; - - meta = { - description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdelibs/baloo-widgets.nix b/pkgs/desktops/kde-4.14/kdelibs/baloo-widgets.nix deleted file mode 100644 index 46567b5e2a71..000000000000 --- a/pkgs/desktops/kde-4.14/kdelibs/baloo-widgets.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, kde, kdelibs, baloo, kfilemetadata, pkgconfig }: - -kde { - buildInputs = [ kdelibs baloo kfilemetadata ]; - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "Baloo Widgets"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix deleted file mode 100644 index b990628889b6..000000000000 --- a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, poppler_qt4 -, pkgconfig, doxygen, ebook_tools, automoc4, cmake, perl -}: - -kde { - -# TODO: qmobipocket - - buildInputs = [ - kdelibs soprano shared_desktop_ontologies taglib exiv2 ffmpeg - poppler_qt4 ebook_tools - ]; - - nativeBuildInputs = [ automoc4 cmake perl pkgconfig doxygen ]; - - meta = { - description = "NEPOMUK core"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-widgets.nix b/pkgs/desktops/kde-4.14/kdelibs/nepomuk-widgets.nix deleted file mode 100644 index b0fc5ad8900d..000000000000 --- a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-widgets.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, kde, kdelibs, nepomuk_core }: - -kde { - - buildInputs = [ kdelibs nepomuk_core ]; - - meta = { - description = "NEPOMUK Widgets"; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix b/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix deleted file mode 100644 index 20e63baf723f..000000000000 --- a/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libkcompactdisc, cdparanoia, libkcddb, libvorbis, flac, lame }: -kde { - buildInputs = [ kdelibs libkcompactdisc cdparanoia libkcddb libvorbis flac lame ]; - meta = { - description = "Transparent audio CD access for applications using the KDE Platform"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix b/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix deleted file mode 100644 index bb44c3b7234e..000000000000 --- a/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - meta = { - description = "A multimedia player with the focus on simplicity"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix b/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix deleted file mode 100644 index 2311b1dda589..000000000000 --- a/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, ffmpeg }: -kde { - buildInputs = [ kdelibs ffmpeg ]; - meta = { - description = "A video thumbnail generator for KDE file managers like Dolphin and Konqueror"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix b/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix deleted file mode 100644 index 1bf5584de2fa..000000000000 --- a/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, taglib_1_9, libtunepimp }: -kde { - -# TODO: opusfile - - buildInputs = [ kdelibs taglib_1_9 libtunepimp ]; - meta = { - description = "An audio jukebox application"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix b/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix deleted file mode 100644 index 4d36aaf4f68a..000000000000 --- a/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libcanberra, libpulseaudio }: -kde { - buildInputs = [ kdelibs libcanberra libpulseaudio ]; - meta = { - description = "Sound mixer, an application to allow you to change the volume of your sound card"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/kscd.nix b/pkgs/desktops/kde-4.14/kdemultimedia/kscd.nix deleted file mode 100644 index e99ae53935b9..000000000000 --- a/pkgs/desktops/kde-4.14/kdemultimedia/kscd.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs, libmusicbrainz }: -kde { - buildInputs = [ kdelibs libmusicbrainz ]; - meta = { - description = "KDE CD player"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/libkcompactdisc.nix b/pkgs/desktops/kde-4.14/kdemultimedia/libkcompactdisc.nix deleted file mode 100644 index 6ed08af89f33..000000000000 --- a/pkgs/desktops/kde-4.14/kdemultimedia/libkcompactdisc.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - meta = { - description = "KDE library for playing & ripping CDs"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix b/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix deleted file mode 100644 index c34b849f4c92..000000000000 --- a/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ kde, kdelibs }: -kde { - buildInputs = [ kdelibs ]; - meta = { - description = "A video thumbnail generator for KDE"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdenetwork/kdenetwork-filesharing.nix b/pkgs/desktops/kde-4.14/kdenetwork/kdenetwork-filesharing.nix deleted file mode 100644 index 0330511a258b..000000000000 --- a/pkgs/desktops/kde-4.14/kdenetwork/kdenetwork-filesharing.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE properties dialog plugin to share a directory with the local network"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdenetwork/kdenetwork-strigi-analyzers.nix b/pkgs/desktops/kde-4.14/kdenetwork/kdenetwork-strigi-analyzers.nix deleted file mode 100644 index e838d84fc5eb..000000000000 --- a/pkgs/desktops/kde-4.14/kdenetwork/kdenetwork-strigi-analyzers.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, boost }: - -kde { - buildInputs = [ kdelibs boost ]; - - meta = { - description = "Strigi analyzers for various network protocols"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdenetwork/kget.nix b/pkgs/desktops/kde-4.14/kdenetwork/kget.nix deleted file mode 100644 index f986da2de214..000000000000 --- a/pkgs/desktops/kde-4.14/kdenetwork/kget.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ kde, kdelibs, libktorrent, kde_workspace, sqlite, boost -, kde_baseapps, libmms, qca2, nepomuk_core, nepomuk_widgets -, pkgconfig }: - -kde { - -# TODO: QGpgME - - buildInputs = - [ kdelibs libktorrent nepomuk_core nepomuk_widgets sqlite qca2 - libmms kde_baseapps kde_workspace boost ]; - - nativeBuildInputs = [ pkgconfig ]; - - KDEDIRS = libktorrent; - - meta = { - description = "KDE download manager"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix deleted file mode 100644 index f5750d60045f..000000000000 --- a/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ kde, kdelibs, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent, - jasper, libidn, mediastreamer, pkgconfig, libxslt, giflib, - libgadu, boost, qca2, sqlite, jsoncpp, - ortp, srtp, libv4l, fetchurl }: - -kde { - -# TODO: libmeanwhile, xmms, jsoncpp(not found), kleopatra(from kdepim but doesn't install headers?), - - patches = [ - (fetchurl { - name = "kopete.patch"; - url = "https://bugs.kde.org/attachment.cgi?id=91567"; - sha256 = "0a44rjiqzn6v3sywm17d1741sygbvlfnbqadq7qbdj3amny014m1"; - }) - ]; - - buildInputs = [ - kdelibs qca2 mediastreamer libgadu jsoncpp - kdepimlibs qimageblitz sqlite jasper libotr libmsn giflib - libidn libxslt boost - ortp srtp libv4l - ]; - - nativeBuildInputs = [ pkgconfig ]; - - KDEDIRS = libktorrent; - - cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ]; - - meta = { - description = "A KDE multi-protocol IM client"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdenetwork/kppp.nix b/pkgs/desktops/kde-4.14/kdenetwork/kppp.nix deleted file mode 100644 index 4c6bd65769f7..000000000000 --- a/pkgs/desktops/kde-4.14/kdenetwork/kppp.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "PPP(Dial-Up) client tool"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.14/kdenetwork/krdc.nix deleted file mode 100644 index 12cdd4a569c3..000000000000 --- a/pkgs/desktops/kde-4.14/kdenetwork/krdc.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libvncserver, freerdp_legacy, telepathy_qt }: - -kde { - buildInputs = [ kdelibs libvncserver freerdp_legacy telepathy_qt ]; - - meta = { - description = "KDE remote desktop client"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdenetwork/krfb.nix b/pkgs/desktops/kde-4.14/kdenetwork/krfb.nix deleted file mode 100644 index cb4857965a34..000000000000 --- a/pkgs/desktops/kde-4.14/kdenetwork/krfb.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libvncserver, libXdamage, libXtst, libjpeg, telepathy_qt }: - -kde { - buildInputs = [ kdelibs libvncserver libXdamage libXtst libjpeg telepathy_qt ]; - - meta = { - description = "KDE desktop sharing"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdenetwork/zeroconf-ioslave.nix b/pkgs/desktops/kde-4.14/kdenetwork/zeroconf-ioslave.nix deleted file mode 100644 index f65960cc337b..000000000000 --- a/pkgs/desktops/kde-4.14/kdenetwork/zeroconf-ioslave.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE tool that monitors the network for DNS-SD services"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdepim-runtime.nix b/pkgs/desktops/kde-4.14/kdepim-runtime.nix deleted file mode 100644 index e5061a8790af..000000000000 --- a/pkgs/desktops/kde-4.14/kdepim-runtime.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ kde, libxslt, boost, kdepimlibs, akonadi, shared_desktop_ontologies -, shared_mime_info }: - -kde { - -# TODO: libkgapi(2), LibKFbAPI,libkolab, libkolabxml - - buildInputs = [ - kdepimlibs akonadi boost shared_desktop_ontologies - libxslt - ]; - - nativeBuildInputs = [ shared_mime_info ]; - - meta = { - description = "KDE PIM runtime"; - license = "GPL"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdepim.nix b/pkgs/desktops/kde-4.14/kdepim.nix deleted file mode 100644 index df41c85c8ac6..000000000000 --- a/pkgs/desktops/kde-4.14/kdepim.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ kde, boost, gpgme, libassuan, libxslt, kdepimlibs, kdepim_runtime -, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee, prison -, nepomuk_widgets, kactivities, libXScrnSaver, qjson, baloo -, pkgconfig }: - -kde { - -# TODO: LinkGrammar - - buildInputs = - [ kdepimlibs boost shared_desktop_ontologies akonadi nepomuk_widgets - libxslt cyrus_sasl gpgme libassuan grantlee prison kactivities - libXScrnSaver qjson baloo - ]; - - nativeBuildInputs = [ pkgconfig ]; - - propagatedUserEnvPkgs = [ akonadi kdepimlibs kdepim_runtime ]; - - 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; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdepimlibs.nix b/pkgs/desktops/kde-4.14/kdepimlibs.nix index 554d6acd9eb4..5e7643469b64 100644 --- a/pkgs/desktops/kde-4.14/kdepimlibs.nix +++ b/pkgs/desktops/kde-4.14/kdepimlibs.nix @@ -1,5 +1,5 @@ { kde, pkgconfig, boost, cyrus_sasl, gpgme, libical, openldap, prison -, kdelibs, akonadi, libxslt, nepomuk_core +, kdelibs, akonadi, libxslt , shared_mime_info, shared_desktop_ontologies, qjson , automoc4, cmake, perl }: @@ -23,7 +23,7 @@ kde { shared_mime_info ]; - propagatedBuildInputs = [ kdelibs nepomuk_core ]; + propagatedBuildInputs = [ kdelibs ]; # Prevent a dependency on boost.dev. FIXME: move this cmake file to .dev. postInstall = "rm $out/lib/gpgmepp/GpgmeppConfig.cmake"; diff --git a/pkgs/desktops/kde-4.14/kdeplasma-addons.nix b/pkgs/desktops/kde-4.14/kdeplasma-addons.nix deleted file mode 100644 index b4d24f47e490..000000000000 --- a/pkgs/desktops/kde-4.14/kdeplasma-addons.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig -, boost, eigen2, kde_workspace, attica, qca2, qimageblitz -, kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt -, qjson, qoauth, shared_mime_info }: - -kde { - -# TODO: qwt, scim, ibus - - KDEDIRS=marble; - - buildInputs = [ kdelibs boost kde_workspace kdepimlibs attica qjson qoauth - eigen2 qca2 libXtst qimageblitz libqalculate - shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt - ]; - - nativeBuildInputs = [ shared_mime_info ]; - - meta = { - description = "KDE Plasma Addons"; - license = "GPL"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdesdk/cervisia.nix b/pkgs/desktops/kde-4.14/kdesdk/cervisia.nix deleted file mode 100644 index 1dabe46cd429..000000000000 --- a/pkgs/desktops/kde-4.14/kdesdk/cervisia.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A KDE CVS frontend"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdesdk/dolphin-plugins.nix b/pkgs/desktops/kde-4.14/kdesdk/dolphin-plugins.nix deleted file mode 100644 index ad8132a850e5..000000000000 --- a/pkgs/desktops/kde-4.14/kdesdk/dolphin-plugins.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs, kde_baseapps }: - -kde { - - # Needs kdebase for libkonq - buildInputs = [ kdelibs kde_baseapps ]; - - meta = { - description = "Svn, mercurial, git and bazaar plugins for dolphin"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdesdk/kapptemplate.nix b/pkgs/desktops/kde-4.14/kdesdk/kapptemplate.nix deleted file mode 100644 index 391536248dd3..000000000000 --- a/pkgs/desktops/kde-4.14/kdesdk/kapptemplate.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A KDE 4 project template generator"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdesdk/kcachegrind.nix b/pkgs/desktops/kde-4.14/kdesdk/kcachegrind.nix deleted file mode 100644 index 65d410cca48d..000000000000 --- a/pkgs/desktops/kde-4.14/kdesdk/kcachegrind.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE Frontend for Callgrind/Cachegrind"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdesdk/kde-dev-scripts.nix b/pkgs/desktops/kde-4.14/kdesdk/kde-dev-scripts.nix deleted file mode 100644 index df81145e5d60..000000000000 --- a/pkgs/desktops/kde-4.14/kdesdk/kde-dev-scripts.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Various scripts to ease KDE development"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix b/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix deleted file mode 100644 index 5d4f83e26562..000000000000 --- a/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs, gcc, libtool }: - -kde { - buildInputs = [ kdelibs libtool ]; - - preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.cc}"; - - meta = { - description = "Various KDE development utilities"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdesdk/kdesdk-kioslaves.nix b/pkgs/desktops/kde-4.14/kdesdk/kdesdk-kioslaves.nix deleted file mode 100644 index 98bbce35a97c..000000000000 --- a/pkgs/desktops/kde-4.14/kdesdk/kdesdk-kioslaves.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ kde, kdelibs, subversionClient, apr, aprutil,perl }: - -kde { - - buildInputs = [ kdelibs subversionClient apr aprutil perl ]; - - cmakeFlags = [ "-DBUILD_perldoc=ON" ]; - - meta = { - description = "Subversion and perldoc kioslaves"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdesdk/kdesdk-strigi-analyzers.nix b/pkgs/desktops/kde-4.14/kdesdk/kdesdk-strigi-analyzers.nix deleted file mode 100644 index 4d579b88ba8a..000000000000 --- a/pkgs/desktops/kde-4.14/kdesdk/kdesdk-strigi-analyzers.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Strigi analyzers for diff, po and ts"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdesdk/kdesdk-thumbnailers.nix b/pkgs/desktops/kde-4.14/kdesdk/kdesdk-thumbnailers.nix deleted file mode 100644 index d707fe9038fe..000000000000 --- a/pkgs/desktops/kde-4.14/kdesdk/kdesdk-thumbnailers.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, gettext }: - -kde { - - buildInputs = [ kdelibs gettext ]; - - meta = { - description = "PO file format thumbnailer"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdesdk/kompare.nix b/pkgs/desktops/kde-4.14/kdesdk/kompare.nix deleted file mode 100644 index 644c7c48dc97..000000000000 --- a/pkgs/desktops/kde-4.14/kdesdk/kompare.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libkomparediff2 }: - -kde { - buildInputs = [ kdelibs libkomparediff2 ]; - - meta = { - description = "A program to view the differences between files and optionally generate a diff"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdesdk/libkomparediff2.nix b/pkgs/desktops/kde-4.14/kdesdk/libkomparediff2.nix deleted file mode 100644 index 5933682c70a0..000000000000 --- a/pkgs/desktops/kde-4.14/kdesdk/libkomparediff2.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A library to compare files and strings"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdesdk/lokalize.nix b/pkgs/desktops/kde-4.14/kdesdk/lokalize.nix deleted file mode 100644 index 1565426eb1fc..000000000000 --- a/pkgs/desktops/kde-4.14/kdesdk/lokalize.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kde, kdelibs, hunspell }: - -kde { - buildInputs = [ kdelibs hunspell ]; - - meta = { - description = "KDE 4 Computer-aided translation system"; - longDescription = '' - Computer-aided translation system. - Do not translate what had already been translated. - ''; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdesdk/okteta.nix b/pkgs/desktops/kde-4.14/kdesdk/okteta.nix deleted file mode 100644 index 77108c76adc3..000000000000 --- a/pkgs/desktops/kde-4.14/kdesdk/okteta.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, kdelibs, qca2, shared_mime_info }: - -kde { - buildInputs = [ kdelibs qca2 ]; - - nativeBuildInputs = [ shared_mime_info ]; - -# TODO: Look what does -DBUILD_mobile add - - enableParallelBuilding = false; - - meta = { - description = "KDE byte editor"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdesdk/poxml.nix b/pkgs/desktops/kde-4.14/kdesdk/poxml.nix deleted file mode 100644 index 6e46c3e3ab4f..000000000000 --- a/pkgs/desktops/kde-4.14/kdesdk/poxml.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, antlr, gettext }: - -kde { - buildInputs = [ kdelibs antlr gettext ]; - - meta = { - description = "Po<->xml tools"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdesdk/umbrello.nix b/pkgs/desktops/kde-4.14/kdesdk/umbrello.nix deleted file mode 100644 index e83a2d9a901b..000000000000 --- a/pkgs/desktops/kde-4.14/kdesdk/umbrello.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libxml2, libxslt, boost }: - -kde { - buildInputs = [ kdelibs libxml2 libxslt boost ]; - - meta = { - description = "Umbrello UML modeller"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdetoys/amor.nix b/pkgs/desktops/kde-4.14/kdetoys/amor.nix deleted file mode 100644 index 936d63d544a9..000000000000 --- a/pkgs/desktops/kde-4.14/kdetoys/amor.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE creature for your desktop"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdetoys/kteatime.nix b/pkgs/desktops/kde-4.14/kdetoys/kteatime.nix deleted file mode 100644 index dacf54def4b0..000000000000 --- a/pkgs/desktops/kde-4.14/kdetoys/kteatime.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE utility for making a fine cup of tea"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdetoys/ktux.nix b/pkgs/desktops/kde-4.14/kdetoys/ktux.nix deleted file mode 100644 index 108f9be7c722..000000000000 --- a/pkgs/desktops/kde-4.14/kdetoys/ktux.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, kde_workspace }: - -kde { - buildInputs = [ kdelibs kde_workspace ]; - - meta = { - description = "Tux Screen Saver"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeutils/ark.nix b/pkgs/desktops/kde-4.14/kdeutils/ark.nix deleted file mode 100644 index 99844b909fd7..000000000000 --- a/pkgs/desktops/kde-4.14/kdeutils/ark.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ makeWrapper, kde, kdelibs, libarchive, bzip2, kde_baseapps, lzma, qjson -, unzip }: - -kde { - buildInputs = [ - makeWrapper kdelibs kde_baseapps libarchive bzip2 lzma qjson - ]; - - postInstall = '' - wrapProgram $out/bin/ark \ - --prefix PATH ":" "${unzip}/bin" - ''; - - meta = { - description = "KDE Archiving Tool"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeutils/filelight.nix b/pkgs/desktops/kde-4.14/kdeutils/filelight.nix deleted file mode 100644 index 25ecabed27ce..000000000000 --- a/pkgs/desktops/kde-4.14/kdeutils/filelight.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Tool to visualise file and directory sizes"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeutils/kcalc.nix b/pkgs/desktops/kde-4.14/kdeutils/kcalc.nix deleted file mode 100644 index 08b202e8f0e8..000000000000 --- a/pkgs/desktops/kde-4.14/kdeutils/kcalc.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, gmp }: - -kde { - buildInputs = [ kdelibs gmp ]; - - meta = { - description = "KDE Calculator"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeutils/kcharselect.nix b/pkgs/desktops/kde-4.14/kdeutils/kcharselect.nix deleted file mode 100644 index d4c9c06f483d..000000000000 --- a/pkgs/desktops/kde-4.14/kdeutils/kcharselect.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE character selection utility"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeutils/kdf.nix b/pkgs/desktops/kde-4.14/kdeutils/kdf.nix deleted file mode 100644 index 3f9da58d0a62..000000000000 --- a/pkgs/desktops/kde-4.14/kdeutils/kdf.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE free disk space utility"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeutils/kfloppy.nix b/pkgs/desktops/kde-4.14/kdeutils/kfloppy.nix deleted file mode 100644 index 2434a4fa671f..000000000000 --- a/pkgs/desktops/kde-4.14/kdeutils/kfloppy.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Floppy disk formatting utility"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.14/kdeutils/kgpg.nix deleted file mode 100644 index b3f95356d132..000000000000 --- a/pkgs/desktops/kde-4.14/kdeutils/kgpg.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs, kdepimlibs, boost, gpgme }: - -kde { - - buildInputs = [ kdelibs kdepimlibs boost gpgme ]; - - meta = { - description = "Simple KDE GUI for GPG"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeutils/kremotecontrol.nix b/pkgs/desktops/kde-4.14/kdeutils/kremotecontrol.nix deleted file mode 100644 index 70311a789f99..000000000000 --- a/pkgs/desktops/kde-4.14/kdeutils/kremotecontrol.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs, libXtst }: - -kde { - buildInputs = [ kdelibs libXtst ]; - - meta = { - description = "KDE remote control"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeutils/ktimer.nix b/pkgs/desktops/kde-4.14/kdeutils/ktimer.nix deleted file mode 100644 index 5700977349e3..000000000000 --- a/pkgs/desktops/kde-4.14/kdeutils/ktimer.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE Timer"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeutils/kwalletmanager.nix b/pkgs/desktops/kde-4.14/kdeutils/kwalletmanager.nix deleted file mode 100644 index 9ec0e6c0396c..000000000000 --- a/pkgs/desktops/kde-4.14/kdeutils/kwalletmanager.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "KDE Wallet (password storage) management tool"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix b/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix deleted file mode 100644 index b53946fae25d..000000000000 --- a/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ kde, kdelibs -, pythonPackages, cups, pykde4, system-config-printer }: - -let s_c_p = system-config-printer.override { withGUI = false; }; in - -kde rec { - buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython - ] ++ pythonPath; - - pythonPath = [ cups pythonPackages.pyqt4 pykde4 pythonPackages.pycups s_c_p ]; - - # system-config-printer supplies some D-Bus policy that we need. - propagatedUserEnvPkgs = [ s_c_p ]; - - postInstall = "wrapPythonPrograms"; - - meta = { - description = "KDE printer manager"; - longDescription = "Applet to view current print jobs and configure new printers"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeutils/superkaramba.nix b/pkgs/desktops/kde-4.14/kdeutils/superkaramba.nix deleted file mode 100644 index cbe7a2856062..000000000000 --- a/pkgs/desktops/kde-4.14/kdeutils/superkaramba.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kde, kdelibs, qimageblitz, python }: - -kde { - buildInputs = [ kdelibs qimageblitz python ]; - - cmakeFlags = [ "-DBUILD_icons=TRUE" "-DBUILD_plasma=TRUE" ]; - - meta = { - description = "A KDE Eye-candy Application"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdeutils/sweeper.nix b/pkgs/desktops/kde-4.14/kdeutils/sweeper.nix deleted file mode 100644 index 78d56c7df30e..000000000000 --- a/pkgs/desktops/kde-4.14/kdeutils/sweeper.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Helps clean unwanted traces the user leaves on the system"; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdewebdev/kfilereplace.nix b/pkgs/desktops/kde-4.14/kdewebdev/kfilereplace.nix deleted file mode 100644 index 55e37809e07b..000000000000 --- a/pkgs/desktops/kde-4.14/kdewebdev/kfilereplace.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "Batch search and replace tool"; - homepage = http://www.kdewebdev.org; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdewebdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.14/kdewebdev/kimagemapeditor.nix deleted file mode 100644 index 6d22f72461f9..000000000000 --- a/pkgs/desktops/kde-4.14/kdewebdev/kimagemapeditor.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "An HTML imagemap editor"; - homepage = http://www.nongnu.org/kimagemap/; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix deleted file mode 100644 index b593c952219c..000000000000 --- a/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ kde, kdelibs, libxml2, libxslt, kdepimlibs, html-tidy, boost }: - -kde { - -# todo: ruby19 is not found by the build system. not linking against ruby18 due to it being too old - - postPatch = '' - substituteInPlace klinkstatus/src/tidy/tidyx.h \ - --replace buffio.h tidybuffio.h - ''; - - buildInputs = [ kdelibs kdepimlibs html-tidy boost ]; - - meta = { - description = "A KDE link checker"; - homepage = http://klinkstatus.kdewebdev.org; - }; -} diff --git a/pkgs/desktops/kde-4.14/kdewebdev/kommander.nix b/pkgs/desktops/kde-4.14/kdewebdev/kommander.nix deleted file mode 100644 index d5f4337f714d..000000000000 --- a/pkgs/desktops/kde-4.14/kdewebdev/kommander.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ kde, kdelibs }: - -kde { - buildInputs = [ kdelibs ]; - - meta = { - description = "A graphical editor of scripted dialogs"; - }; -} diff --git a/pkgs/desktops/kde-4.14/oxygen-icons.nix b/pkgs/desktops/kde-4.14/oxygen-icons.nix deleted file mode 100644 index 270707f84928..000000000000 --- a/pkgs/desktops/kde-4.14/oxygen-icons.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kde, cmake }: - -kde { - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "156ghknzdrlf48602lcap5vpp691cyba0igdbw53wfqfpaqkap28"; - - nativeBuildInputs = [ cmake ]; - - meta = { - description = "KDE Oxygen theme icons"; - longDescription = "Icons for KDE's default theme"; - license = "GPL"; - }; -} diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix deleted file mode 100644 index 549be9a71f50..000000000000 --- a/pkgs/development/libraries/kdevplatform/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, cmake, kdelibs, subversion, qt4, automoc4, phonon, - gettext, pkgconfig, apr, aprutil, boost, qjson, grantlee }: - -stdenv.mkDerivation rec { - name = "kdevplatform-1.7.3"; - - src = fetchurl { - url = "mirror://kde/stable/kdevelop/4.7.3/src/${name}.tar.bz2"; - sha256 = "195134bde11672de38838f4b341ed28c58042374ca12beedacca9d30e6ab4a2b"; - }; - - patches = [ - ./gettext.patch # build error caused by CMake update - ./dependency.patch # build error: https://phabricator.kde.org/D1160 - ]; - - propagatedBuildInputs = [ kdelibs qt4 phonon ]; - buildInputs = [ apr aprutil subversion boost qjson grantlee ]; - - nativeBuildInputs = [ cmake automoc4 gettext pkgconfig ]; - - enableParallelBuilding = false; - - meta = with stdenv.lib; { - maintainers = [ maintainers.ambrop72 ]; - platforms = platforms.linux; - description = "KDE libraries for IDE-like programs"; - longDescription = '' - A free, opensource set of libraries that can be used as a foundation for - IDE-like programs. It is programing-language independent, and is planned - to be used by programs like: KDevelop, Quanta, Kile, KTechLab ... etc." - ''; - homepage = https://www.kdevelop.org; - }; -} diff --git a/pkgs/development/libraries/kdevplatform/dependency.patch b/pkgs/development/libraries/kdevplatform/dependency.patch deleted file mode 100644 index 3205b4cab675..000000000000 --- a/pkgs/development/libraries/kdevplatform/dependency.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/plugins/filetemplates/CMakeLists.txt b/plugins/filetemplates/CMakeLists.txt ---- a/plugins/filetemplates/CMakeLists.txt -+++ b/plugins/filetemplates/CMakeLists.txt -@@ -81,6 +81,7 @@ - ) - - kde4_add_executable(testfiletemplates ${test_srcs}) -+add_dependencies(testfiletemplates kdevfiletemplates) - - target_link_libraries(testfiletemplates - ${KDE4_KDECORE_LIBS} - diff --git a/pkgs/development/libraries/kdevplatform/gettext.patch b/pkgs/development/libraries/kdevplatform/gettext.patch deleted file mode 100644 index 733a542e0c8b..000000000000 --- a/pkgs/development/libraries/kdevplatform/gettext.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff -urN kdevplatform-1.7.3.orig/po/CMakeLists.txt kdevplatform-1.7.3/po/CMakeLists.txt ---- kdevplatform-1.7.3.orig/po/CMakeLists.txt 2016-03-04 23:25:30.102112596 +0100 -+++ kdevplatform-1.7.3/po/CMakeLists.txt 2016-03-04 23:26:06.242570024 +0100 -@@ -1,3 +1,4 @@ -+cmake_policy(SET CMP0002 OLD) - find_package(Gettext REQUIRED) - if (NOT GETTEXT_MSGMERGE_EXECUTABLE) - MESSAGE(FATAL_ERROR "Please install msgmerge binary") diff --git a/pkgs/development/libraries/libalkimia/default.nix b/pkgs/development/libraries/libalkimia/default.nix deleted file mode 100644 index bcb699da828f..000000000000 --- a/pkgs/development/libraries/libalkimia/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs, gmpxx }: - -stdenv.mkDerivation rec { - name = "libalkimia-4.3.2"; - - src = fetchurl { - url = "http://kde-apps.org/CONTENT/content-files/137323-${name}.tar.bz2"; - sha256 = "1p7bzi6mz5ymsfsxikk8m1cvi35zirb4fps9axkqlm6mjbwrldv4"; - }; - - patchPhase = "sed -e 's/KDE4_DATA_DIR/DATA_INSTALL_DIR/' -i CMakeLists.txt"; - nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; - buildInputs = [ kdelibs gmpxx ]; - - meta = { - maintainers = [ stdenv.lib.maintainers.urkud ]; - inherit (kdelibs.meta) platforms; - }; -} diff --git a/pkgs/development/libraries/libktorrent/5.nix b/pkgs/development/libraries/libktorrent/5.nix deleted file mode 100644 index e5406d3a2a58..000000000000 --- a/pkgs/development/libraries/libktorrent/5.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, cmake, ecm -, karchive, kcrash, ki18n, kio, solid -, boost, gmp, qca-qt5, libgcrypt -}: - -stdenv.mkDerivation rec { - name = "libktorrent-2.0.1"; - - src = fetchurl { - url = http://download.kde.org/stable/ktorrent/5.0/libktorrent-2.0.1.tar.xz; - sha256 = "0hiz4wm8jkymp24r6f1g8svj3pw9qspbjajf512m3j8s3bhrw3f7"; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ cmake ecm ]; - buildInputs = [ karchive kcrash ki18n kio solid qca-qt5 libgcrypt ]; - - propagatedBuildInputs = [ gmp boost ]; - - enableParallelBuilding = true; - - meta = { - description = "A BitTorrent library used by KTorrent"; - homepage = https://www.kde.org/applications/internet/ktorrent/; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix index 9e7fb0a0b3d5..e5406d3a2a58 100644 --- a/pkgs/development/libraries/libktorrent/default.nix +++ b/pkgs/development/libraries/libktorrent/default.nix @@ -1,28 +1,29 @@ -{ stdenv, fetchurl, kdelibs, cmake, gmp, qca2, boost, gettext, qt4, automoc4 -, phonon, libgcrypt }: +{ stdenv, fetchurl, cmake, ecm +, karchive, kcrash, ki18n, kio, solid +, boost, gmp, qca-qt5, libgcrypt +}: -let - mp_ = "3.1"; - version = "1.${mp_}"; - version4 = "4.${mp_}"; -in stdenv.mkDerivation rec { - name = pname + "-" + version; - pname = "libktorrent"; + name = "libktorrent-2.0.1"; src = fetchurl { - url = "${meta.homepage}/downloads/${version4}/${name}.tar.bz2"; - sha256 = "2fe11ccb4bf2028c3da11e52cde890f1b3a90560e548eac89a4f8e1558b09725"; + url = http://download.kde.org/stable/ktorrent/5.0/libktorrent-2.0.1.tar.xz; + sha256 = "0hiz4wm8jkymp24r6f1g8svj3pw9qspbjajf512m3j8s3bhrw3f7"; }; - nativeBuildInputs = [ cmake automoc4 gettext ]; - buildInputs = [ kdelibs phonon gmp qca2 boost libgcrypt ]; + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake ecm ]; + buildInputs = [ karchive kcrash ki18n kio solid qca-qt5 libgcrypt ]; + + propagatedBuildInputs = [ gmp boost ]; enableParallelBuilding = true; meta = { description = "A BitTorrent library used by KTorrent"; - homepage = http://ktorrent.pwsp.net; - inherit (kdelibs.meta) platforms; + homepage = https://www.kde.org/applications/internet/ktorrent/; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libkvkontakte/default.nix b/pkgs/development/libraries/libkvkontakte/default.nix deleted file mode 100644 index e43116aebc19..000000000000 --- a/pkgs/development/libraries/libkvkontakte/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchgit, automoc4, cmake, pkgconfig, qjson, kdelibs }: - -stdenv.mkDerivation { - name = "libkvkontakte-1.0-pre20120103"; - - src = fetchgit { - url = git://anongit.kde.org/libkvkontakte; - rev = "4024f69cf54625dbe5dc2e2d811a996774a669ff"; - sha256 = "1ly95bc72a4zjqhr03liciqpi2hp8x4gqzm4gzr8alfysv2jvxbb"; - }; - - nativeBuildInputs = [ automoc4 cmake pkgconfig ]; - buildInputs = [ qjson kdelibs ]; - - meta = { - homepage = https://projects.kde.org/projects/extragear/libs/libkvkontakte; - description = "KDE library for interaction with vkontakte.ru social network via its open API"; - maintainers = [ stdenv.lib.maintainers.urkud ]; - inherit (kdelibs.meta) platforms; - }; -} diff --git a/pkgs/development/libraries/liblikeback/default.nix b/pkgs/development/libraries/liblikeback/default.nix deleted file mode 100644 index 46f389ec7ada..000000000000 --- a/pkgs/development/libraries/liblikeback/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchgit, cmake, kdelibs, automoc4 }: - -stdenv.mkDerivation rec { - name = "liblikeback-20110103"; - - src = fetchgit { - url = git://anongit.kde.org/liblikeback.git; - rev = "eeb037ae16b6aad8d73cbd6f57198aa111a88628"; - sha256 = "1p3c8hqfcbhjfyn1kj636kq52nb3vapfakmqvp2wklpljyq38f3z"; - }; - - buildInputs = [ cmake kdelibs automoc4 ]; - - meta = { - description = "Simple feedback button/dialog for KDE 4.x applications"; - homepage = https://projects.kde.org/projects/playground/libs/liblikeback; - maintainers = [ stdenv.lib.maintainers.urkud ]; - inherit (kdelibs.meta) platforms; - }; -} diff --git a/pkgs/development/libraries/libmm-qt/default.nix b/pkgs/development/libraries/libmm-qt/default.nix deleted file mode 100644 index 3515d8388a27..000000000000 --- a/pkgs/development/libraries/libmm-qt/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, cmake, pkgconfig, qt4, doxygen, modemmanager }: - -let - pname = "libmm-qt"; - version = "1.0.1"; - name = "${pname}-${version}"; -in -stdenv.mkDerivation { - inherit name; - - buildInputs = [ - cmake - pkgconfig - qt4 - doxygen - ]; - - propagatedBuildInputs = [ modemmanager ]; - - src = fetchurl { - url = "mirror://kde/unstable/modemmanager-qt/${version}/src/${name}-1.tar.xz"; - sha256 = "0ad57815a904ddb2660a7327c0bda5da47a2a60ce57b2b12f4aaff99b174f74a"; - }; - - meta = with stdenv.lib; { - homepage = "https://projects.kde.org/projects/extragear/libs/libmm-qt"; - description = "Qt wrapper for ModemManager DBus API"; - license = licenses.lgpl21; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libnm-qt/default.nix b/pkgs/development/libraries/libnm-qt/default.nix deleted file mode 100644 index b9d033235cb4..000000000000 --- a/pkgs/development/libraries/libnm-qt/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, cmake, pkgconfig, qt4, networkmanager, libmm-qt }: - -let - pname = "libnm-qt"; - version = "0.9.8.2"; - name = "${pname}-${version}"; -in -stdenv.mkDerivation { - inherit name; - - buildInputs = [ - cmake - pkgconfig - qt4 - networkmanager - ]; - - cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; - - propagatedBuildInputs = [ libmm-qt ]; - - src = fetchurl { - url = "mirror://kde/unstable/networkmanager-qt/${version}/src/${name}.tar.xz"; - sha256 = "118fa4732536677f889b2776ec45bd0c726f26abcb8e8b6f8dfcaee265475f33"; - }; - - meta = with stdenv.lib; { - homepage = "https://projects.kde.org/projects/extragear/libs/libnm-qt"; - description = "Qt wrapper for NetworkManager DBus API"; - license = licenses.lgpl21; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/mlt/qt-4.nix b/pkgs/development/libraries/mlt/qt-4.nix deleted file mode 100644 index 2bb709612b44..000000000000 --- a/pkgs/development/libraries/mlt/qt-4.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate -, libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt, sox -}: - -stdenv.mkDerivation rec { - name = "mlt-${version}"; - version = "0.9.6"; - - src = fetchurl { - url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz"; - sha256 = "0s8ypg0q50zfcmq527y8cbdvzxhiqidm1923k28ar8jqmjp45ssh"; - }; - - buildInputs = [ - SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 - makeWrapper movit pkgconfig qt sox - ]; - - # Mostly taken from: - # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine - configureFlags = [ - "--avformat-swscale" "--enable-gpl" "--enable-gpl" "--enable-gpl3" - "--enable-opengl" - ]; - - enableParallelBuilding = true; - - postInstall = '' - wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 - ''; - - meta = with stdenv.lib; { - description = "Open source multimedia framework, designed for television broadcasting"; - homepage = http://www.mltframework.org/; - license = licenses.gpl3; - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/analysis/massif-visualizer/default.nix b/pkgs/development/tools/analysis/massif-visualizer/default.nix index 7342b866a48f..79c826c08fef 100644 --- a/pkgs/development/tools/analysis/massif-visualizer/default.nix +++ b/pkgs/development/tools/analysis/massif-visualizer/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig -, kdelibs, kgraphviewer }: +, kdelibs4, kgraphviewer }: stdenv.mkDerivation rec { name = "massif-visualizer-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; - buildInputs = [ kdelibs kgraphviewer ]; + buildInputs = [ kdelibs4 kgraphviewer ]; meta = with stdenv.lib; { description = "Tool that visualizes massif data generated by valgrind"; diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix deleted file mode 100644 index ad13b5f17ab6..000000000000 --- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, - cmake, dbus_glib, glib, gtk2, gdk_pixbuf, pkgconfig, xorg }: - -stdenv.mkDerivation rec { - version = "1.4.6"; - name = "oxygen-gtk2-${version}"; - - src = fetchurl { - url = "mirror://kde/stable/oxygen-gtk2/${version}/src/${name}.tar.bz2"; - sha256 = "09mz4szsz3yswbj0nbw6qzlc5bc4id0f9r6ifm60b5nc8x1l72d2"; - }; - - buildInputs = [ cmake dbus_glib glib gtk2 gdk_pixbuf - pkgconfig xorg.libXau xorg.libXdmcp xorg.libpthreadstubs - xorg.libxcb xorg.pixman ]; - - meta = with stdenv.lib; { - description = "Port of the default KDE widget theme (Oxygen), to gtk"; - homepage = https://projects.kde.org/projects/playground/artwork/oxygen-gtk; - license = licenses.lgpl2; - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/misc/themes/gtk3/oxygen-gtk3/default.nix b/pkgs/misc/themes/gtk3/oxygen-gtk3/default.nix deleted file mode 100644 index 2cceee62447d..000000000000 --- a/pkgs/misc/themes/gtk3/oxygen-gtk3/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl -, cmake, dbus_glib, glib, gtk3, gdk_pixbuf, pkgconfig, xorg }: - -stdenv.mkDerivation rec { - version = "1.4.1"; - name = "oxygen-gtk3-${version}"; - - src = fetchurl { - url = "mirror://kde/stable/oxygen-gtk3/${version}/src/${name}.tar.bz2"; - sha256 = "0pd7wjzh5xgd24yg6b2avaiz1aq6rmh13d7c0jclffkmhmy24r0f"; - }; - - buildInputs = [ cmake dbus_glib glib gtk3 gdk_pixbuf - pkgconfig xorg.libXau xorg.libXdmcp xorg.libpthreadstubs - xorg.libxcb xorg.pixman ]; - - meta = with stdenv.lib; { - description = "Port of the default KDE widget theme (Oxygen), to gtk 3"; - homepage = https://projects.kde.org/projects/playground/artwork/oxygen-gtk; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix deleted file mode 100644 index cc11aab81cd8..000000000000 --- a/pkgs/misc/themes/qtcurve/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig -, gtk2, kde_workspace, kdelibs # Toolkit dependencies -, libpthreadstubs, libXdmcp, libxcb, xorg # X11 dependencies -}: - -stdenv.mkDerivation { - name = "qtcurve-1.8.18"; - src = fetchurl { - url = "https://github.com/QtCurve/qtcurve/archive/1.8.18.tar.gz"; - sha256 = "19kk11hgi6md1cl0hr0pklcczbl66jczahlkf5fr8j59ljgpr6c5"; - }; - - nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; - - buildInputs = [ - gtk2 - kde_workspace - kdelibs - libpthreadstubs - libXdmcp - libxcb - pkgconfig - xorg.libxshmfence - ]; - - patches = [ - ./qtcurve-1.8.18-install-paths.patch - ./qtcurve-1.8.18-toolbar-alpha.patch - ]; - - cmakeFlags = '' - -DENABLE_QT5=OFF - -DQTC_QT4_ENABLE_KWIN=ON - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/QtCurve/qtcurve; - description = "Widget styles for Qt4/KDE4 and gtk2"; - platforms = platforms.linux; - license = licenses.lgpl21Plus; - maintainers = [ maintainers.ttuegel ]; - }; -} diff --git a/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-install-paths.patch b/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-install-paths.patch deleted file mode 100644 index 345ac25bbbb0..000000000000 --- a/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-install-paths.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b2be588..4cb9115 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -116,6 +116,7 @@ if(ENABLE_GTK2) - find_package(PkgConfig REQUIRED) - unset(__pkg_config_checked_GTK2 CACHE) - pkg_check_modules(GTK2 REQUIRED gtk+-2.0) -+ set(GTK2_THEME_PREFIX "${CMAKE_INSTALL_PREFIX}") - if(GTK2_THEME_PREFIX) - set(GTK2_PREFIX "${GTK2_THEME_PREFIX}") - elseif(NOT GTK2_PREFIX) -diff --git a/gtk2/style/CMakeLists.txt b/gtk2/style/CMakeLists.txt -index 01e8891..a2c767e 100644 ---- a/gtk2/style/CMakeLists.txt -+++ b/gtk2/style/CMakeLists.txt -@@ -88,6 +88,6 @@ target_link_libraries(qtcurve-gtk2 - qtcurve-utils qtcurve-cairo m) - - install(TARGETS qtcurve-gtk2 LIBRARY DESTINATION -- ${GTK2_LIBDIR}/gtk-2.0/${GTK2_BIN_VERSION}/engines) -+ lib/gtk-2.0/${GTK2_BIN_VERSION}/engines) - install(FILES gtkrc icons3 icons4 map_kde_icons.pl kdeglobals - DESTINATION ${GTK2_THEME_DIR}/gtk-2.0) diff --git a/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-toolbar-alpha.patch b/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-toolbar-alpha.patch deleted file mode 100644 index 85400e6f0f67..000000000000 --- a/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-toolbar-alpha.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/qt4/style/qtcurve.cpp b/qt4/style/qtcurve.cpp -index d7659f5..aede882 100644 ---- a/qt4/style/qtcurve.cpp -+++ b/qt4/style/qtcurve.cpp -@@ -12436,7 +12436,12 @@ Style::drawMenuOrToolBarBackground(const QWidget *widget, QPainter *p, - if (!qtcIsCustomBgnd(&opts) || !qtcIsFlat(app) || - (menu && SHADE_NONE != opts.shadeMenubars)) { - p->save(); -+#if 0 -+ // Revert for now -+ // This is necessary for correct opacity on the menubar but may -+ // break transparent gradient. - p->setCompositionMode(QPainter::CompositionMode_Source); -+#endif - QRect rx(r); - QColor col(menu && (option->state & State_Enabled || - SHADE_NONE != opts.shadeMenubars) ? -diff --git a/qt5/style/qtcurve.cpp b/qt5/style/qtcurve.cpp -index c43b8a3..135eddc 100644 ---- a/qt5/style/qtcurve.cpp -+++ b/qt5/style/qtcurve.cpp -@@ -3398,7 +3398,12 @@ Style::drawMenuOrToolBarBackground(const QWidget *widget, QPainter *p, - if (!qtcIsCustomBgnd(&opts) || !qtcIsFlat(app) || - (menu && opts.shadeMenubars != SHADE_NONE)) { - p->save(); -+#if 0 -+ // Revert for now -+ // This is necessary for correct opacity on the menubar but may -+ // break transparent gradient. - p->setCompositionMode(QPainter::CompositionMode_Source); -+#endif - QRect rx(r); - QColor col(menu && (option->state & State_Enabled || - opts.shadeMenubars != SHADE_NONE) ? diff --git a/pkgs/tools/bluetooth/bluedevil/default.nix b/pkgs/tools/bluetooth/bluedevil/default.nix deleted file mode 100644 index e018972d2aaf..000000000000 --- a/pkgs/tools/bluetooth/bluedevil/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, cmake, automoc4, kdelibs, libbluedevil, shared_mime_info, gettext }: - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - pname = "bluedevil"; - # bluedevil must have the same major version (x.y) as libbluedevil! - # do not update this package without checking libbluedevil - version = "2.1.1"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "1rcx1dfm6sm90pvwyq224a1pph96chrmyiv1rry7zpb3hf2c73gi"; - }; - - buildInputs = [ cmake kdelibs libbluedevil shared_mime_info automoc4 gettext ]; - - meta = with stdenv.lib; { - description = "Bluetooth manager for KDE"; - license = stdenv.lib.licenses.gpl2; - inherit (kdelibs.meta) platforms; - maintainers = [ maintainers.phreedom ]; - }; - -} diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index 4cab54d0b706..9af5de0476a7 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, ncurses, +{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs4, ncurses, cmake, anthy, automoc4, m17n_lib, m17n_db}: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { qt4 gtk2 gtk3 - kdelibs + kdelibs4 ncurses cmake anthy diff --git a/pkgs/tools/misc/colord-kde/0.5.nix b/pkgs/tools/misc/colord-kde/0.5.nix deleted file mode 100644 index 0c8e9d6bceef..000000000000 --- a/pkgs/tools/misc/colord-kde/0.5.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, lib, fetchurl -, extra-cmake-modules, ki18n -, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils -, kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem -, kitemviews, lcms2, libXrandr, qtx11extras -}: - -stdenv.mkDerivation rec { - name = "colord-kde-${version}"; - version = "0.5.0"; - - src = fetchurl { - url = "http://download.kde.org/stable/colord-kde/${version}/src/${name}.tar.xz"; - sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c"; - }; - - nativeBuildInputs = [ extra-cmake-modules ki18n ]; - - buildInputs = [ - kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes - kcmutils kio knotifications plasma-framework kwidgetsaddons - kwindowsystem kitemviews lcms2 libXrandr qtx11extras - ]; - - meta = with lib; { - homepage = "https://projects.kde.org/projects/playground/graphics/colord-kde"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ttuegel ]; - }; -} diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix index 52e1845b300f..0c8e9d6bceef 100644 --- a/pkgs/tools/misc/colord-kde/default.nix +++ b/pkgs/tools/misc/colord-kde/default.nix @@ -1,26 +1,30 @@ -{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig -, colord, libX11, libXrandr, lcms2, kdelibs +{ stdenv, lib, fetchurl +, extra-cmake-modules, ki18n +, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils +, kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem +, kitemviews, lcms2, libXrandr, qtx11extras }: -stdenv.mkDerivation { - name = "colord-kde-0.3.0"; +stdenv.mkDerivation rec { + name = "colord-kde-${version}"; + version = "0.5.0"; src = fetchurl { - url = http://download.kde.org/stable/colord-kde/0.3.0/src/colord-kde-0.3.0.tar.bz2; - sha256 = "ab3cdb7c8c98aa2ee8de32a92f87770e1fbd58eade6471f3f24d932b50b4cf09"; + url = "http://download.kde.org/stable/colord-kde/${version}/src/${name}.tar.xz"; + sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c"; }; - nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; + nativeBuildInputs = [ extra-cmake-modules ki18n ]; - buildInputs = [ colord libX11 libXrandr lcms2 kdelibs ]; + buildInputs = [ + kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes + kcmutils kio knotifications plasma-framework kwidgetsaddons + kwindowsystem kitemviews lcms2 libXrandr qtx11extras + ]; - patches = [ ./fix_check_include_files.patch ]; - patchFlags = [ "-p0" ]; - - enableParallelBuilding = true; - - meta = { - description = "A colord front-end for KDE"; - license = stdenv.lib.licenses.gpl2Plus; + meta = with lib; { + homepage = "https://projects.kde.org/projects/playground/graphics/colord-kde"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ttuegel ]; }; } diff --git a/pkgs/tools/misc/colord-kde/fix_check_include_files.patch b/pkgs/tools/misc/colord-kde/fix_check_include_files.patch deleted file mode 100644 index 16d14a6a647a..000000000000 --- a/pkgs/tools/misc/colord-kde/fix_check_include_files.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- CMakeLists.txt.orig 2013-05-01 05:04:34.000000000 +1000 -+++ CMakeLists.txt 2015-12-10 20:43:51.351800988 +1100 -@@ -9,6 +9,7 @@ - include(FindPkgConfig) - include(KDE4Defaults) -+include(CheckIncludeFiles) - include(ConfigureChecks.cmake) - - message(STATUS "X randr is required, found: " ${XRANDR_1_3_FOUND}) \ No newline at end of file diff --git a/pkgs/tools/misc/kde-gtk-config/default.nix b/pkgs/tools/misc/kde-gtk-config/default.nix deleted file mode 100644 index 41aaad553463..000000000000 --- a/pkgs/tools/misc/kde-gtk-config/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig -, gtk2, gtk3, kdelibs, libxcb, libpthreadstubs, libXdmcp -, glib, gdk_pixbuf -}: - -stdenv.mkDerivation { - name = "kde-gtk-config-2.2.1"; - src = fetchurl { - url = "mirror://kde/stable/kde-gtk-config/2.2.1/src/kde-gtk-config-2.2.1.tar.xz"; - sha256 = "11aw86jcjcg3ywnzrxy9x8dvd73my18k0if52fnvyvmb75z0v2cw"; - }; - - buildInputs = [ - gdk_pixbuf glib gtk2 gtk3 kdelibs libxcb libpthreadstubs libXdmcp - ]; - - nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; - - patches = [ - ./kde-gtk-config-2.2.1-install-paths.patch - ./kde-gtk-config-follow-symlinks.patch - ]; - - cmakeFlags = '' - -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include - -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include - -DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0 - -DKDE4_LIBEXEC_INSTALL_DIR=lib/kde4/libexec - ''; - - meta = with stdenv.lib; { - homepage = https://projects.kde.org/projects/extragear/base/kde-gtk-config; - description = "GTK configuration module for KDE System Settings"; - longDescription = '' - Configuration dialog to adapt GTK applications appearance to your taste under KDE. - Among its many features, it lets you: - - Choose which theme is used for GTK2 and GTK3 applications. - - Tweak some GTK applications behaviour. - - Select what icon theme to use in GTK applications. - - Select GTK applications default fonts. - - Easily browse and install new GTK2 and GTK3 themes. - ''; - platforms = platforms.linux; - license = licenses.gpl3; - maintainers = [ maintainers.ttuegel ]; - }; -} diff --git a/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-2.2.1-install-paths.patch b/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-2.2.1-install-paths.patch deleted file mode 100644 index e6596ef0dcc7..000000000000 --- a/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-2.2.1-install-paths.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ur kde-gtk-config-2.2.1-a/gtk3proxies/CMakeLists.txt kde-gtk-config-2.2.1-b/gtk3proxies/CMakeLists.txt ---- kde-gtk-config-2.2.1-a/gtk3proxies/CMakeLists.txt 2013-03-18 06:02:39.000000000 -0500 -+++ kde-gtk-config-2.2.1-b/gtk3proxies/CMakeLists.txt 2013-12-24 18:57:59.854264894 -0600 -@@ -6,4 +6,4 @@ - - add_executable(gtk3_preview preview3.c) - target_link_libraries(gtk3_preview ${GTK3_LIBRARY} ${GOBJECT2_LIBRARY} ${GLIB2_LIBRARY}) --install(TARGETS gtk3_preview RUNTIME DESTINATION "${KDE4_LIBEXEC_INSTALL_DIR}") -+install(TARGETS gtk3_preview RUNTIME DESTINATION bin) -diff -ur kde-gtk-config-2.2.1-a/gtkproxies/CMakeLists.txt kde-gtk-config-2.2.1-b/gtkproxies/CMakeLists.txt ---- kde-gtk-config-2.2.1-a/gtkproxies/CMakeLists.txt 2013-03-18 06:02:39.000000000 -0500 -+++ kde-gtk-config-2.2.1-b/gtkproxies/CMakeLists.txt 2013-12-24 18:57:40.967781611 -0600 -@@ -4,13 +4,13 @@ - - add_executable(reload_gtk_apps reload.c) - target_link_libraries(reload_gtk_apps ${GTK2_LIBRARIES}) --install(TARGETS reload_gtk_apps RUNTIME DESTINATION "${KDE4_LIBEXEC_INSTALL_DIR}") -+install(TARGETS reload_gtk_apps RUNTIME DESTINATION bin) - - add_definitions("-DDATA_DIR=\\\"${DATA_INSTALL_DIR}/kcm-gtk-module/\\\"") - - add_executable(gtk_preview preview.c) - target_link_libraries(gtk_preview ${GTK2_LIBRARIES} ${GTK2_GIOMM_LIBRARY}) --install(TARGETS gtk_preview RUNTIME DESTINATION "${KDE4_LIBEXEC_INSTALL_DIR}") -+install(TARGETS gtk_preview RUNTIME DESTINATION bin) - - # preview file used for the gtk3 version too - install(FILES preview.ui diff --git a/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-follow-symlinks.patch b/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-follow-symlinks.patch deleted file mode 100644 index e291589e82e3..000000000000 --- a/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-follow-symlinks.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/appearancegtk2.cpp b/src/appearancegtk2.cpp -index 3d89c82..4dcce69 100644 ---- a/src/appearancegtk2.cpp -+++ b/src/appearancegtk2.cpp -@@ -56,7 +56,7 @@ QString AppearanceGTK2::themesGtkrcFile(const QString& themeName) const - QStringList themes=installedThemes(); - themes=themes.filter(QRegExp("/"+themeName+"/?$")); - if(themes.size()==1) { -- QDirIterator it(themes.first(), QDirIterator::Subdirectories); -+ QDirIterator it(themes.first(), QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while(it.hasNext()) { - it.next(); - if(it.fileName()=="gtkrc") { diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix deleted file mode 100644 index 156f03dad876..000000000000 --- a/pkgs/tools/misc/partition-manager/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, cmake, gettext, automoc4, perl -, parted, libuuid, qt4, kdelibs, kde_baseapps, phonon, libatasmart -}: - -stdenv.mkDerivation rec { - name = "partitionmanager-1.0.3_p20120804"; - - src = fetchurl { - #url = "mirror://sourceforge/partitionman/${name}.tar.bz2"; - # the upstream version is old and doesn't build - url = "http://dev.gentoo.org/~kensington/distfiles/${name}.tar.bz2"; - sha256 = "1j6zpgj8xs98alzxvcibwch9yj8jsx0s7y864gbdx280jmj8c1np"; - }; - - buildInputs = [ - pkgconfig cmake gettext automoc4 perl - parted libuuid qt4 kdelibs kde_baseapps phonon libatasmart - ]; - - preConfigure = '' - export VERBOSE=1 - cmakeFlagsArray=($cmakeFlagsArray -DGETTEXT_INCLUDE_DIR=${gettext}/include -DCMAKE_INCLUDE_PATH=${qt4}/include/QtGui ) - ''; - - postInstall = '' - set -x - rpath=`patchelf --print-rpath $out/bin/partitionmanager-bin`:${qt4}/lib - for p in $out/bin/partitionmanager-bin; do - patchelf --set-rpath $rpath $p - done - ''; - - meta = { - description = "Utility program to help you manage the disk devices"; - homepage = http://www.kde-apps.org/content/show.php/KDE+Partition+Manager?content=89595; # ? - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/tools/networking/plasma-nm/default.nix b/pkgs/tools/networking/plasma-nm/default.nix deleted file mode 100644 index f0f379d38295..000000000000 --- a/pkgs/tools/networking/plasma-nm/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig -, kdelibs, networkmanager, libnm-qt, glib }: - -let - pname = "plasma-nm"; - version = "0.9.3.4"; - name = "${pname}-${version}"; -in -stdenv.mkDerivation { - inherit name; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${name}.tar.xz"; - sha256 = "0xj14isvjq8ll70b6q66n8adm8ff4j9ng195ndk2gmavjf6bb751"; - }; - - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; - - nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; - - buildInputs = [ kdelibs networkmanager libnm-qt ]; - - meta = with stdenv.lib; { - homepage = "https://projects.kde.org/projects/kde/workspace/plasma-nm"; - description = "Plasma applet written in QML for managing network connections"; - license = licenses.lgpl21; - inherit (kdelibs.meta) platforms; - }; -} diff --git a/pkgs/tools/security/ksshaskpass/default.nix b/pkgs/tools/security/ksshaskpass/default.nix deleted file mode 100644 index a668f57c5bbe..000000000000 --- a/pkgs/tools/security/ksshaskpass/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, kdelibs -, automoc4, cmake, perl, pkgconfig -}: - -stdenv.mkDerivation { - name = "ksshaskpass-0.5.3"; - - src = fetchurl { - url = http://kde-apps.org/CONTENT/content-files/50971-ksshaskpass-0.5.3.tar.gz; - sha256 = "0911i8jr0nzqah8xidb8wba55a2skaidj3klv3cw6bm5fjx7x953"; - }; - - nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; - - buildInputs = [ kdelibs ]; - - patchPhase = '' - sed -i 's@/usr/bin/@@' src/ksshaskpass.desktop - ''; - - meta = { - homepage = http://kde-apps.org/content/show.php?content=50971; - description = "A KDE 4 version of ssh-askpass with KWallet support"; - license = stdenv.lib.licenses.gpl2Plus; - inherit (kdelibs.meta) platforms; - }; -} diff --git a/pkgs/tools/security/polkit-kde-agent/default.nix b/pkgs/tools/security/polkit-kde-agent/default.nix deleted file mode 100644 index 6b4bcf7ad637..000000000000 --- a/pkgs/tools/security/polkit-kde-agent/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig -, kdelibs, polkit_qt4 }: - -stdenv.mkDerivation rec { - name = "polkit-kde-agent-1-0.99.0"; - - src = fetchurl { - url = "mirror://kde/stable/apps/KDE4.x/admin/${name}.tar.bz2"; - sha256 = "0rxlq6x0vhvha8i6w109zpzzacp4imins55v4p4fq7a3k0kgywg3"; - }; - - buildInputs = [ kdelibs polkit_qt4 ]; - - nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; - - patchPhase = "sed -e s/KDE4_AUTOSTART/AUTOSTART/ -i CMakeLists.txt"; - - meta = { - platforms = stdenv.lib.platforms.linux; - description = "PolicyKit authentication agent for KDE"; - }; -} diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 664fb87b5205..f1ae958ed637 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -1,22 +1,37 @@ -{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig -, kdelibs, gettext +{ + kdeDerivation, kdeWrapper, lib, fetchgit, + ecm, kdoctools, kconfig, kinit, kparts }: -stdenv.mkDerivation rec { - name = "kdiff3-0.9.98"; - src = fetchurl { - url = "mirror://sourceforge/kdiff3/${name}.tar.gz"; - sha256 = "0s6n1whkf5ck2r8782a9l8b736cj2p05and1vjjh7d02pax1lb40"; - }; +let + rev = "468652ce70b1214842cef0a021c81d056ec6aa01"; + + unwrapped = kdeDerivation rec { + name = "kdiff3-${version}"; + version = "1.7.0-${lib.strings.substring 0 7 rev}"; + + src = fetchgit { + url = "https://gitlab.com/tfischer/kdiff3"; + sha256 = "126xl7jbb26v2970ba1rw1d6clhd14p1f2avcwvj8wzqmniq5y5m"; + inherit rev; + }; - buildInputs = [ kdelibs ]; - nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; + preConfigure = "cd kdiff3"; - meta = { - homepage = http://kdiff3.sourceforge.net/; - license = stdenv.lib.licenses.gpl2Plus; - description = "Compares and merges 2 or 3 files or directories"; - maintainers = with stdenv.lib.maintainers; [viric urkud]; - platforms = with stdenv.lib.platforms; linux; + nativeBuildInputs = [ ecm kdoctools ]; + + propagatedBuildInputs = [ kconfig kinit kparts ]; + + meta = with lib; { + homepage = http://kdiff3.sourceforge.net/; + license = licenses.gpl2Plus; + description = "Compares and merges 2 or 3 files or directories"; + maintainers = with maintainers; [ viric urkud peterhoeg ]; + platforms = with platforms; linux; + }; }; + +in kdeWrapper { + inherit unwrapped; + targets = [ "bin/kdiff3" ]; } diff --git a/pkgs/tools/text/kdiff3/kde5.nix b/pkgs/tools/text/kdiff3/kde5.nix deleted file mode 100644 index f1ae958ed637..000000000000 --- a/pkgs/tools/text/kdiff3/kde5.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - kdeDerivation, kdeWrapper, lib, fetchgit, - ecm, kdoctools, kconfig, kinit, kparts -}: - -let - rev = "468652ce70b1214842cef0a021c81d056ec6aa01"; - - unwrapped = kdeDerivation rec { - name = "kdiff3-${version}"; - version = "1.7.0-${lib.strings.substring 0 7 rev}"; - - src = fetchgit { - url = "https://gitlab.com/tfischer/kdiff3"; - sha256 = "126xl7jbb26v2970ba1rw1d6clhd14p1f2avcwvj8wzqmniq5y5m"; - inherit rev; - }; - - preConfigure = "cd kdiff3"; - - nativeBuildInputs = [ ecm kdoctools ]; - - propagatedBuildInputs = [ kconfig kinit kparts ]; - - meta = with lib; { - homepage = http://kdiff3.sourceforge.net/; - license = licenses.gpl2Plus; - description = "Compares and merges 2 or 3 files or directories"; - maintainers = with maintainers; [ viric urkud peterhoeg ]; - platforms = with platforms; linux; - }; - }; - -in kdeWrapper { - inherit unwrapped; - targets = [ "bin/kdiff3" ]; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 57242e2a7422..841eb75e905f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -38,6 +38,7 @@ doNotDisplayTwice rec { cups_filters = cups-filters; # added 2016-08 cv = progress; # added 2015-09-06 debian_devscripts = debian-devscripts; # added 2016-03-23 + digikam5 = digikam; # added 2017-02-18 dwarf_fortress = dwarf-fortress; # added 2016-01-23 dwbWrapper = dwb; # added 2015-01 enblendenfuse = enblend-enfuse; # 2015-09-30 @@ -58,9 +59,11 @@ doNotDisplayTwice rec { inotifyTools = inotify-tools; joseki = apache-jena-fuseki; # added 2016-02-28 jquery_ui = jquery-ui; # added 2014-09-07 + kdiff3-qt5 = kdiff3; # added 2017-02-18 keepassx2-http = keepassx-reboot; # added 2016-10-17 keepassx-reboot = keepassx-community; # added 2017-02-01 keybase-go = keybase; # added 2016-08-24 + krename-qt5 = krename; # added 2017-02-18 letsencrypt = certbot; # added 2016-05-16 libdbusmenu_qt5 = qt5.libdbusmenu; # added 2015-12-19 libcap_manpages = libcap.doc; # added 2016-04-29 @@ -93,7 +96,6 @@ doNotDisplayTwice rec { quake3game = ioquake3; # added 2016-01-14 qwt6 = qt5.qwt; # added 2015-12-19 rdiff_backup = rdiff-backup; # added 2014-11-23 - rekonqWrapper = rekonq; # added 2015-01 rssglx = rss-glx; #added 2015-03-25 rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby"; rustUnstable = rustNightly; # added 2016-11-29 @@ -103,6 +105,7 @@ doNotDisplayTwice rec { saneBackendsGit = sane-backends-git; # added 2016-01-02 saneFrontends = sane-frontends; # added 2016-01-02 scim = sc-im; # added 2016-01-22 + skrooge2 = skrooge; # added 2017-02-18 spaceOrbit = space-orbit; # addewd 2016-05-23 speedtest_cli = speedtest-cli; # added 2015-02-17 sqliteInteractive = sqlite-interactive; # added 2014-12-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ca20f74b269..3ebca0244eb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -746,7 +746,7 @@ with pkgs; clib = callPackage ../tools/package-management/clib { }; - colord-kde = qt5.callPackage ../tools/misc/colord-kde/0.5.nix {}; + colord-kde = qt5.callPackage ../tools/misc/colord-kde {}; consul = callPackage ../servers/consul { }; @@ -2451,11 +2451,11 @@ with pkgs; kpcli = callPackage ../tools/security/kpcli { }; - krename-qt5 = qt5.callPackage ../applications/misc/krename/kde5.nix { }; + krename = qt5.callPackage ../applications/misc/krename { }; kronometer = qt5.callPackage ../tools/misc/kronometer { }; - kdiff3-qt5 = qt5.callPackage ../tools/text/kdiff3/kde5.nix { }; + kdiff3 = qt5.callPackage ../tools/text/kdiff3 { }; peruse = qt5.callPackage ../tools/misc/peruse { }; @@ -3508,8 +3508,6 @@ with pkgs; ps3netsrv = callPackage ../servers/ps3netsrv { }; - psi = callPackage ../applications/networking/instant-messengers/psi { }; - psmisc = callPackage ../os-specific/linux/psmisc { }; pssh = callPackage ../tools/networking/pssh { }; @@ -4370,9 +4368,7 @@ with pkgs; uhttpmock = callPackage ../development/libraries/uhttpmock { }; - uim = callPackage ../tools/inputmethods/uim { - inherit (pkgs.kde4) kdelibs; - }; + uim = kde4.callPackage ../tools/inputmethods/uim { }; uhub = callPackage ../servers/uhub { }; @@ -6547,6 +6543,8 @@ with pkgs; lttv = callPackage ../development/tools/misc/lttv { }; + massif-visualizer = kde4.callPackage ../development/tools/analysis/massif-visualizer { }; + maven = maven3; maven3 = callPackage ../development/tools/build-managers/apache-maven { }; @@ -7833,6 +7831,8 @@ with pkgs; judy = callPackage ../development/libraries/judy { }; + kdelibs4 = kde5.applications.kdelibs; + keybinder = callPackage ../development/libraries/keybinder { automake = automake111x; lua = lua5_1; @@ -8893,11 +8893,6 @@ with pkgs; mlt = callPackage ../development/libraries/mlt {}; - mlt-qt4 = callPackage ../development/libraries/mlt/qt-4.nix { - ffmpeg = ffmpeg_2; - qt = qt4; - }; - mono-addins = callPackage ../development/libraries/mono-addins { }; mono-zeroconf = callPackage ../development/libraries/mono-zeroconf { }; @@ -9251,7 +9246,7 @@ with pkgs; libpng = libpng12; }; - qt4 = pkgs.kde4.qt4; + qt4 = qt48; qt48 = callPackage ../development/libraries/qt-4.x/4.8 { # GNOME dependencies are not used unless gtkStyle == true @@ -9328,7 +9323,7 @@ with pkgs; libkeyfinder = callPackage ../development/libraries/libkeyfinder { }; - libktorrent = callPackage ../development/libraries/libktorrent/5.nix { }; + libktorrent = callPackage ../development/libraries/libktorrent { }; mlt = callPackage ../development/libraries/mlt/qt-5.nix { ffmpeg = ffmpeg_2; @@ -11716,9 +11711,7 @@ with pkgs; gocode = callPackage ../development/tools/gocode { }; - kgocode = callPackage ../applications/misc/kgocode { - inherit (pkgs.kde4) kdelibs; - }; + kgocode = callPackage ../applications/misc/kgocode { }; gotags = callPackage ../development/tools/gotags { }; @@ -12538,6 +12531,10 @@ with pkgs; tcl = tcl-8_5; }; + amarok = kde4.callPackage ../applications/audio/amarok { + ffmpeg = ffmpeg_2; + }; + AMB-plugins = callPackage ../applications/audio/AMB-plugins { }; ams-lv2 = callPackage ../applications/audio/ams-lv2 { }; @@ -12747,6 +12744,11 @@ with pkgs; calibre = qt5.callPackage ../applications/misc/calibre { }; + calligra = kde4.callPackage ../applications/office/calligra { + vc = vc_0_7; + oxygen_icons = kde5.oxygen-icons5; + }; + camlistore = callPackage ../applications/misc/camlistore { }; canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { }; @@ -13991,8 +13993,16 @@ with pkgs; boost = boost155; }; + k3b-original = lowPrio (kde4.callPackage ../applications/misc/k3b { }); + + k3b = kde4.callPackage ../applications/misc/k3b/wrapper.nix { }; + k9copy = qt5.callPackage ../applications/video/k9copy {}; + kadu = kde4.callPackage ../applications/networking/instant-messengers/kadu { }; + + kde-telepathy = kde4.callPackage ../applications/networking/instant-messengers/telepathy/kde {}; + kdeconnect = qt5.callPackage ../applications/misc/kdeconnect { }; kdecoration-viewer = kde5.callPackage ../tools/misc/kdecoration-viewer {}; @@ -14015,6 +14025,8 @@ with pkgs; keymon = callPackage ../applications/video/key-mon { }; + kgraphviewer = kde4.callPackage ../applications/graphics/kgraphviewer { }; + khal = callPackage ../applications/misc/khal { }; khard = callPackage ../applications/misc/khard { }; @@ -14023,27 +14035,33 @@ with pkgs; qt = qt4; }; - kile = kde5.callPackage ../applications/editors/kile/frameworks.nix { }; + kile = kde5.callPackage ../applications/editors/kile { }; kino = callPackage ../applications/video/kino { inherit (gnome2) libglade; ffmpeg = ffmpeg_2; }; + kipi-plugins = kde5.callPackage ../applications/graphics/kipi-plugins {}; + kiwix = callPackage ../applications/misc/kiwix { stdenv = overrideCC stdenv gcc49; }; - konversation = qt5.callPackage ../applications/networking/irc/konversation/1.6.nix { }; + kmplayer = kde4.callPackage ../applications/video/kmplayer { }; + + konversation = qt5.callPackage ../applications/networking/irc/konversation { }; krita = qt5.callPackage ../applications/graphics/krita { vc = vc_0_7; openjpeg = openjpeg_1; }; + krusader = kde4.callPackage ../applications/misc/krusader { }; + ksuperkey = callPackage ../tools/X11/ksuperkey { }; - ktorrent = qt5.callPackage ../applications/networking/p2p/ktorrent/5.nix { }; + ktorrent = qt5.callPackage ../applications/networking/p2p/ktorrent { }; kubernetes = callPackage ../applications/networking/cluster/kubernetes { go = go_1_6; @@ -14790,6 +14808,8 @@ with pkgs; autoAwaySupport = config.profanity.autoAwaySupport or true; }; + psi = kde4.callPackage ../applications/networking/instant-messengers/psi { }; + psol = callPackage ../development/libraries/psol/default.nix { }; pstree = callPackage ../applications/misc/pstree { }; @@ -14857,7 +14877,7 @@ with pkgs; qtscrobbler = callPackage ../applications/audio/qtscrobbler { }; - quassel = qt5.callPackage ../applications/networking/irc/quassel/qt-5.nix { + quassel = qt5.callPackage ../applications/networking/irc/quassel { monolithic = true; daemon = false; client = false; @@ -15164,7 +15184,7 @@ with pkgs; themes = []; # extra themes, etc. }; - skrooge2 = qt5.callPackage ../applications/office/skrooge/2.nix {}; + skrooge = qt5.callPackage ../applications/office/skrooge {}; slim = callPackage ../applications/display-managers/slim { libpng = libpng12; @@ -15392,7 +15412,6 @@ with pkgs; todo-txt-cli = callPackage ../applications/office/todo.txt-cli { }; tomahawk = callPackage ../applications/audio/tomahawk { - inherit (pkgs.kde4) kdelibs; taglib = taglib_1_9; enableXMPP = config.tomahawk.enableXMPP or true; enableKDE = config.tomahawk.enableKDE or false; @@ -15981,7 +16000,7 @@ with pkgs; yabar = callPackage ../applications/window-managers/yabar { }; - yakuake = kde5.callPackage ../applications/misc/yakuake/3.0.nix {}; + yakuake = kde5.callPackage ../applications/misc/yakuake {}; yarp = callPackage ../applications/science/robotics/yarp {}; @@ -16001,6 +16020,8 @@ with pkgs; zam-plugins = callPackage ../applications/audio/zam-plugins { }; + zanshin = kde4.callPackage ../applications/office/zanshin { }; + zathura = callPackage ../applications/misc/zathura { useMupdf = config.zathura.useMupdf or true; }; @@ -16139,7 +16160,7 @@ with pkgs; dhewm3 = callPackage ../games/dhewm3 {}; - digikam5 = kde5.callPackage ../applications/graphics/digikam/5.nix { + digikam = kde5.callPackage ../applications/graphics/digikam { boost = boost160; }; @@ -16688,212 +16709,23 @@ with pkgs; kakasi = callPackage ../tools/text/kakasi { }; - kde4 = recurseIntoAttrs pkgs.kde414; - - kde414 = - kdePackagesFor - { - libusb = libusb1; - python2Packages = python2Packages; + kde4 = + let + deps = lib.makeScope newScope (self: { inherit (python2Packages) python; - libcanberra = libcanberra_kde; + kdelibs = kdelibs4; boost = boost155; - kdelibs = kde5.kdelibs; - subversionClient = pkgs.subversion18.override { - bdbSupport = false; - perlBindings = true; - pythonBindings = true; - }; - ruby = ruby_2_2; # see https://github.com/NixOS/nixpkgs/pull/12610#issuecomment-188666473 ffmpeg = ffmpeg_2; # ffmpegthumb doesn't build otherwise - } - ../desktops/kde-4.14; - - - kdePackagesFor = extra: dir: - let - # list of extra packages not included in KDE - # the real work in this function is done below this list - extraPackages = callPackage: - rec { - amarok = callPackage ../applications/audio/amarok { - ffmpeg = ffmpeg_2; - }; - - bangarang = callPackage ../applications/video/bangarang { }; - - basket = callPackage ../applications/office/basket { }; - - bluedevil = callPackage ../tools/bluetooth/bluedevil { }; - - calligra = callPackage ../applications/office/calligra { - vc = vc_0_7; - }; - - choqok = callPackage ../applications/networking/instant-messengers/choqok { }; - - colord-kde = callPackage ../tools/misc/colord-kde { }; - - digikam = callPackage ../applications/graphics/digikam { }; - - eventlist = callPackage ../applications/office/eventlist {}; - - k3b-original = lowPrio (callPackage ../applications/misc/k3b { }); - - k3b = callPackage ../applications/misc/k3b/wrapper.nix { }; - - kadu = callPackage ../applications/networking/instant-messengers/kadu { }; - - kbibtex = callPackage ../applications/office/kbibtex { }; - - kde_gtk_config = callPackage ../tools/misc/kde-gtk-config { }; - - kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { }; - - kdeconnect = callPackage ../applications/misc/kdeconnect/0.7.nix { }; - - kdenlive = callPackage ../applications/video/kdenlive { mlt = mlt-qt4; }; - - kdesvn = callPackage ../applications/version-management/kdesvn { }; - - kdevelop = callPackage ../applications/editors/kdevelop { }; - - kdevplatform = callPackage ../development/libraries/kdevplatform { - boost = boost155; - }; - - kdiff3 = callPackage ../tools/text/kdiff3 { }; - - kgraphviewer = callPackage ../applications/graphics/kgraphviewer { }; - - kile = callPackage ../applications/editors/kile { }; - - kmplayer = callPackage ../applications/video/kmplayer { }; - - kmymoney = callPackage ../applications/office/kmymoney { }; - - kipi_plugins = callPackage ../applications/graphics/kipi-plugins { }; - - konversation = callPackage ../applications/networking/irc/konversation { }; - - kvirc = callPackage ../applications/networking/irc/kvirc { }; - - krename = callPackage ../applications/misc/krename/kde4.nix { - taglib = taglib_1_9; - }; - - krusader = callPackage ../applications/misc/krusader { }; - - ksshaskpass = callPackage ../tools/security/ksshaskpass {}; - - ktorrent = callPackage ../applications/networking/p2p/ktorrent { }; - - kuickshow = callPackage ../applications/graphics/kuickshow { }; - - libalkimia = callPackage ../development/libraries/libalkimia { }; - - libktorrent = callPackage ../development/libraries/libktorrent { - boost = boost155; - }; - - libkvkontakte = callPackage ../development/libraries/libkvkontakte { }; - - liblikeback = callPackage ../development/libraries/liblikeback { }; - - libmm-qt = callPackage ../development/libraries/libmm-qt { }; - - libnm-qt = callPackage ../development/libraries/libnm-qt { }; - - massif-visualizer = callPackage ../development/tools/analysis/massif-visualizer { }; - - partitionManager = callPackage ../tools/misc/partition-manager { }; - - plasma-nm = callPackage ../tools/networking/plasma-nm { }; - - polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { }; - - qtcurve = callPackage ../misc/themes/qtcurve { }; - - quassel = callPackage ../applications/networking/irc/quassel rec { - monolithic = true; - daemon = false; - client = false; - withKDE = stdenv.isLinux; - qt = if withKDE then qt4 else qt5; # KDE supported quassel cannot build with qt5 yet (maybe in 0.12.0) - dconf = gnome3.dconf; - }; - - quasselWithoutKDE = (quassel.override { - monolithic = true; - daemon = false; - client = false; - withKDE = false; - #qt = qt5; - tag = "-without-kde"; - }); - - quasselDaemon = (quassel.override { - monolithic = false; - daemon = true; - client = false; - withKDE = false; - #qt = qt5; - tag = "-daemon"; - }); - - quasselClient = (quassel.override { - monolithic = false; - daemon = false; - client = true; - tag = "-client"; - }); - - quasselClientWithoutKDE = (quasselClient.override { - monolithic = false; - daemon = false; - client = true; - withKDE = false; - #qt = qt5; - tag = "-client-without-kde"; - }); - - rekonq-unwrapped = callPackage ../applications/networking/browsers/rekonq { }; - rekonq = wrapFirefox rekonq-unwrapped { }; - - kwebkitpart = callPackage ../applications/networking/browsers/kwebkitpart { }; - - rsibreak = callPackage ../applications/misc/rsibreak { }; - - semnotes = callPackage ../applications/misc/semnotes { }; - - skrooge = callPackage ../applications/office/skrooge { }; - - telepathy = callPackage ../applications/networking/instant-messengers/telepathy/kde {}; - - yakuake = callPackage ../applications/misc/yakuake { }; - - zanshin = callPackage ../applications/office/zanshin { }; - - kwooty = callPackage ../applications/networking/newsreaders/kwooty { }; - }; - - callPackageOrig = newScope extra; - - makePackages = extra: - let - callPackage = newScope (extra // self); - kde4 = callPackageOrig dir { inherit callPackage callPackageOrig; }; - self = - kde4 - // extraPackages callPackage - // { - inherit kde4; - wrapper = callPackage ../build-support/kdewrapper {}; - recurseForRelease = true; - }; - in self; + }); - in makeOverridable makePackages extra; + self = lib.makeScope deps.newScope (self: with self; + import ../desktops/kde-4.14 { + callPackageOrig = pkgs.callPackage; + inherit (self) callPackage; + inherit stdenv qt48 kdelibs; + } + ); + in recurseIntoAttrs self; lumina = callPackage ../desktops/lumina { }; @@ -16918,12 +16750,6 @@ with pkgs; albatross = callPackage ../misc/themes/albatross { }; - oxygen-gtk2 = callPackage ../misc/themes/gtk2/oxygen-gtk { }; - - oxygen-gtk3 = callPackage ../misc/themes/gtk3/oxygen-gtk3 { }; - - oxygen_gtk = oxygen-gtk2; # backwards compatibility - gtk_engines = callPackage ../misc/themes/gtk2/gtk-engines { }; gtk-engine-murrine = callPackage ../misc/themes/gtk2/gtk-engine-murrine { }; @@ -16941,7 +16767,6 @@ with pkgs; plasma = plasma self; frameworks = qt5.kdeFrameworks; applications = applications self; - kipi-plugins = self.callPackage ../applications/graphics/kipi-plugins/5.x.nix {}; } // qt5.kdeFrameworks // plasma self @@ -18012,8 +17837,6 @@ with pkgs; }; vimprobable2 = wrapFirefox vimprobable2-unwrapped { }; - inherit (kde4) rekonq; - vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { webkit = webkitgtk2; }; |