JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kdeApps: update to 14.12.1

Browse Source
This commit is contained in:
Thomas Tuegel 2015-01-25 12:47:17 -06:00
parent dfe1dc0c02
commit c6f1c75472
10 changed files with 1007 additions and 844 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
pkgs/applications/kde-apps-14.12/default.nix
View File

@ -23,9 +23,17 @@ let
mirror = "mirror://kde";
renames =
builtins.removeAttrs
(builtins.removeAttrs
(import ./renames.nix {})
["Backend" "CTest"];
["Backend" "CTest"])
// {
"KDE4" = "kdelibs";
"Kexiv2" = "libkexiv2";
"Kdcraw" = "libkdcraw";
"Kipi" = "libkipi";
"LibKMahjongg" = "libkmahjongg";
"LibKonq" = "kde-baseapps";
};
scope =
# packages in this collection
@ -35,16 +43,28 @@ let
# packages from nixpkgs
(with pkgs;
{
ACL = acl;
Akonadi = kde4.akonadi;
Alsa = alsaLib;
Automoc4 = automoc4;
Avahi = avahi;
BISON = bison;
Baloo = kde4.baloo;
Boost = boost156;
Canberra = libcanberra;
Cdparanoia = cdparanoia;
CUPS = cups;
DBusMenuQt = libdbusmenu_qt;
DjVuLibre = djvulibre;
ENCHANT = enchant;
EPub = ebook_tools;
Eigen2 = eigen2;
Eigen3 = eigen;
Exiv2 = exiv2;
FAM = fam;
FFmpeg = ffmpeg;
Flac = flac;
FLEX = flex;
Freetype = freetype;
GMP = gmp;
Gettext = gettext;
@ -53,38 +73,44 @@ let
Grantlee = grantlee;
GSL = gsl;
HUNSPELL = hunspell;
HUpnp = herqq;
Jasper = jasper;
KActivities = kde4.kactivities;
KDE4 = kde4.kdelibs;
KDE4Workspace = kde4.kde_workspace;
Kexiv2 = kdeApps.libkexiv2;
Kdcraw = kdeApps.libkdcraw;
KdepimLibs = kde4.kdepimlibs;
Kipi = kdeApps.libkipi;
LCMS2 = lcms2;
Ldap = openldap;
LibAttica = attica;
LibGcrypt = libgcrypt;
LibKMahjongg = kdeApps.libkmahjongg;
LibKonq = kdeApps.kde-baseapps;
LibSSH = libssh;
LibSpectre = libspectre;
LibVNCServer = libvncserver;
Libical = libical;
MusicBrainz3 = libmusicbrainz;
NetworkManager = networkmanager;
OggVorbis = libvorbis;
OpenAL = openal;
OpenEXR = openexr;
Poppler = poppler.poppler_qt4;
Prison = prison;
PulseAudio = pulseaudio;
PythonLibrary = python;
Qalculate = libqalculate;
QCA2 = qca2;
QImageBlitz = qimageblitz;
QJSON = qjson;
Qt4 = qt4;
Samba = samba;
Sasl2 = cyrus_sasl;
SharedDesktopOntologies = shared_desktop_ontologies;
SndFile = libsndfile;
Speechd = speechd;
TIFF = libtiff;
Taglib = taglib;
TelepathyQt4 = telepathy_qt;
TunePimp = libtunepimp;
UDev = udev;
USB = libusb;
Xscreensaver = xscreensaver;
Xsltproc = libxslt;
}
);
@ -126,6 +152,57 @@ let
+ " -I${ilmbase}/include/OpenEXR";
};
kde-workspace = with pkgs; super.kde-workspace // {
buildInputs = with xlibs;
super.kde-workspace.buildInputs
++
[
libxkbfile libXcomposite xcbutilimage xcbutilkeysyms
xcbutilrenderutil
];
nativeBuildInputs =
super.kde-workspace.nativeBuildInputs
++ [ pkgconfig ];
};
kdelibs = with pkgs; super.kdelibs // {
buildInputs =
super.kdelibs.buildInputs ++ [ attr libxslt polkit_qt4 xz ];
nativeBuildInputs =
super.kdelibs.nativeBuildInputs ++ [ pkgconfig ];
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
propagatedBuildInputs =
super.kdelibs.propagatedBuildInputs ++ [ qt4 soprano phonon strigi ];
propagatedNativeBuildInputs =
super.kdelibs.propagatedNativeBuildInputs
++ [ automoc4 cmake perl shared_mime_info ];
patches = [ ./kdelibs/polkit-install.patch ];
cmakeFlags = [
"-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
"-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
"-DHUPNP_ENABLED=ON"
"-DWITH_SOLID_UDISKS2=ON"
];
};
kdepim = with pkgs; super.kdepim // {
buildInputs =
super.kdepim.buildInputs ++ [ gpgme libassuan ];
nativeBuildInputs =
super.kdepim.nativeBuildInputs ++ [ pkgconfig ];
};
kdepimlibs = with pkgs; super.kdepimlibs // {
nativeBuildInputs =
super.kdepimlibs.nativeBuildInputs ++ [ pkgconfig ];
};
kdesdk-thumbnailers = with pkgs; super.kdesdk-thumbnailers // {
nativeBuildInputs =
super.kdesdk-thumbnailers.nativeBuildInputs
@ -138,6 +215,7 @@ let
kmix = with pkgs; super.kmix // {
nativeBuildInputs = super.kmix.nativeBuildInputs ++ [pkgconfig];
cmakeFlags = [ "-DKMIX_KF5_BUILD=ON" ];
};
kmousetool = with pkgs; super.kmousetool // {
@ -157,35 +235,31 @@ let
};
libkdcraw = with pkgs; super.libkdcraw // {
buildInputs = super.libkdcraw.buildInputs ++ [kde4.kdelibs libraw];
buildInputs = super.libkdcraw.buildInputs ++ [scope.KDE4 libraw];
nativeBuildInputs = super.libkdcraw.nativeBuildInputs ++ [pkgconfig];
};
libkexiv2 = with pkgs; super.libkexiv2 // {
buildInputs = super.libkexiv2.buildInputs ++ [exiv2 kde4.kdelibs];
buildInputs = super.libkexiv2.buildInputs ++ [exiv2 scope.KDE4];
};
libkface = with pkgs; super.libkface // {
buildInputs = super.libkface.buildInputs ++ [kde4.kdelibs opencv];
buildInputs = super.libkface.buildInputs ++ [scope.KDE4 opencv];
};
libkipi = with pkgs; super.libkipi // {
buildInputs = super.libkipi.buildInputs ++ [kde4.kdelibs];
buildInputs = super.libkipi.buildInputs ++ [scope.KDE4];
};
libksane = with pkgs; super.libksane // {
buildInputs = super.libksane.buildInputs ++ [kde4.kdelibs saneBackends];
};
okular = with pkgs; super.okular // {
buildInputs = super.okular.buildInputs ++ [ebook_tools];
buildInputs = super.libksane.buildInputs ++ [scope.KDE4 saneBackends];
};
};
kdeApps = generateCollection ./. {
inherit (kf5) mkDerivation;
inherit mirror preResolve postResolve scope;
inherit mirror preResolve postResolve renames scope;
};
in kdeApps

40
pkgs/applications/kde-apps-14.12/dependencies.nix
View File

@ -777,6 +777,14 @@
propagatedUserEnvPkgs = [ ];
};
kde-workspace = {
buildInputs = [ "Akonadi" "Boost" "DBusMenuQt" "Fontconfig" "Freetype" "GLIB2" "JPEG" "KActivities" "KDE4" "KDeclarative" "KdepimLibs" "NepomukCore" "OpenGL" "OpenGLES" "PCIUTILS" "PNG" "Prison" "PythonLibrary" "QImageBlitz" "QJSON" "Qalculate" "Qt4" "RAW1394" "Sensors" "Soprano" "Strigi" "UDev" "USB" "Wayland" "X11" "X11_XCB" "XCB" "Xmms" "ZLIB" "libgps" ];
nativeBuildInputs = [ "cmake" ];
propagatedBuildInputs = [ ];
propagatedNativeBuildInputs = [ ];
propagatedUserEnvPkgs = [ ];
};
kdeartwork = {
buildInputs = [ "Eigen3" "KDE4" "KDE4Workspace" "Kexiv2" "OpenGL" "Xscreensaver" ];
nativeBuildInputs = [ "cmake" ];
@ -817,6 +825,14 @@
propagatedUserEnvPkgs = [ ];
};
kdelibs = {
buildInputs = [ "ACL" "AGG" "ASPELL" "Automoc4" "Avahi" "BZip2" "Blitz" "BlueZ" "Carbon" "DBusMenuQt" "DNSSD" "DocBookXML" "DocBookXSL" "ENCHANT" "Eigen2" "FAM" "FFmpeg" "Flac" "Flex" "GIF" "GObject" "GSSAPI" "GStreamer" "Grantlee" "HSPELL" "HUNSPELL" "HUpnp" "IOKit" "JPEG" "Jasper" "KDE4" "KDE4Internal" "LCMS" "LibArt" "LibAttica" "LibXml2" "Libintl" "OpenEXR" "OpenSSL" "PCRE" "PNG" "QCA2" "QImageBlitz" "Qt4" "SharedDesktopOntologies" "SharedMimeInfo" "Soprano" "Sqlite" "Strigi" "UDev" "USB" "Xine" "Xmms" "ZLIB" ];
nativeBuildInputs = [ "BISON" "FLEX" "LibXslt" "Perl" "cmake" ];
propagatedBuildInputs = [ ];
propagatedNativeBuildInputs = [ ];
propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
};
kdenetwork-filesharing = {
buildInputs = [ "KDE4" ];
nativeBuildInputs = [ "cmake" ];
@ -833,6 +849,30 @@
propagatedUserEnvPkgs = [ ];
};
kdepim = {
buildInputs = [ "Akonadi" "Baloo" "Boost" "Git" "Grantlee" "KDE4" "KdepimLibs" "LibKGAPI2" "Prison" "QGpgme" "QJSON" "Sasl2" "Xsltproc" "ZLIB" ];
nativeBuildInputs = [ "DBLATEX_EXECUTABLE" "cmake" ];
propagatedBuildInputs = [ ];
propagatedNativeBuildInputs = [ ];
propagatedUserEnvPkgs = [ ];
};
kdepim-runtime = {
buildInputs = [ "AccountsQt" "Akonadi" "Boost" "KDE4" "KdepimLibs" "LibKFbAPI" "LibKGAPI2" "Libkolab" "Libkolabxml" "QJSON" "Qt4" "Sasl2" "SharedMimeInfo" "SignOnQt" "Xsltproc" ];
nativeBuildInputs = [ "_testrunner" "cmake" ];
propagatedBuildInputs = [ ];
propagatedNativeBuildInputs = [ ];
propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
};
kdepimlibs = {
buildInputs = [ "Akonadi" "Boost" "Gpgme" "KDE4" "Ldap" "LibXml2" "Libical" "Prison" "QJSON" "Sasl2" "SharedMimeInfo" "Xsltproc" ];
nativeBuildInputs = [ "LibXslt" "PERL_EXECUTABLE" "_testrunner" "cmake" ];
propagatedBuildInputs = [ ];
propagatedNativeBuildInputs = [ ];
propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
};
kdesdk-kioslaves = {
buildInputs = [ "KDE4" "SVN" ];
nativeBuildInputs = [ "Perl" "cmake" ];

2
pkgs/applications/kde-apps-14.12/dependencies.sh
View File

@ -4,7 +4,7 @@ manifestXML=$(nix-build -E 'with (import ../../.. {}); autonix.writeManifestXML
autonixDepsKf5=""
if [[ -z $1 ]]; then
autonixDepsKF5=$(nix-build ../../.. -A haskellPackages.autonixDepsKf5)/bin
autonixDepsKF5=$(nix-build ../../.. -A haskellngPackages.autonix-deps-kf5)/bin
else
autonixDepsKF5="$1/dist/build/kf5-deps"
fi

12
pkgs/applications/kde-apps-14.12/kdelibs/polkit-install.patch Normal file
View File

@ -0,0 +1,12 @@
diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
--- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake 2011-05-20 22:24:54.000000000 +0200
+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake 2011-07-12 14:03:00.000000000 +0200
@@ -139,7 +139,7 @@
${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING
+ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING
"Where policy files generated by KAuth will be installed" FORCE)
elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
set (KAUTH_COMPILING_FAKE_BACKEND TRUE)

1662
pkgs/applications/kde-apps-14.12/manifest.nix
View File

File diff suppressed because it is too large Load Diff

2
pkgs/applications/kde-apps-14.12/manifest.sh
View File

@ -5,7 +5,7 @@ if [ $# -eq 0 ]; then
# The extra slash at the end of the URL is necessary to stop wget
# from recursing over the whole server! (No, it's not a bug.)
$(nix-build ../../.. -A autonix.manifest) \
http://download.kde.org/stable/applications/14.12.0/ \
http://download.kde.org/stable/applications/14.12.1/ \
-A '*.tar.xz'
else

5
pkgs/applications/kde-apps-14.12/renames.nix
View File

@ -2,11 +2,16 @@
{ }:
{
"Analitza5" = "analitza";
"Backend" = "kde-workspace";
"CTest" = "sweeper";
"ECM" = "extra-cmake-modules";
"Gpgmepp" = "kdepimlibs";
"JDns" = "kopete";
"KDE4Workspace" = "kde-workspace";
"KDEGames" = "libkdegames";
"KDeclarative" = "kdelibs";
"KSane" = "libksane";
"KdepimLibs" = "kdepimlibs";
"LibKEduVocDocument" = "libkeduvocdocument";
"LibKdeEdu" = "libkdeedu";
"LibKompareDiff2" = "libkomparediff2";

10
pkgs/build-support/autonix/default.nix
View File

@ -48,6 +48,7 @@ let
, mkDerivation ? mkDerivation
, preResolve ? id # modify package set before dependency resolution
, postResolve ? id # modify package set after dependency resolution
, renames ? {}
, scope ? {}
}:
let
@ -61,7 +62,10 @@ let
derive = mapAttrs (name: mkDerivation);
packages = importPackages dir { inherit mirror; };
renames_ =
if renames == {} then (import (dir + "/renames.nix") {}) else renames;
packages = importPackages dir renames_ { inherit mirror; };
in derive (postResolve (resolve (preResolve packages)));
@ -112,7 +116,7 @@ let
in
fold (f: x: f x) orig [ withNames bestVersions ];
importPackages = path: manifestScope:
importPackages = path: renames: manifestScope:
let
# Do not allow any package to depend on itself.
@ -124,8 +128,6 @@ let
else id);
in mapAttrs removeSelfDep;
renames = import (path + "/renames.nix") {};
renamed = dep: renames."${dep}" or dep;
manifest = importManifest (path + "/manifest.nix") manifestScope;

2
pkgs/desktops/plasma-5.1/default.nix
View File

@ -130,7 +130,7 @@ let
plasma5 = generateCollection ./. {
inherit (kf5) mkDerivation;
inherit mirror preResolve postResolve scope;
inherit mirror preResolve postResolve renames scope;
};
in

2
pkgs/development/libraries/kde-frameworks-5.5/default.nix
View File

@ -177,7 +177,7 @@ let
};
kf5 = generateCollection ./. {
inherit mirror mkDerivation preResolve postResolve scope;
inherit mirror mkDerivation preResolve postResolve renames scope;
};
in