Author: eelco
Date: Sat Aug 27 15:19:19 2011
New Revision: 28848
URL: https://svn.nixos.org/websvn/nix/?rev=28848&sc=1
Log:
* Fix indentation/layout.
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Aug 27 15:19:05
2011 (r28847)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Aug 27 15:19:19
2011 (r28848)
@@ -7800,68 +7800,97 @@
kde47 = kdePackagesFor pkgs.kde47 "4.7";
kdePackagesFor = self: version:
- let callPackageOrig = callPackage; in
- let
- callPackage = newScope self;
- kde4 = callPackageOrig (../desktops/kde- + version) {
- inherit callPackage callPackageOrig;
+ let callPackageOrig = callPackage; in
+ let
+ callPackage = newScope self;
+ kde4 = callPackageOrig (../desktops/kde- + version) {
+ inherit callPackage callPackageOrig;
+ };
+ in kde4 // {
+ 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 { };
};
- 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
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
