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

Wrap kde-related packages in kdePackagesFor

Browse Source 
This lets hydra build kde packages for all available KDE releases.
Will commit NixOS-fix in a few minutes.

svn path=/nixpkgs/trunk/; revision=28833
This commit is contained in:
Yury G. Kudryashov 2011-08-26 13:49:23 +00:00
parent 8c26e61e42
commit 597412252a
9 changed files with 82 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/graphics/kipi-plugins/default.nix
View File

@ -1,6 +1,8 @@
{ stdenv, fetchurl, kdelibs, qimageblitz, qca2, libkexiv2, libkdcraw, libkipi
, libksane, kdepimlibs, libxml2, libxslt, gettext, opencv, libgpod, gdk_pixbuf
, qjson , pkgconfig }:
{ 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.mkDerivation rec {
name = "kipi-plugins-1.9.0";
@ -15,7 +17,7 @@ stdenv.mkDerivation rec {
libksane libxslt gettext opencv libgpod gdk_pixbuf qjson
];
buildNativeInputs = [ pkgconfig ];
buildNativeInputs = [ pkgconfig cmake automoc4 ];
meta = {
description = "Photo Management Program";

6
pkgs/applications/misc/bibletime/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, cmake, sword, qt, boost, cluceneCore}:
{stdenv, fetchurl, cmake, sword, qt4, boost, cluceneCore}:
stdenv.mkDerivation rec {
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
name = "bibletime-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/bibletime/BibleTime%202/BibleTime%202%20source%20code/${name}.tar.bz2";
url = "mirror://sourceforge/bibletime/${name}.tar.bz2";
sha256 = "0171hlwg4rjv93b3gwcyv3nsj2kzwf4n8f6jw6ld18x7xmk9rkdg";
};
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
export SWORD_HOME=${sword};
'';
buildInputs = [ cmake sword qt boost cluceneCore ];
buildInputs = [ cmake sword qt4 boost cluceneCore ];
cmakeFlags = "-DUSE_QT_WEBKIT=ON -DCMAKE_BUILD_TYPE=Debug";

4
pkgs/applications/misc/krename/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, automoc4, kdelibs, taglib, exiv2, podofo, gettext, qt, phonon }:
{ stdenv, fetchurl, cmake, automoc4, kdelibs, taglib, exiv2, podofo, gettext, qt4, phonon }:
stdenv.mkDerivation rec {
name = "krename-4.0.4";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "12qhclw1vbg5bv6619qd4408y8d1w26499gcr8gwhgfzk0v83hic";
};
buildInputs = [ cmake automoc4 kdelibs taglib exiv2 podofo gettext qt phonon ];
buildInputs = [ cmake automoc4 kdelibs taglib exiv2 podofo gettext qt4 phonon ];
meta = {
homepage = http://www.krename.net;

1
pkgs/applications/networking/p2p/ktorrent/default.nix
View File

@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
description = "KDE integrated BtTorrent client";
homepage = http://ktorrent.org;
maintainers = with stdenv.lib.maintainers; [ sander urkud ];
inherit (libktorrent.meta) platforms;
};
}

4
pkgs/desktops/kde-4.5/default.nix
View File

@ -1,4 +1,4 @@
{ callPackage, recurseIntoAttrs, runCommand, stdenv, fetchurl, qt47, ffmpeg_0_6_90 } :
{ callPackage, recurseIntoAttrs, callPackageOrig, runCommand, stdenv, fetchurl, qt47, ffmpeg_0_6_90 } :
let
@ -17,7 +17,7 @@ let
in
recurseIntoAttrs rec {
rec {
recurseForRelease = true;
inherit callPackage stdenv;

1
pkgs/desktops/kde-4.7/default.nix
View File

@ -41,7 +41,6 @@ in
kde.modules // kde.individual //
{
inherit (kde) manifest modules individual splittedModuleList;
recurseForRelease = true;
akonadi = callPackage ./support/akonadi { };
soprano = callPackage ./support/soprano { };

1
pkgs/development/libraries/libktorrent/default.nix
View File

@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
meta = {
description = "A BiTtorrent library used by KTorrent";
homepage = http://ktorrent.org;
inherit (kdelibs.meta) platforms;
};
}

161
pkgs/top-level/all-packages.nix
View File

@ -411,8 +411,6 @@ let
bfr = callPackage ../tools/misc/bfr { };
bluedevil = newScope pkgs.kde4 ../tools/bluetooth/bluedevil { };
bootchart = callPackage ../tools/system/bootchart { };
btrfsProgs = builderDefsPackage (import ../tools/filesystems/btrfsprogs) {
@ -876,8 +874,6 @@ let
jwhois = callPackage ../tools/networking/jwhois { };
kdiff3 = newScope pkgs.kde4 ../tools/text/kdiff3 { };
keychain = callPackage ../tools/misc/keychain { };
kismet = callPackage ../applications/networking/sniffers/kismet { };
@ -1162,8 +1158,6 @@ let
polkit_gnome = callPackage ../tools/security/polkit-gnome { };
polkit_kde_agent = newScope pkgs.kde4 ../tools/security/polkit-kde-agent { };
povray = callPackage ../tools/graphics/povray { };
ppl = callPackage ../development/libraries/ppl { };
@ -3625,8 +3619,6 @@ let
judy = callPackage ../development/libraries/judy { };
kdevplatform = newScope pkgs.kde4 ../development/libraries/kdevplatform { };
krb5 = callPackage ../development/libraries/kerberos/krb5.nix { };
lcms = lcms1;
@ -3790,14 +3782,10 @@ let
useGTK = getConfig [ "libiodbc" "gtk" ] false;
};
libktorrent = newScope pkgs.kde4 ../development/libraries/libktorrent { };
liblastfmSF = callPackage ../development/libraries/liblastfmSF { };
liblastfm = callPackage ../development/libraries/liblastfm { };
liblikeback = newScope pkgs.kde4 ../development/libraries/liblikeback { };
liblqr1 = callPackage ../development/libraries/liblqr-1 {
inherit (gnome) glib;
};
@ -4304,18 +4292,6 @@ let
qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { };
quassel = newScope pkgs.kde4 ../applications/networking/irc/quassel { };
quasselDaemon = appendToName "daemon" (quassel.override {
monolithic = false;
daemon = true;
});
quasselClient = appendToName "client" (quassel.override {
monolithic = false;
client = true;
});
quesoglc = callPackage ../development/libraries/quesoglc { };
qwt = callPackage ../development/libraries/qwt {};
@ -6109,10 +6085,6 @@ let
adobeReader = callPackage_i686 ../applications/misc/adobe-reader { };
akunambol = newScope pkgs.kde4 ../applications/networking/sync/akunambol { };
amarok = newScope pkgs.kde4 ../applications/audio/amarok { };
amsn = callPackage ../applications/networking/instant-messengers/amsn {
libstdcpp = gcc33.gcc;
};
@ -6153,8 +6125,6 @@ let
cairo = cairo.override { xcbSupport = true; };
};
bangarang = newScope pkgs.kde4 ../applications/video/bangarang { };
batik = callPackage ../applications/graphics/batik { };
bazaar = callPackage ../applications/version-management/bazaar { };
@ -6168,9 +6138,7 @@ let
guile = guile_1_8;
};
bibletime = newScope pkgs.kde45 ../applications/misc/bibletime {
qt = qt4;
};
bibletime = callPackage ../applications/misc/bibletime { };
bitcoin = callPackage ../applications/misc/bitcoin {
wxGTK = wxGTK290;
@ -6285,8 +6253,6 @@ let
dia = callPackage ../applications/graphics/dia { };
digikam = newScope pkgs.kde4 ../applications/graphics/digikam { };
djvulibre = callPackage ../applications/misc/djvulibre { };
djview4 = callPackage ../applications/graphics/djview { };
@ -6471,9 +6437,6 @@ let
feh = callPackage ../applications/graphics/feh { };
filelight = if pkgs.kde4.kdeutils ? filelight then pkgs.kde4.kdeutils.filelight
else newScope pkgs.kde4 ../applications/misc/filelight { };
firefox = pkgs.firefoxPkgs.firefox;
firefoxWrapper = wrapFirefox pkgs.firefox "firefox" "";
@ -6778,20 +6741,6 @@ let
jwm = callPackage ../applications/window-managers/jwm { };
k3b = newScope pkgs.kde4 ../applications/misc/k3b { };
kadu = newScope pkgs.kde45 ../applications/networking/instant-messengers/kadu { };
kbluetooth = newScope pkgs.kde4 ../tools/bluetooth/kbluetooth { };
kde_wacomtablet = newScope pkgs.kde4 ../applications/misc/kde-wacomtablet { };
kdenlive = newScope pkgs.kde4 ../applications/video/kdenlive { };
kdesvn = newScope pkgs.kde4 ../applications/version-management/kdesvn { };
kdevelop = newScope pkgs.kde4 ../applications/editors/kdevelop { };
keepnote = callPackage ../applications/office/keepnote {
pygtk = pyGtkGlade;
};
@ -6802,28 +6751,6 @@ let
inherit (gnome) libglade;
};
kipi_plugins = newScope pkgs.kde47 ../applications/graphics/kipi-plugins {
inherit (pkgs.gtkLibs) gdk_pixbuf;
};
kmplayer = newScope pkgs.kde4 ../applications/video/kmplayer {
inherit (pkgs.gtkLibs) pango;
};
koffice = newScope pkgs.kde4 ../applications/office/koffice { };
konq_plugins = newScope pkgs.kde4 ../applications/networking/browsers/konq-plugins { };
konversation = newScope pkgs.kde4 ../applications/networking/irc/konversation { };
krename = newScope pkgs.kde4 ../applications/misc/krename {
qt = qt4;
};
krusader = newScope pkgs.kde4 ../applications/misc/krusader { };
ktorrent = newScope pkgs.kde4 ../applications/networking/p2p/ktorrent { };
lame = callPackage ../applications/audio/lame { };
larswm = callPackage ../applications/window-managers/larswm { };
@ -7042,8 +6969,6 @@ let
paraview = callPackage ../applications/graphics/paraview {
};
partitionManager = newScope pkgs.kde4 ../tools/misc/partition-manager { };
pdftk = callPackage ../tools/typesetting/pdftk { };
pidgin = callPackage ../applications/networking/instant-messengers/pidgin {
@ -7127,10 +7052,6 @@ let
libstdcpp5 = gcc33.gcc;
};
rekonq = newScope pkgs.kde4 ../applications/networking/browsers/rekonq { };
rsibreak = newScope pkgs.kde4 ../applications/misc/rsibreak { };
recode = callPackage ../tools/text/recode { };
retroshare = callPackage ../applications/networking/p2p/retroshare {
@ -7166,8 +7087,6 @@ let
wxGTK = wxGTK28.override { unicode = false; };
};
semnotes = newScope pkgs.kde4 ../applications/misc/semnotes { };
seq24 = callPackage ../applications/audio/seq24 {
inherit (gtkLibs) gtkmm;
};
@ -7529,8 +7448,6 @@ let
qgis = callPackage ../applications/misc/qgis {};
yakuake = newScope pkgs.kde4 ../applications/misc/yakuake { };
yoshimi = callPackage ../applications/audio/yoshimi {
fltk = fltk11;
};
@ -7867,16 +7784,74 @@ let
};
kde4 = kde45;
kde4 = recurseIntoAttrs pkgs.kde45;
kde45 = callPackage ../desktops/kde-4.5 {
callPackage = newScope pkgs.kde45;
};
kde45 = kdePackagesFor pkgs.kde45 "4.5";
kde47 = kdePackagesFor pkgs.kde47 "4.7";
kde47 = callPackage ../desktops/kde-4.7 {
callPackage = newScope pkgs.kde47;
callPackageOrig = callPackage;
};
kdePackagesFor = self: version:
let callPackageOrig = callPackage; in
let
callPackage = newScope self;
kde4 = callPackageOrig (../desktops/kde- + version) {
inherit callPackage callPackageOrig;
};
in
({
inherit kde4;
recurseForRelease = true;
akunambol = callPackage ../applications/networking/sync/akunambol { };
amarok = callPackage ../applications/audio/amarok { };
bangarang = callPackage ../applications/video/bangarang { };
bluedevil = callPackage ../tools/bluetooth/bluedevil { };
digikam = callPackage ../applications/graphics/digikam { };
filelight = callPackage ../applications/misc/filelight { };
k3b = callPackage ../applications/misc/k3b { };
kadu = callPackage ../applications/networking/instant-messengers/kadu { };
kbluetooth = callPackage ../tools/bluetooth/kbluetooth { };
kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { };
kdenlive = callPackage ../applications/video/kdenlive { };
kdesvn = callPackage ../applications/version-management/kdesvn { };
kdevelop = callPackage ../applications/editors/kdevelop { };
kdevplatform = callPackage ../development/libraries/kdevplatform { };
kdiff3 = callPackage ../tools/text/kdiff3 { };
kmplayer = callPackage ../applications/video/kmplayer {
inherit (pkgs.gtkLibs) pango;
};
kipi_plugins = callPackage ../applications/graphics/kipi-plugins {
inherit (pkgs.gtkLibs) gdk_pixbuf;
};
koffice = callPackage ../applications/office/koffice { };
konq_plugins = callPackage ../applications/networking/browsers/konq-plugins { };
konversation = callPackage ../applications/networking/irc/konversation { };
krename = callPackage ../applications/misc/krename { };
krusader = callPackage ../applications/misc/krusader { };
ktorrent = callPackage ../applications/networking/p2p/ktorrent { };
libktorrent = callPackage ../development/libraries/libktorrent { };
liblikeback = callPackage ../development/libraries/liblikeback { };
partitionManager = callPackage ../tools/misc/partition-manager { };
polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { };
psi = callPackage ../applications/networking/instant-messengers/psi { };
quassel = callPackage ../applications/networking/irc/quassel { };
quasselDaemon = appendToName "daemon" (self.quassel.override {
monolithic = false;
daemon = true;
});
quasselClient = appendToName "client" (self.quassel.override {
monolithic = false;
client = true;
});
rekonq = callPackage ../applications/networking/browsers/rekonq { };
rsibreak = callPackage ../applications/misc/rsibreak { };
semnotes = callPackage ../applications/misc/semnotes { };
yakuake = callPackage ../applications/misc/yakuake { };
} // kde4);
redshift = callPackage ../applications/misc/redshift {
inherit (xorg) libX11 libXrandr libxcb randrproto libXxf86vm
@ -8257,8 +8232,6 @@ let
polytable = callPackage ../misc/tex/polytable { };
psi = newScope pkgs.kde45 ../applications/networking/instant-messengers/psi { };
uae = callPackage ../misc/emulators/uae { };
putty = callPackage ../applications/networking/remote/putty { };

1
pkgs/top-level/release.nix
View File

@ -167,7 +167,6 @@ with (import ./release-lib.nix);
kbd = linux;
keen4 = ["i686-linux"];
# klibc = linux;
ktorrent = linux;
kvm = linux;
qemu = linux;
qemu_kvm = linux;