From f28848cb4ddad85e82b5ad4e53e6b5a7da24600c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 24 Feb 2017 17:16:28 -0600 Subject: [PATCH] kde4.kdelibs -> kdelibs4 Our kdelibs4 package does not come from KDE 4, so per upstream's request I am moving it out of the kde4 set. --- pkgs/applications/audio/amarok/default.nix | 6 +++--- pkgs/applications/audio/tomahawk/default.nix | 6 +++--- pkgs/applications/graphics/kgraphviewer/default.nix | 4 ++-- pkgs/applications/misc/dfilemanager/default.nix | 2 +- pkgs/applications/misc/k3b/default.nix | 4 ++-- pkgs/applications/misc/kgocode/default.nix | 4 ++-- pkgs/applications/misc/krusader/default.nix | 6 +++--- .../instant-messengers/telepathy/kde/default.nix | 6 +++--- pkgs/applications/office/calligra/default.nix | 6 +++--- pkgs/applications/office/libreoffice/default.nix | 4 ++-- pkgs/applications/office/libreoffice/still.nix | 4 ++-- pkgs/applications/office/zanshin/default.nix | 6 +++--- pkgs/applications/video/kmplayer/default.nix | 4 ++-- pkgs/desktops/kde-4.14/default.nix | 2 -- .../tools/analysis/massif-visualizer/default.nix | 4 ++-- pkgs/tools/inputmethods/uim/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 13 +++++-------- 17 files changed, 40 insertions(+), 45 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/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/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/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 e8f87e4d290d..bda647659416 100644 --- a/pkgs/applications/misc/k3b/default.nix +++ b/pkgs/applications/misc/k3b/default.nix @@ -1,7 +1,7 @@ { 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 +, dvdplusrwtools, vcdimager, cdparanoia, kdelibs4, libdvdcss, ffmpeg , libkcddb, phonon }: @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { buildInputs = [ shared_mime_info libvorbis taglib flac libsamplerate libdvdread - lame libsndfile libmad stdenv.cc.libc kdelibs + lame libsndfile libmad stdenv.cc.libc kdelibs4 phonon libkcddb makeWrapper cdparanoia libdvdcss ffmpeg ]; 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/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/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/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/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/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/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/desktops/kde-4.14/default.nix b/pkgs/desktops/kde-4.14/default.nix index 9c730ef39cf7..02cd509537d1 100644 --- a/pkgs/desktops/kde-4.14/default.nix +++ b/pkgs/desktops/kde-4.14/default.nix @@ -25,8 +25,6 @@ in kde.modules // kde.individual // { - inherit kdelibs; - akonadi = callPackage ./support/akonadi { }; inherit release; 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/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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4959cc0b53e6..a0248cfe9f9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7829,6 +7829,8 @@ with pkgs; judy = callPackage ../development/libraries/judy { }; + kdelibs4 = kde5.applications.kdelibs; + keybinder = callPackage ../development/libraries/keybinder { automake = automake111x; lua = lua5_1; @@ -11697,9 +11699,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 { }; @@ -14002,7 +14002,7 @@ 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; @@ -15373,7 +15373,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; @@ -16675,7 +16674,7 @@ with pkgs; libusb = libusb1; python2Packages = python2Packages; inherit (python2Packages) python; - kdelibs = kde5.kdelibs; + kdelibs = kdelibs4; boost = boost155; subversionClient = subversion18.override { bdbSupport = false; @@ -16711,8 +16710,6 @@ with pkgs; kgraphviewer = callPackage ../applications/graphics/kgraphviewer { }; - kile = callPackage ../applications/editors/kile { }; - kmplayer = callPackage ../applications/video/kmplayer { }; ktikz = callPackage ../applications/graphics/ktikz { };