JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,943 Commits 2 Branches 0 Tags 12 GiB
6e936640b0
Commit Graph

866 Commits

Author SHA1 Message Date
Yury G. Kudryashov
d6199a2ca1 Add kde46.kdelibs.meta 
svn path=/nixpkgs/trunk/; revision=26019
 2011-02-18 09:02:45 +00:00
Yury G. Kudryashov
0c7c2c5c30 kdepim{,runtime}-4.5.94.1 
svn path=/nixpkgs/trunk/; revision=25939
 2011-02-13 04:37:08 +00:00
Yury G. Kudryashov
96636f0779 kdepimlibs-4.6.0: add libxslt 
svn path=/nixpkgs/trunk/; revision=25938
 2011-02-13 04:37:04 +00:00
Yury G. Kudryashov
87c534b7d0 Fix evaluation 
svn path=/nixpkgs/trunk/; revision=25937
 2011-02-13 04:37:00 +00:00
Yury G. Kudryashov
424c73794d kde-4.6/akonadi-1.5.0 
svn path=/nixpkgs/trunk/; revision=25935
 2011-02-13 04:36:51 +00:00
Yury G. Kudryashov
c1e48180f8 soprano-2.6.0 
svn path=/nixpkgs/trunk/; revision=25934
 2011-02-13 04:36:47 +00:00
Yury G. Kudryashov
ab49679292 KDE-4.6.0 (not ready yet!!) 
Mostly automatic changes. Will fix evaluation/compilation later.

svn path=/nixpkgs/trunk/; revision=25933
 2011-02-13 04:36:41 +00:00
Yury G. Kudryashov
5e7c026c22 kde-x.y/utils is for kdeutils-x.y.z, not for apps from kde-apps.org 
svn path=/nixpkgs/trunk/; revision=25932
 2011-02-13 04:34:37 +00:00
Yury G. Kudryashov
525314a0cd librsvg: propagate glib and gtk 
svn path=/nixpkgs/trunk/; revision=25866
 2011-02-09 21:10:20 +00:00
Yury G. Kudryashov
ba15e16195 attica-0.2.0 
svn path=/nixpkgs/trunk/; revision=25862
 2011-02-09 21:09:36 +00:00
Yury G. Kudryashov
d347662b25 soprano-2.5.3 
svn path=/nixpkgs/trunk/; revision=25861
 2011-02-09 21:09:24 +00:00
Yury G. Kudryashov
cd42c8087e akonadi-1.4.3 
svn path=/nixpkgs/trunk/; revision=25860
 2011-02-09 21:09:10 +00:00
Michael Raskin
7f0c493b1c Add python scripting support to Kig 
svn path=/nixpkgs/trunk/; revision=25800
 2011-02-08 10:38:52 +00:00
Eelco Dolstra
e87f7fdf1b * Doh. 
svn path=/nixpkgs/trunk/; revision=25767
 2011-02-02 16:44:50 +00:00
Eelco Dolstra
88b1fb3554 * Fix oxygen-icons' outputHash. (OMG is the oxygen-icons tarball 
really 278 MB?)

svn path=/nixpkgs/trunk/; revision=25766
 2011-02-02 16:41:37 +00:00
Eelco Dolstra
cafbcf1391 * Delete KDE 4.4 - obsolete. 
svn path=/nixpkgs/trunk/; revision=25762
 2011-02-02 14:24:56 +00:00
Eelco Dolstra
a3fe61586c * Updated KDE to 4.5.5. 
* Removed the KDE version number from all expressions except the
  top-level default.nix.  This makes it easier to upgrade.
* Deleted the old l10n versions since there doesn't seem to be a good
  reason to keep them around. 
* Don't use replaceChars (slow!) but do the name sanitization in
  l10n-manifest.sh.

svn path=/nixpkgs/trunk/; revision=25760
 2011-02-02 13:54:35 +00:00
Cillian de Roiste
ff52b21fe8 Adding KDE wacom (graphic tablet) configuration tool 
svn path=/nixpkgs/trunk/; revision=25708
 2011-01-27 21:47:30 +00:00
Evgeny Egorochkin
180205a431 knetwork-manager: package and enable support in KDE to see what is going to break. 
svn path=/nixpkgs/trunk/; revision=25375
 2011-01-04 00:28:22 +00:00
Eelco Dolstra
aa6f43149a * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25308
 2010-12-28 16:42:00 +00:00
Yury G. Kudryashov
1d24f31783 Really exclude kde-4.6 from hydra builds 
svn path=/nixpkgs/trunk/; revision=25290
 2010-12-26 17:18:19 +00:00
Yury G. Kudryashov
e9e22a7238 Rename hupnp to herqq 
Don't pass it to kdelibs as it breaks kdelibs build

svn path=/nixpkgs/trunk/; revision=25289
 2010-12-26 17:18:13 +00:00
Yury G. Kudryashov
ac2b5582e2 kde-l10n-4.5.90 
svn path=/nixpkgs/trunk/; revision=25288
 2010-12-26 15:27:39 +00:00
Yury G. Kudryashov
14e49759aa kdelibs-4.5.90 
svn path=/nixpkgs/trunk/; revision=25287
 2010-12-26 15:27:33 +00:00
Yury G. Kudryashov
4f140371a5 akonadi-1.4.90 
svn path=/nixpkgs/trunk/; revision=25285
 2010-12-26 15:27:20 +00:00
Yury G. Kudryashov
b0cbe093ba attica-0.2.0 
svn path=/nixpkgs/trunk/; revision=25284
 2010-12-26 15:27:15 +00:00
Yury G. Kudryashov
3d73157901 polkit-qt-1-0.99.0 
svn path=/nixpkgs/trunk/; revision=25283
 2010-12-26 15:27:09 +00:00
Yury G. Kudryashov
e27e6a97e5 oxygen-icons-4.5.90 
svn path=/nixpkgs/trunk/; revision=25282
 2010-12-26 15:27:01 +00:00
Yury G. Kudryashov
ea3d59b437 soprano-2.5.63 
svn path=/nixpkgs/trunk/; revision=25281
 2010-12-26 15:26:52 +00:00
Yury G. Kudryashov
a7ddd93631 sed 4.5.4->4.5.90, nothing tested 
svn path=/nixpkgs/trunk/; revision=25280
 2010-12-26 15:26:42 +00:00
Yury G. Kudryashov
58ca4111ad Start kde-4.6: copy 4.5, remove from release 
svn path=/nixpkgs/trunk/; revision=25279
 2010-12-26 15:26:01 +00:00
Lluís Batlle i Rossell
b48b2a7bb4 Merging from trunk. I solved some trivial merge conflicts. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
 2010-12-17 20:39:58 +00:00
Yury G. Kudryashov
c898090c15 Switch to kde-l10n-4.5.4 by default 
svn path=/nixpkgs/trunk/; revision=25115
 2010-12-14 10:21:29 +00:00
Yury G. Kudryashov
dcdfdf3f59 Fix oxygen-icons output hash 
svn path=/nixpkgs/trunk/; revision=25114
 2010-12-14 10:21:24 +00:00
Yury G. Kudryashov
f960334d72 kde-4.5.4, kdepim-4.4.8: evaluates 
svn path=/nixpkgs/trunk/; revision=25113
 2010-12-14 10:21:17 +00:00
Lluís Batlle i Rossell
ee04ffcb55 Updating from trunk. I resolved simple conflicts. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
 2010-12-11 12:47:00 +00:00
Yury G. Kudryashov
f3d4030979 Remove unused items from manifest.nix 
svn path=/nixpkgs/trunk/; revision=24995
 2010-12-06 12:04:31 +00:00
Yury G. Kudryashov
dc44c0eeeb kde-l10n-4.5.3 
svn path=/nixpkgs/trunk/; revision=24994
 2010-12-06 12:04:27 +00:00
Yury G. Kudryashov
9d8000c968 Fix l10n manifest generation script 
svn path=/nixpkgs/trunk/; revision=24993
 2010-12-06 12:04:21 +00:00
Yury G. Kudryashov
1f558f78df There will be no kdepim-4.5.x 
svn path=/nixpkgs/trunk/; revision=24992
 2010-12-06 12:04:16 +00:00
Lluís Batlle i Rossell
0e4c970d11 Updating from trunk - I hope I fixed the conflict around gettext - I left it as 
it was before merging.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24876
 2010-11-26 14:40:39 +00:00
Yury G. Kudryashov
0dcd86ef0f Make kdebindings compile with newer sip 
svn path=/nixpkgs/trunk/; revision=24838
 2010-11-24 10:49:34 +00:00
Lluís Batlle i Rossell
8746de3ae8 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24674
 2010-11-11 22:18:14 +00:00
Piotr Pietraszkiewicz
7ce8c4b77e fixed compilation error, debian bug #577368 (implicit decl. of function 'GTK_WIDGET_SENSITIVE'), by bumping gtkhtml to version 3.29.92.1 
svn path=/nixpkgs/trunk/; revision=24581
 2010-11-02 20:09:15 +00:00
Lluís Batlle i Rossell
f4f84af4ab Updating from trunk. I only had to take away the usual stdenv2 in 
all-packages.nix


svn path=/nixpkgs/branches/stdenv-updates/; revision=24553
 2010-10-31 19:30:31 +00:00
Evgeny Egorochkin
84f61bc6d5 Strigi: bump to 0.7.2 
svn path=/nixpkgs/trunk/; revision=24461
 2010-10-25 05:20:44 +00:00
Yury G. Kudryashov
ac0dea26fb Fix typo 
svn path=/nixpkgs/trunk/; revision=24439
 2010-10-23 20:50:06 +00:00
Yury G. Kudryashov
6863d3f740 kdepim-4.4.7 
svn path=/nixpkgs/trunk/; revision=24436
 2010-10-23 18:48:49 +00:00
Yury G. Kudryashov
25869d5553 Fix kdepim-4.5 compilation 
svn path=/nixpkgs/trunk/; revision=24435
 2010-10-23 18:48:42 +00:00
Lluís Batlle i Rossell
6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
 2010-10-23 14:52:21 +00:00
Yury G. Kudryashov
0a21ec52e5 Sanitize names, so kde4.l10n.ca_valencia works 
svn path=/nixpkgs/trunk/; revision=24395
 2010-10-21 06:56:28 +00:00
Yury G. Kudryashov
edc04aeef5 kde-l10n-4.5.2; refactor kde-l10n 
svn path=/nixpkgs/trunk/; revision=24393
 2010-10-20 22:42:48 +00:00
Yury G. Kudryashov
6731bd48ee Restore an accidentially removed patch 
svn path=/nixpkgs/trunk/; revision=24392
 2010-10-20 21:19:30 +00:00
Yury G. Kudryashov
340b02c7c9 kde-4.5.2 
svn path=/nixpkgs/trunk/; revision=24332
 2010-10-17 18:44:39 +00:00
Yury G. Kudryashov
586de5566a oxygen-icons-4.5.2 
svn path=/nixpkgs/trunk/; revision=24330
 2010-10-17 18:43:50 +00:00
Yury G. Kudryashov
88ad6e74c8 cleanup 
svn path=/nixpkgs/trunk/; revision=24328
 2010-10-17 18:43:38 +00:00
Yury G. Kudryashov
7e03aecb57 Add kde-4.5.2 to manifest 
svn path=/nixpkgs/trunk/; revision=24327
 2010-10-17 18:43:31 +00:00
Yury G. Kudryashov
ca15959e2e Remove phonon from kde-4.5: we use one from qt 
svn path=/nixpkgs/trunk/; revision=24326
 2010-10-17 18:43:24 +00:00
Eelco Dolstra
1758b488e6 * Some hackery to make the split KDE packages available both 
individually and combined.  For instance, you can say

    environment.systemPackages = [ pkgs.kde4.kdesdk.kcachegrind ];

  for just kcachegrind, or 

    environment.systemPackages = [ pkgs.kde4.kdesdk ];

  to get all of kdesdk.  Everything can also be installed by name
  through nix-env.  (There is a name clash between the ColorSchemes
  packages in kdeaccessibility and kdeartwork, though.)

svn path=/nixpkgs/trunk/; revision=24294
 2010-10-14 16:49:41 +00:00
Eelco Dolstra
0fcf6e1f40 * Added xfce4-mixer. This requires gstreamer and gst-plugins-base. 
* Allow gst-plugins-base to be built with a minimal set of dependencies
  (to prevent dependency bloat in Xfce).
* Updated gstreamer.

svn path=/nixpkgs/trunk/; revision=24207
 2010-10-10 22:34:48 +00:00
Lluís Batlle i Rossell
e7e103b8eb Updating from trunk (to catch cron changes) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24200
 2010-10-10 11:44:28 +00:00
Yury G. Kudryashov
29ddcdb5ad kdepim move 
svn path=/nixpkgs/trunk/; revision=24191
 2010-10-10 05:03:07 +00:00
Lluís Batlle i Rossell
fca582bff0 Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
 2010-10-07 21:21:31 +00:00
Yury G. Kudryashov
673e66e3a3 Move most kde-extragear apps to top-level 
svn path=/nixpkgs/trunk/; revision=24092
 2010-10-05 17:44:33 +00:00
Yury G. Kudryashov
d7d8f7d64f Force stdenv2 in kde4 scope 
svn path=/nixpkgs/trunk/; revision=24090
 2010-10-05 17:44:11 +00:00
Yury G. Kudryashov
739f82a526 Digikam-1.4.0, move to all-packages.nix 
svn path=/nixpkgs/trunk/; revision=24089
 2010-10-05 17:44:05 +00:00
Yury G. Kudryashov
bf340ad55a Move kipi-plugins to apps/graphics 
svn path=/nixpkgs/trunk/; revision=24088
 2010-10-05 17:43:57 +00:00
Yury G. Kudryashov
67b5d732a2 Move kdevplatform and kdevelop to all-packages.nix 
svn path=/nixpkgs/trunk/; revision=24063
 2010-10-05 05:43:39 +00:00
Yury G. Kudryashov
6aaf62e8d7 Remove kde-l10n-ca@valencia to make hydra happy 
svn path=/nixpkgs/trunk/; revision=24048
 2010-10-04 11:32:56 +00:00
Lluís Batlle i Rossell
cd4b54748a Updating from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
 2010-10-03 09:25:34 +00:00
Russell O'Connor
e99b3198fa Make pulseaudio support in phonon configurable. 
svn path=/nixpkgs/trunk/; revision=24027
 2010-10-02 23:12:59 +00:00
Yury G. Kudryashov
1361a85331 Add kde-l10n-4.5.1 
svn path=/nixpkgs/trunk/; revision=24023
 2010-10-02 05:24:06 +00:00
Yury G. Kudryashov
b9fb4fee61 Move amarok from kde4. to applications/audio 
svn path=/nixpkgs/trunk/; revision=23956
 2010-09-26 19:40:30 +00:00
Evgeny Egorochkin
c7126b63af Amarok: make scripts work, prettify the builder 
svn path=/nixpkgs/trunk/; revision=23936
 2010-09-26 06:59:13 +00:00
Evgeny Egorochkin
8a68518454 Samba: option to compile winbind which is used by some apps under Wine 
svn path=/nixpkgs/trunk/; revision=23935
 2010-09-26 05:07:41 +00:00
Evgeny Egorochkin
80aed14c87 KDE: PIM: make it actually work if you install it, without having to hunt for missing dependencies 
svn path=/nixpkgs/trunk/; revision=23903
 2010-09-22 22:55:42 +00:00
Yury G. Kudryashov
58c09d0ff2 Move koffice to applications/office 
svn path=/nixpkgs/trunk/; revision=23900
 2010-09-22 18:04:55 +00:00
Yury G. Kudryashov
57a42bd5ba Use kdepim{,-runtime}-4.4.x in 4.5 till kdepim-4.5 will become stable 
svn path=/nixpkgs/trunk/; revision=23895
 2010-09-22 18:04:21 +00:00
Evgeny Egorochkin
cbda1c23bb KDE: Konq-plugins: packaged 
svn path=/nixpkgs/trunk/; revision=23891
 2010-09-22 07:53:28 +00:00
Evgeny Egorochkin
748fa38a35 KDE: Solid: compile in bluetooth support 
svn path=/nixpkgs/trunk/; revision=23888
 2010-09-22 00:39:38 +00:00
Yury G. Kudryashov
daa59407c7 Oops.. Wrong name 
svn path=/nixpkgs/trunk/; revision=23873
 2010-09-20 14:17:54 +00:00
Yury G. Kudryashov
b8b2e300be soprano-2.5.2 
svn path=/nixpkgs/trunk/; revision=23844
 2010-09-17 20:36:25 +00:00
Lluís Batlle i Rossell
2c5de61327 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
 2010-09-17 19:10:21 +00:00
Yury G. Kudryashov
dd37d34e5f kdeadmin-4.5.1, kdeplasma-addons-4.5.1. Have no time to split 
svn path=/nixpkgs/trunk/; revision=23805
 2010-09-15 05:19:44 +00:00
Yury G. Kudryashov
f0418c74b6 kdegames-4.5.1 
svn path=/nixpkgs/trunk/; revision=23804
 2010-09-15 05:19:35 +00:00
Yury G. Kudryashov
ecc9b176b0 kdemultimedia: tunepimp, musicbrainz 
svn path=/nixpkgs/trunk/; revision=23798
 2010-09-14 14:29:49 +00:00
Yury G. Kudryashov
95b08e5381 kdegraphics-4.5.1 
svn path=/nixpkgs/trunk/; revision=23791
 2010-09-14 14:29:08 +00:00
Yury G. Kudryashov
76a3eb02d3 kdeutils-4.5.1 
svn path=/nixpkgs/trunk/; revision=23790
 2010-09-14 14:29:01 +00:00
Yury G. Kudryashov
bb568e7467 Delete unused files 
svn path=/nixpkgs/trunk/; revision=23789
 2010-09-14 14:28:55 +00:00
Michael Raskin
b49a2d16b2 Add overridability to gnome 
svn path=/nixpkgs/trunk/; revision=23773
 2010-09-13 20:54:46 +00:00
Yury G. Kudryashov
75f08dffa6 kdewebdev-4.5.1, splitted 
svn path=/nixpkgs/trunk/; revision=23771
 2010-09-13 20:14:45 +00:00
Yury G. Kudryashov
ddce0423d9 Fix kde-4.5 kscreensaver 
svn path=/nixpkgs/trunk/; revision=23768
 2010-09-13 17:34:19 +00:00
Yury G. Kudryashov
ea18f17f8c kdetoys-4.5.1, splitted 
svn path=/nixpkgs/trunk/; revision=23759
 2010-09-13 14:23:36 +00:00
Yury G. Kudryashov
20b190b582 kdesdk-4.5.1, splitted 
svn path=/nixpkgs/trunk/; revision=23758
 2010-09-13 14:23:29 +00:00
Yury G. Kudryashov
c4beccaf1a Remove unused patch 
svn path=/nixpkgs/trunk/; revision=23757
 2010-09-13 14:23:21 +00:00
Yury G. Kudryashov
84040e15cc kdenetwork-4.5.1, kdeedu-4.5.1 
svn path=/nixpkgs/trunk/; revision=23756
 2010-09-13 14:23:16 +00:00
Yury G. Kudryashov
e723e53699 Use new ktorrent in kde44 
svn path=/nixpkgs/trunk/; revision=23755
 2010-09-13 14:23:08 +00:00
Yury G. Kudryashov
d611b0aedb Upgrade&split kdeartwork 
svn path=/nixpkgs/trunk/; revision=23752
 2010-09-13 14:22:51 +00:00
Yury G. Kudryashov
20a0469f1c kdebase-{runtime,workspace}, kdebindings 
svn path=/nixpkgs/trunk/; revision=23751
 2010-09-13 14:22:43 +00:00
Yury G. Kudryashov
e7c7d6a00d kdepim, kdepim-runtime, kdebase upgrade 
svn path=/nixpkgs/trunk/; revision=23707
 2010-09-09 20:04:56 +00:00
Yury G. Kudryashov
e7ca8b0d84 (un)propagate some buildInputs 
svn path=/nixpkgs/trunk/; revision=23706
 2010-09-09 20:04:50 +00:00
Yury G. Kudryashov
14a8df0615 kdepimlibs-4.5.1 
svn path=/nixpkgs/trunk/; revision=23680
 2010-09-08 09:56:40 +00:00
Michael Raskin
7ad068644e Adding GNOME rarian - scrollkeeper replacement 
svn path=/nixpkgs/trunk/; revision=23643
 2010-09-05 12:48:39 +00:00
Yury G. Kudryashov
99015c8de7 kdeaccessibility-4.5.1, splitted 
svn path=/nixpkgs/trunk/; revision=23637
 2010-09-04 19:53:39 +00:00
Yury G. Kudryashov
8312b2e5b9 Move kdeutils components into kdeutils. prefix 
Now one can use lib.attrValues kde45.kdeutils to install full kdeutils.

svn path=/nixpkgs/trunk/; revision=23626
 2010-09-03 17:41:00 +00:00
Yury G. Kudryashov
2c31d81cdb kdelibs-4.5.1 
svn path=/nixpkgs/trunk/; revision=23623
 2010-09-03 17:40:45 +00:00
Yury G. Kudryashov
b11040eb38 oxygen-icons-4.5.1 
svn path=/nixpkgs/trunk/; revision=23622
 2010-09-03 17:40:29 +00:00
Lluís Batlle i Rossell
ea35aa3836 Making scrollkeeper build in the loongson (config.guess trouble) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23580
 2010-09-01 08:36:35 +00:00
Yury G. Kudryashov
6473176133 Split kdeutils, adopt kdePackage 
Also migrate existing kdePackage users to new API

svn path=/nixpkgs/trunk/; revision=23525
 2010-08-29 21:20:38 +00:00
Lluís Batlle i Rossell
cca1cae042 Updating from trunk. I had to do some changes to make it fit. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23500
 2010-08-29 11:09:23 +00:00
Lluís Batlle i Rossell
66b325ebbd Revert "Updating kipi-plugins" 
I did not mean this to go upstream. This simple change was not enough.

svn path=/nixpkgs/trunk/; revision=23406
 2010-08-24 18:12:43 +00:00
Lluís Batlle i Rossell
62f191bf6f Updating kipi-plugins 
svn path=/nixpkgs/trunk/; revision=23405
 2010-08-24 17:40:40 +00:00
Ludovic Courtès
6ffaf59086 GtkGLExt 1.2.0. 
svn path=/nixpkgs/trunk/; revision=23364
 2010-08-23 14:52:00 +00:00
Yury G. Kudryashov
cbec86d7d1 Propagate gcc.libc in kdelibs-4.4 
svn path=/nixpkgs/trunk/; revision=23344
 2010-08-21 22:05:03 +00:00
Yury G. Kudryashov
3adcb12100 Fix evaluation error 
svn path=/nixpkgs/trunk/; revision=23341
 2010-08-21 20:20:34 +00:00
Yury G. Kudryashov
3537d94672 Move yakuake to pkgs 
svn path=/nixpkgs/trunk/; revision=23331
 2010-08-21 19:30:15 +00:00
Yury G. Kudryashov
682e4ae09e Move konversation to pkgs 
svn path=/nixpkgs/trunk/; revision=23330
 2010-08-21 19:29:47 +00:00
Yury G. Kudryashov
c3948239d7 Remove broken assert in sqlite backend code 
svn path=/nixpkgs/trunk/; revision=23328
 2010-08-21 19:25:44 +00:00
Yury G. Kudryashov
44b5540bfd More TODOs 
svn path=/nixpkgs/trunk/; revision=23294
 2010-08-20 21:37:56 +00:00
Yury G. Kudryashov
b97b22220f kdebase-workspace: more dependencies, list TODO 
svn path=/nixpkgs/trunk/; revision=23293
 2010-08-20 21:36:56 +00:00
Yury G. Kudryashov
3beeb6611a Use pkgs. in override, override qjson in kde-4.5 
svn path=/nixpkgs/trunk/; revision=23287
 2010-08-20 20:13:01 +00:00
Lluís Batlle i Rossell
f16353b6f2 Updated from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23275
 2010-08-20 13:41:12 +00:00
Yury G. Kudryashov
6345fa2d1d kdepim-runtime-4.4.92 
svn path=/nixpkgs/trunk/; revision=23265
 2010-08-19 22:57:09 +00:00
Yury G. Kudryashov
b16167a028 Add kdepim{,-runtime}-4.4.92 to manifest 
svn path=/nixpkgs/trunk/; revision=23264
 2010-08-19 22:56:06 +00:00
Yury G. Kudryashov
c7c210735d Fix symlink. TODO: upstream fix 
svn path=/nixpkgs/trunk/; revision=23263
 2010-08-19 22:54:38 +00:00
Yury G. Kudryashov
e16427a899 Fix broken datadir in 4.5.0 as well 
svn path=/nixpkgs/trunk/; revision=23261
 2010-08-19 22:52:00 +00:00
Yury G. Kudryashov
2957f9cc11 Now packageOverrides = p: { kde4 = kde45; qt4 = qt47; } should work 
svn path=/nixpkgs/trunk/; revision=23241
 2010-08-18 23:04:21 +00:00
Yury G. Kudryashov
59e4742a6a kdepim-4.4.5: don't build kleopatra 
It doesn't compile with new boost. If someone cares, find a patch in KDE SVN history.

svn path=/nixpkgs/trunk/; revision=23239
 2010-08-18 22:52:59 +00:00
Yury G. Kudryashov
0b8bd11ce3 Add kdeadmin-4.5.0 
svn path=/nixpkgs/trunk/; revision=23238
 2010-08-18 18:58:53 +00:00
Yury G. Kudryashov
96edbab084 kdewebdev-4.5.0 
svn path=/nixpkgs/trunk/; revision=23237
 2010-08-18 18:58:02 +00:00
Yury G. Kudryashov
6ba9dcb54c Add kdesdk-4.5.0 
svn path=/nixpkgs/trunk/; revision=23236
 2010-08-18 18:56:48 +00:00
Yury G. Kudryashov
ee6b753bfe kdeplasma-addons-4.5.0 
svn path=/nixpkgs/trunk/; revision=23232
 2010-08-18 15:55:12 +00:00
Yury G. Kudryashov
fc3845c0cd kdeedu-4.5.0 
svn path=/nixpkgs/trunk/; revision=23231
 2010-08-18 15:54:27 +00:00
Yury G. Kudryashov
0be1e1af98 Add kdenetwork-4.5.0 
svn path=/nixpkgs/trunk/; revision=23230
 2010-08-18 15:54:10 +00:00
Yury G. Kudryashov
f8a0e07815 sort, add kdegames-4.5.0 
svn path=/nixpkgs/trunk/; revision=23229
 2010-08-18 15:52:58 +00:00
Yury G. Kudryashov
ee967575e6 Add kdetoys-4.5.0 
svn path=/nixpkgs/trunk/; revision=23198
 2010-08-17 09:57:03 +00:00
Yury G. Kudryashov
501117b1c5 Rewrite builsystem fixes in upstream-supported manner 
svn path=/nixpkgs/trunk/; revision=23195
 2010-08-16 20:37:18 +00:00
Yury G. Kudryashov
6d97359a61 Add kdegraphics-4.5.0 
svn path=/nixpkgs/trunk/; revision=23190
 2010-08-16 12:40:41 +00:00
Yury G. Kudryashov
737262c779 Add kdeaccessibility-4.5.0 
svn path=/nixpkgs/trunk/; revision=23185
 2010-08-16 08:23:59 +00:00
Yury G. Kudryashov
1975eefcb4 Add kdemultimedia-4.5.0 
svn path=/nixpkgs/trunk/; revision=23172
 2010-08-14 09:46:55 +00:00
Yury G. Kudryashov
dc831feb4b Add kdeutils-4.5.0 
svn path=/nixpkgs/trunk/; revision=23170
 2010-08-13 23:50:44 +00:00
Yury G. Kudryashov
e7b1d4c69e Add kdebase-runtime-4.5.0 
svn path=/nixpkgs/trunk/; revision=23169
 2010-08-13 23:14:16 +00:00
Yury G. Kudryashov
794c9dd1d7 Add kdeartwork-4.5.0 
svn path=/nixpkgs/trunk/; revision=23163
 2010-08-13 14:06:36 +00:00
Yury G. Kudryashov
dfd195020a Add eigen to kde-4.5 
svn path=/nixpkgs/trunk/; revision=23162
 2010-08-13 14:06:29 +00:00
Peter Simons
b42dfe40ec Fix akonadi startup failure. 
Patch akonadiserver so as to correct the datadir parameter passed to
mysql. Without this patch akonadiserver in KDE 4.4.5 would not start and
consequently kmail would crash during start up.

svn path=/nixpkgs/trunk/; revision=23154
 2010-08-12 14:58:02 +00:00
Yury G. Kudryashov
ca1914fa1a Remove old patch, add new one 
Let other KDE modules install polkit policy files to $out,
not $kdelibs

svn path=/nixpkgs/trunk/; revision=23147
 2010-08-12 13:01:06 +00:00
Yury G. Kudryashov
05da3db77f Copy qca from kde-4.5 to make qca2_ossl build 
svn path=/nixpkgs/trunk/; revision=23137
 2010-08-12 10:39:29 +00:00
Yury G. Kudryashov
2050c3da77 Add kdebase-workspace-4.5.0 
svn path=/nixpkgs/trunk/; revision=23123
 2010-08-11 17:33:57 +00:00
Yury G. Kudryashov
2449006cb6 Add manifest.nix 
svn path=/nixpkgs/trunk/; revision=23122
 2010-08-11 17:31:49 +00:00
Yury G. Kudryashov
de3531c2d5 Let kdePackage use manifest.nix 
svn path=/nixpkgs/trunk/; revision=23120
 2010-08-11 16:49:31 +00:00
Yury G. Kudryashov
58ab0bf5bb Add meta.platforms 
svn path=/nixpkgs/trunk/; revision=23111
 2010-08-11 12:24:12 +00:00
Yury G. Kudryashov
78565c5b5f Add qimageblitz and kdebase-apps-4.5.0 
svn path=/nixpkgs/trunk/; revision=23099
 2010-08-10 19:57:53 +00:00
Yury G. Kudryashov
8242aa1a46 kdebindings-4.5.0 
svn path=/nixpkgs/trunk/; revision=23098
 2010-08-10 18:08:31 +00:00
Lluís Batlle i Rossell
f9692a7f40 Update from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23097
 2010-08-10 17:20:15 +00:00
Yury G. Kudryashov
c842c3f7e5 kdepimlibs-4.5.0 
svn path=/nixpkgs/trunk/; revision=23096
 2010-08-10 17:08:47 +00:00
Yury G. Kudryashov
dcb79362d3 Upgrade soprano 
svn path=/nixpkgs/trunk/; revision=23095
 2010-08-10 14:46:39 +00:00
Yury G. Kudryashov
5e42648976 State explicitly that oxygen-icons is a fixed-output derivation 
svn path=/nixpkgs/trunk/; revision=23094
 2010-08-10 14:45:15 +00:00
Yury G. Kudryashov
46c2adbc73 Slightly rewrite kde-package 
svn path=/nixpkgs/trunk/; revision=23087
 2010-08-10 09:42:57 +00:00
Eelco Dolstra
01cf8db4da * Added the Xfce power manager. 
svn path=/nixpkgs/trunk/; revision=23078
 2010-08-09 23:13:13 +00:00
Lluís Batlle i Rossell
ff5d0fa448 Merging from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23072
 2010-08-09 21:21:30 +00:00
Eelco Dolstra
153577d0f3 * Add GTK+ as a dependency to generate the icon cache. 
svn path=/nixpkgs/trunk/; revision=23071
 2010-08-09 21:14:08 +00:00
Eelco Dolstra
093980344d * More Xfce stuff. 
svn path=/nixpkgs/trunk/; revision=23067
 2010-08-09 19:41:12 +00:00
Eelco Dolstra
f0ae36e31c * Doh. 
svn path=/nixpkgs/trunk/; revision=23063
 2010-08-09 18:06:27 +00:00
Eelco Dolstra
238e80f708 * More Xfce packages. 
svn path=/nixpkgs/trunk/; revision=23061
 2010-08-09 18:02:22 +00:00
Eelco Dolstra
8b4da1a264 * Add some more Xfce packages. 
svn path=/nixpkgs/trunk/; revision=23054
 2010-08-09 11:42:55 +00:00
Eelco Dolstra
1089153c7f * Add some more Xfce packages. 
svn path=/nixpkgs/trunk/; revision=23047
 2010-08-08 22:43:00 +00:00
Eelco Dolstra
4b6b9f8256 * Apply a patch in vte to fix the cursor being invisible in xfce's 
terminal application.

svn path=/nixpkgs/trunk/; revision=23037
 2010-08-08 14:27:43 +00:00
Lluís Batlle i Rossell
46082f25f9 Updating from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23027
 2010-08-07 20:14:04 +00:00
Eelco Dolstra
10dbe2dd78 * Fix Hydra evaluation problem. 
svn path=/nixpkgs/trunk/; revision=23015
 2010-08-06 21:54:43 +00:00
Yury G. Kudryashov
e2c75baa05 kdelibs: 4.5.0, use kdePackage 
svn path=/nixpkgs/trunk/; revision=23013
 2010-08-06 20:24:17 +00:00
Yury G. Kudryashov
ede16e5dc5 polkit-qt-1: use kdePackage 
svn path=/nixpkgs/trunk/; revision=23010
 2010-08-06 20:22:22 +00:00
Yury G. Kudryashov
98c5daffeb oxygen-icons: 4.5.0, use kdePackage 
svn path=/nixpkgs/trunk/; revision=23009
 2010-08-06 20:21:08 +00:00
Yury G. Kudryashov
c766124771 Add kdePackage function 
svn path=/nixpkgs/trunk/; revision=23008
 2010-08-06 20:20:19 +00:00
Eelco Dolstra
5f8b8ae1d1 * Added weechat and updated xfce-terminal and vte. (From Graeme 
Caldwell <graemercaldwell@gmail.com>.)

svn path=/nixpkgs/trunk/; revision=22965
 2010-08-05 15:47:15 +00:00
Yury G. Kudryashov
1c0ecda5e7 Add meta.platforms 
svn path=/nixpkgs/trunk/; revision=22931
 2010-08-03 14:03:36 +00:00
Yury G. Kudryashov
3c4d5457a8 Add recurseForRelease flag 
I don't want kde-4.5 to be visible for nix-env, but I want hydra to build it

svn path=/nixpkgs/trunk/; revision=22930
 2010-08-03 14:02:42 +00:00
Yury G. Kudryashov
75bc6a2f78 Inherit some metadata from kdelibs 
svn path=/nixpkgs/trunk/; revision=22927
 2010-08-03 13:11:58 +00:00
Yury G. Kudryashov
e24d7319d4 Use callPackage in kde45 
svn path=/nixpkgs/trunk/; revision=22921
 2010-08-03 10:38:02 +00:00
Lluís Batlle i Rossell
6d15eabdc1 Merging from trunk (the callPackage change) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22915
 2010-08-03 08:14:13 +00:00
Michael Raskin
50f2d32ce9 Use updated QCA2 for psi 
svn path=/nixpkgs/trunk/; revision=22914
 2010-08-03 07:39:56 +00:00
Michael Raskin
a7adc46a3b Update parts of QCA to build with fresher OpenSSL 
svn path=/nixpkgs/trunk/; revision=22913
 2010-08-03 07:35:29 +00:00
Yury G. Kudryashov
a162c597e1 akonadi-1.4.0 
svn path=/nixpkgs/trunk/; revision=22898
 2010-08-02 17:20:40 +00:00
Yury G. Kudryashov
2d998d8fc3 Add kdebindings-4.4.95 
svn path=/nixpkgs/trunk/; revision=22895
 2010-08-02 17:18:23 +00:00
Yury G. Kudryashov
c21bd4a0c6 Add kdepimlibs 
svn path=/nixpkgs/trunk/; revision=22894
 2010-08-02 17:17:41 +00:00
Yury G. Kudryashov
1e095067cc kdelibs-4.4.95: fix python install dir 
svn path=/nixpkgs/trunk/; revision=22893
 2010-08-02 17:17:06 +00:00
Yury G. Kudryashov
ea891200d8 kde-4.5 snapshot 
svn path=/nixpkgs/trunk/; revision=22892
 2010-08-02 17:16:24 +00:00
Yury G. Kudryashov
5245e8f885 small fixes, kdepimlibs, oxygen-icons 
svn path=/nixpkgs/trunk/; revision=22891
 2010-08-02 17:14:59 +00:00
Yury G. Kudryashov
695b150844 Add polkit-qt-1, strigi, kdelibs-4.4.92 
svn path=/nixpkgs/trunk/; revision=22890
 2010-08-02 17:12:39 +00:00
Yury G. Kudryashov
915edddc5b Add parts of kdesupport for kde-4.5 
svn path=/nixpkgs/trunk/; revision=22889
 2010-08-02 17:11:19 +00:00
Lluís Batlle i Rossell
5417c720fd Merging from trunk. 
I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.


svn path=/nixpkgs/branches/stdenv-updates/; revision=22878
 2010-08-02 15:48:19 +00:00
Sander van der Burg
aaff5b7a46 Bumped eigen library to version 2.0.15 
svn path=/nixpkgs/trunk/; revision=22808
 2010-07-29 13:14:51 +00:00
Sander van der Burg
50fa8c9b86 googled + added a patch to fix compilation of kdelibs-3.5.10 against openssl-1.0.0 (yes I still need this) 
svn path=/nixpkgs/trunk/; revision=22807
 2010-07-29 12:26:59 +00:00
Eelco Dolstra
488f36ef19 * Apply a patch to make kdebindings build with the current sip. 
svn path=/nixpkgs/branches/x-updates/; revision=22670
 2010-07-19 23:24:37 +00:00
Yury G. Kudryashov
2e93e5e453 bump yakuake to 2.9.7 
svn path=/nixpkgs/trunk/; revision=22623
 2010-07-17 22:15:28 +00:00
Yury G. Kudryashov
960a0ad747 kdesupport for kde-4.5 
svn path=/nixpkgs/trunk/; revision=22622
 2010-07-17 22:14:54 +00:00
Michael Raskin
80e2d957e6 Add a patch to work around GNU TLS behavior 
svn path=/nixpkgs/trunk/; revision=22540
 2010-07-08 20:38:48 +00:00
Michael Raskin
b3378524fa Add libsoup 2.31 - may work better with GnuTLS update 
svn path=/nixpkgs/trunk/; revision=22523
 2010-07-08 09:02:10 +00:00
Sander van der Burg
59710637c1 Fixed compilation of kdeplasma-addons-4.4.5 
svn path=/nixpkgs/trunk/; revision=22447
 2010-07-03 15:17:02 +00:00
Yury G. Kudryashov
04225887fa Upgrade attica and soprano 
svn path=/nixpkgs/trunk/; revision=22445
 2010-07-03 09:18:55 +00:00
Lluís Batlle i Rossell
aabb9d5ec6 Updating the kde l10n files from 4.4.4 to 4.4.5 (I forgot about them, Sander!) 
svn path=/nixpkgs/trunk/; revision=22443
 2010-07-02 21:44:36 +00:00
Lluís Batlle i Rossell
94fd6da74e Updating kde from 4.4.4 to 4.4.5 (a bit blind; I know it builds, but the kde4 test fails for me for a 
not-kde reason - let's see how hydra tests it)

svn path=/nixpkgs/trunk/; revision=22441
 2010-07-02 20:46:42 +00:00
Sander van der Burg
3327ef177f Upgraded konversation to version 1.3 
svn path=/nixpkgs/trunk/; revision=22439
 2010-07-01 15:20:14 +00:00
Sander van der Burg
6e9cc67a25 Added k3b-2.0.0 for KDE 4.X 
svn path=/nixpkgs/trunk/; revision=22438
 2010-07-01 15:00:46 +00:00
Yury G. Kudryashov
6caaf0286d kdesdk: add hunspell to make lokalize compile 
svn path=/nixpkgs/trunk/; revision=22433
 2010-06-30 15:54:40 +00:00
Yury G. Kudryashov
1bd76098fe Upgrade akonadi to 1.3.85 
svn path=/nixpkgs/trunk/; revision=22431
 2010-06-30 15:52:24 +00:00
Yury G. Kudryashov
66ff572c8b koffice: add fftw and fix FindWPD.cmake 
svn path=/nixpkgs/trunk/; revision=22426
 2010-06-28 20:56:16 +00:00
Yury G. Kudryashov
74d75bdd6c phonon-4.4.2 
svn path=/nixpkgs/trunk/; revision=22363
 2010-06-21 19:25:20 +00:00
Evgeny Egorochkin
e803a33a5c Make Nepomuk work 
svn path=/nixpkgs/trunk/; revision=22337
 2010-06-19 21:35:18 +00:00
Marc Weber
f3e7f0fdf0 reverting my patch series adding -j -l support for make 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22336
 2010-06-19 15:52:28 +00:00
Lluís Batlle i Rossell
57c012a16c Attempt at adding 'pinta'. It still does not build due to mono problems. 
Nevertheless, I updated the gnome attribute names a bit so all that
gtk-sharp-2 goes a bit beyond.

svn path=/nixpkgs/trunk/; revision=22287
 2010-06-15 22:25:38 +00:00
Marc Weber
2dafd54743 opt-out some failing phases 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22285
 2010-06-15 19:00:58 +00:00
Sander van der Burg
1e3e2f42a2 Upgraded koffice to 2.2.0 
svn path=/nixpkgs/trunk/; revision=22153
 2010-06-04 21:27:38 +00:00
Sander van der Burg
37427ca5db Removed security patch which is not applicable anymore to version 4.4.4 
svn path=/nixpkgs/trunk/; revision=22152
 2010-06-04 17:01:42 +00:00
Sander van der Burg
3c3d5d5184 Upgraded KDE SC to version 4.4.4 
svn path=/nixpkgs/trunk/; revision=22139
 2010-06-04 11:13:47 +00:00
Armijn Hemel
9f9f58ead9 update to 2.3.1 
svn path=/nixpkgs/trunk/; revision=22134
 2010-06-03 21:32:28 +00:00
Ludovic Courtès
25a7c36007 GTK-Doc 1.15, with PDF support. 
svn path=/nixpkgs/trunk/; revision=22004
 2010-05-27 13:08:21 +00:00
Yury G. Kudryashov
b6a166946d yakuake: fix eval error 
svn path=/nixpkgs/trunk/; revision=21964
 2010-05-25 09:02:25 +00:00
Yury G. Kudryashov
e1f009b9df Add yakuake 
svn path=/nixpkgs/trunk/; revision=21954
 2010-05-24 08:19:41 +00:00
Peter Simons
807ed4dea3 pkgs/desktops/gnome-2.28/default.nix: strip trailing white space 
svn path=/nixpkgs/trunk/; revision=21861
 2010-05-19 12:25:41 +00:00
Peter Simons
af899f1956 pkgs/desktops/gnome-2.28/platform/libIDL: fixed build failure on Darwin 
The build needs gettext, or it will fail to link libintl.

svn path=/nixpkgs/trunk/; revision=21860
 2010-05-19 12:25:38 +00:00
Peter Simons
0db2caa183 pkgs/desktops/gnome-2.28/platform/gnome-vfs: don't require hal unless the host OS is Linux 
svn path=/nixpkgs/trunk/; revision=21859
 2010-05-19 12:25:35 +00:00
Peter Simons
cbc19490b9 Add Xfce Terminal emulator. 
Adds the terminal emulator, and the libraries that it depends upon.

svn path=/nixpkgs/trunk/; revision=21820
 2010-05-17 16:16:39 +00:00
Yury G. Kudryashov
dd6d459130 Add otr support to kopete 
svn path=/nixpkgs/trunk/; revision=21770
 2010-05-13 22:14:16 +00:00
Yury G. Kudryashov
43106b4d04 Apply upstream security patch to kget 
svn path=/nixpkgs/trunk/; revision=21769
 2010-05-13 22:05:08 +00:00
Yury G. Kudryashov
ab6031464a Upgrade phonon to 4.4.1 
svn path=/nixpkgs/trunk/; revision=21660
 2010-05-08 17:03:07 +00:00
Peter Simons
79a6a66322 libgnomeprintui derivation 
svn path=/nixpkgs/trunk/; revision=21647
 2010-05-07 14:01:52 +00:00
Eelco Dolstra
57c049f4a0 * meta.platforms is a list of strings, not a list of lists of strings 
(http://hydra.nixos.org/build/399330). 
* Fix the indentation of longDescription.

svn path=/nixpkgs/trunk/; revision=21640
 2010-05-07 10:02:52 +00:00
Yury G. Kudryashov
5eca4b85f1 metadata for kdevplatform and kdevelop 
svn path=/nixpkgs/trunk/; revision=21637
 2010-05-07 07:38:35 +00:00
Sander van der Burg
65c05f03da Changed version in derivation names to 4.4.3 
svn path=/nixpkgs/trunk/; revision=21625
 2010-05-06 11:54:41 +00:00
Sander van der Burg
e7a10e7142 Bumped KDE SC to version 4.4.3 
svn path=/nixpkgs/trunk/; revision=21622
 2010-05-06 09:33:40 +00:00
Yury G. Kudryashov
e58d461623 Add kdevelop 
svn path=/nixpkgs/trunk/; revision=21613
 2010-05-05 18:18:05 +00:00
Yury G. Kudryashov
8fce481d76 Add kdevplatform 
svn path=/nixpkgs/trunk/; revision=21612
 2010-05-05 18:18:00 +00:00
Yury G. Kudryashov
5008f2dba6 add enchant support to kdelibs 
svn path=/nixpkgs/trunk/; revision=21610
 2010-05-05 18:17:50 +00:00
Yury G. Kudryashov
320ce20929 Revert "Really add policykit support to kdebase-workspace" 
svn path=/nixpkgs/trunk/; revision=21609
 2010-05-05 18:17:45 +00:00
Yury G. Kudryashov
d61f35545c kdeedu: drop libfacile as kdeedu fails to find it; use libspectre. 
svn path=/nixpkgs/trunk/; revision=21608
 2010-05-05 18:17:40 +00:00
Yury G. Kudryashov
b2ed8f1aa0 Propagate policykit 
svn path=/nixpkgs/trunk/; revision=21607
 2010-05-05 18:17:35 +00:00
Yury G. Kudryashov
a44db4e52d Adjust plugin install dir to changes in qt 
svn path=/nixpkgs/trunk/; revision=21606
 2010-05-05 18:17:30 +00:00
Yury G. Kudryashov
2d9ba975e7 digikam: use external lensfun and lqr-1 
svn path=/nixpkgs/trunk/; revision=21561
 2010-05-03 03:45:58 +00:00
Yury G. Kudryashov
4ba1c06c89 Support nepomuk and marble in digikam. 
Also stop passing lib.

svn path=/nixpkgs/trunk/; revision=21465
 2010-04-30 20:40:11 +00:00
Lluís Batlle i Rossell
a386398be6 Adding kdenlive, and as a side effect, mlt. 
Kdenlive looks for some binaries in PATH, so some dependencies may be fulfilled
not by kdenlive nix expression.

svn path=/nixpkgs/trunk/; revision=21458
 2010-04-30 13:12:07 +00:00
Lluís Batlle i Rossell
fa2177ed5c Making filelight built by hydra (I added the platforms meta attribute) 
svn path=/nixpkgs/trunk/; revision=21444
 2010-04-29 21:32:01 +00:00
Lluís Batlle i Rossell
f85992530f Adding meta information to kdiff3 so it gets built by hydra 
svn path=/nixpkgs/trunk/; revision=21443
 2010-04-29 21:31:35 +00:00
Yury G. Kudryashov
54224374cc Delete unused builder.sh 
svn path=/nixpkgs/trunk/; revision=21441
 2010-04-29 19:09:33 +00:00
Yury G. Kudryashov
a4842e0987 Really add policykit support to kdebase-workspace 
svn path=/nixpkgs/trunk/; revision=21329
 2010-04-26 20:39:08 +00:00
Eelco Dolstra
e2a374799f * Reverted most of the recent Python refactorings, as discussed. It's 
a worthy goal to move the Python packages that are currently in
  all-packages.nix into a single attribute set, but this doesn't
  require moving python-packages.nix or the other changes made to that
  file.  The Python packages in all-packages.nix should simply be
  moved to python-packages.nix, and ideally changed to use
  buildPythonPackage.

svn path=/nixpkgs/trunk/; revision=21196
 2010-04-21 10:51:15 +00:00
Yury G. Kudryashov
7a3f602580 Get rid of decibel and tapioca-qt 
It never worked, and nothing use it.

svn path=/nixpkgs/trunk/; revision=21185
 2010-04-20 17:06:19 +00:00
Lluís Batlle i Rossell
8cf18e0ae4 Revert "Removing the amarok dependency on qscriptgenerator." 
Amarok wants it.

svn path=/nixpkgs/trunk/; revision=21155
 2010-04-19 10:24:13 +00:00
Lluís Batlle i Rossell
673d1674fb Making kdeadmin build (pkgs => pythonpackages change) 
svn path=/nixpkgs/trunk/; revision=21154
 2010-04-19 10:24:09 +00:00
Lluís Batlle i Rossell
98c2d9c386 Removing the amarok dependency on qscriptgenerator. 
It builds fine, even in x86_64, where it failed.

svn path=/nixpkgs/trunk/; revision=21153
 2010-04-19 09:50:12 +00:00
Yury G. Kudryashov
6338c68dcd Inherit from pythonPackages, not pkgs 
svn path=/nixpkgs/trunk/; revision=21152
 2010-04-19 09:29:06 +00:00
Rob Vermaas
2b42e23a64 libgweather: added assertion 
svn path=/nixpkgs/trunk/; revision=21113
 2010-04-16 06:47:55 +00:00
Yury G. Kudryashov
cafe94f42d Add qca openssl plug-in 
svn path=/nixpkgs/trunk/; revision=21044
 2010-04-13 06:53:51 +00:00
Yury G. Kudryashov
f25c68f01a Remove old kde packages 
svn path=/nixpkgs/trunk/; revision=21011
 2010-04-11 15:50:41 +00:00
Lluís Batlle i Rossell
3fd062e933 Fixing kde44 qimageblitz. I remove the patch about FindQt4.cmake; let's trust 
its version better.

svn path=/nixpkgs/trunk/; revision=20997
 2010-04-09 18:43:56 +00:00
Sander van der Burg
7e2ce26e09 Upgraded koffice to 2.1.2 
svn path=/nixpkgs/trunk/; revision=20970
 2010-04-07 13:59:34 +00:00
Eelco Dolstra
21cae80fed svn path=/nixpkgs/trunk/; revision=20951 2010-04-06 09:45:37 +00:00
Yury G. Kudryashov
39c24a4801 Bump soprano to 2.4.1 
Add virtuoso backend. Another full KDE rebuild.

svn path=/nixpkgs/trunk/; revision=20933
 2010-04-03 17:34:26 +00:00
Yury G. Kudryashov
f0f1958830 Get rid of redland-1.0.8 
1.0.9 was buggy, but it is fixed in 1.0.10

svn path=/nixpkgs/trunk/; revision=20930
 2010-04-03 09:54:22 +00:00
Lluís Batlle i Rossell
4a6cfd435e Removing a part of the cmake setup-hook that broke at least the findqt4 cmake module. 
That way, we don't need the patch anymore to fix what that part broke.

Also kde stops needing the findqt4 patch (for its own copy of the findqt4 cmake module).

I tested a nixos-rebuild with kde4, and it builds as far as hydra built with this configuration.

svn path=/nixpkgs/trunk/; revision=20921
 2010-04-01 18:19:44 +00:00
Yury G. Kudryashov
766add2f8a Really use djvulibre parameter 
svn path=/nixpkgs/trunk/; revision=20919
 2010-04-01 15:17:22 +00:00
Sander van der Burg
4017164a80 Upgraded KDE to version 4.4.2 
svn path=/nixpkgs/trunk/; revision=20885
 2010-03-31 09:47:34 +00:00
Armijn Hemel
c121776718 update to 1.2.0 
svn path=/nixpkgs/trunk/; revision=20860
 2010-03-29 17:38:23 +00:00
Armijn Hemel
37cba95518 update to 1.1.0 
svn path=/nixpkgs/trunk/; revision=20803
 2010-03-23 23:10:55 +00:00
Armijn Hemel
c80ae6de3a update to 0.11.2a 
svn path=/nixpkgs/trunk/; revision=20800
 2010-03-23 22:35:58 +00:00
Armijn Hemel
d60cba16e2 update to 2.3.0 
svn path=/nixpkgs/trunk/; revision=20799
 2010-03-23 22:18:25 +00:00
Lluís Batlle i Rossell
2ce4840754 Adding kdiff3 as extragear. 
I don't know if 'extragear' involves a specific list of packages.

(Thanks to Stephen for a patch)

svn path=/nixpkgs/trunk/; revision=20634
 2010-03-15 14:26:58 +00:00
Sander van der Burg
e51cfc777a Added libv4l which is now a required dependency for kdenetwork-4.4.1 
svn path=/nixpkgs/trunk/; revision=20349
 2010-03-03 10:37:38 +00:00
Sander van der Burg
5984fe2daa Took viric's update script from the 4.3.x tree and updated KDE to 4.4.1 
svn path=/nixpkgs/trunk/; revision=20348
 2010-03-02 22:49:08 +00:00
Lluís Batlle i Rossell
72edd54741 Making digikam build with kdeedu, to get the marble widget working to geolocate photos. 
svn path=/nixpkgs/trunk/; revision=20266
 2010-02-26 10:41:53 +00:00
Lluís Batlle i Rossell
40985548d1 Merging from Oleksandr: 
Updating some gnome packages and pigz.


svn path=/nixpkgs/trunk/; revision=20154
 2010-02-21 12:25:36 +00:00
Alexander Tsamutali
7a05d7ca38 desktops/gnome-2.28/desktop/vte: New nixpkg. 
svn path=/nixpkgs/trunk/; revision=20142
 2010-02-20 19:24:52 +00:00
Sander van der Burg
c8555cfd1b Upgraded ktorrent to 3.3.4 
svn path=/nixpkgs/trunk/; revision=20047
 2010-02-16 11:22:54 +00:00
Sander van der Burg
730cbfd6f5 Upgraded konversation to 1.2.3 
svn path=/nixpkgs/trunk/; revision=20046
 2010-02-16 11:21:40 +00:00
Sander van der Burg
f8ac1928b2 Upgraded kdesvn to 1.5.2 
svn path=/nixpkgs/trunk/; revision=20045
 2010-02-16 11:19:50 +00:00
Sander van der Burg
70c5690a76 Upgraded koffice to 2.1.1 
svn path=/nixpkgs/trunk/; revision=20044
 2010-02-16 11:15:57 +00:00
Sander van der Burg
3c4f2a35a4 Fixed compilation of kdenetwork-4.4.0 
svn path=/nixpkgs/trunk/; revision=20033
 2010-02-15 22:37:30 +00:00
Sander van der Burg
45a92833bd Added rhpl as buildInput to kdeutils so that system-config-printer can be used 
svn path=/nixpkgs/trunk/; revision=20032
 2010-02-15 22:20:05 +00:00
Sander van der Burg
61980ddf12 Fixed rhpl which also fixes printer support in kdeadmin 
svn path=/nixpkgs/trunk/; revision=20031
 2010-02-15 21:53:31 +00:00
Lluís Batlle i Rossell
d43afaf102 Fixing the derivation names for kde 4.3.5 l10n 
svn path=/nixpkgs/trunk/; revision=20027
 2010-02-15 19:53:58 +00:00
Lluís Batlle i Rossell
9181aca12e Adding a script to update kde 4.3. This can be used for 4.4 too. 
I updated kde 4.3.4 to 4.3.5.

svn path=/nixpkgs/trunk/; revision=20026
 2010-02-15 19:43:02 +00:00
Sander van der Burg
a928ee6ea0 Upgraded soprano to 2.4.0.1 hotfix release 
svn path=/nixpkgs/trunk/; revision=20022
 2010-02-15 18:05:47 +00:00
Sander van der Burg
1ec8a7412a Fixed compilation of kdeplasma-addons by passing libXi as buildInput 
svn path=/nixpkgs/trunk/; revision=20021
 2010-02-15 18:03:27 +00:00
Sander van der Burg
de25c3f41d Added libXtst as buildInput in order to fix the compilation of kdeplasma-addons 
svn path=/nixpkgs/trunk/; revision=20001
 2010-02-14 23:07:57 +00:00
Sander van der Burg
41c17ffebf Added attica to buildInputs of kdeplasma-addons-4.4.0 
svn path=/nixpkgs/trunk/; revision=20000
 2010-02-14 23:04:56 +00:00
Sander van der Burg
a6898fba99 Fixed compilation of kdesdk-4.4.0 
svn path=/nixpkgs/trunk/; revision=19998
 2010-02-14 22:44:05 +00:00
Sander van der Burg
2d2cb184c8 Fixed compilation of kdegames-4.4.0 
svn path=/nixpkgs/trunk/; revision=19997
 2010-02-14 22:40:28 +00:00
Sander van der Burg
ceda76efcf Added comment about missing speechd dependency 
svn path=/nixpkgs/trunk/; revision=19996
 2010-02-14 22:19:15 +00:00
Sander van der Burg
019db7b9dc - Added libssh (used by kdebase-runtime) 
- Completed kdebase-runtime 4.4.0


svn path=/nixpkgs/trunk/; revision=19994
 2010-02-14 21:56:35 +00:00
Sander van der Burg
6eb2cc674a Patches the python modules path of kdebase-workspace to compile with kdebindings again 
svn path=/nixpkgs/trunk/; revision=19992
 2010-02-14 21:19:45 +00:00
Lluís Batlle i Rossell
bc15e7b440 I removed too much in the previous commit - I fix nixpkgs kde44 evaluation. 
svn path=/nixpkgs/trunk/; revision=19979
 2010-02-13 16:06:30 +00:00
Lluís Batlle i Rossell
cb7f9b8e52 Removing kdelibs_experimental mentions in kde44 expressions. This removes the workspace builder/patch too. 
svn path=/nixpkgs/trunk/; revision=19977
 2010-02-13 15:49:01 +00:00
Lluís Batlle i Rossell
aaffbe6971 kdeedu builds, and kdebindings build 
svn path=/nixpkgs/trunk/; revision=19976
 2010-02-13 15:37:06 +00:00
Lluís Batlle i Rossell
ce46e7ff63 Found a new phonon (in 'unstable'), and I think kde-4.4 should be able to link with it. 
I updated gstreamer too, because this phonon was not finding a header file. As that
did not fix much the phonon build, I helped the generic builder with NIX_CFLAGS_COMPILER for
phonon to find the proper header files. Either the phonon cmake scripts don't find properly
the gstreamer plugins header file, or we install gstreamer in a strange way.

svn path=/nixpkgs/trunk/; revision=19974
 2010-02-13 14:03:07 +00:00
Sander van der Burg
e4b1633d6b Some fixes to kdebindings. I now builds again but still gives me a compile error 
svn path=/nixpkgs/trunk/; revision=19973
 2010-02-13 14:02:07 +00:00
Lluís Batlle i Rossell
3615623c94 Kde 4.4 runtime wants attica. 
svn path=/nixpkgs/trunk/; revision=19970
 2010-02-13 00:06:51 +00:00
Lluís Batlle i Rossell
9cddc91b91 Fixing a hash in kde 4.4 artwork 
svn path=/nixpkgs/trunk/; revision=19967
 2010-02-12 23:19:31 +00:00
Lluís Batlle i Rossell
e0ff817c40 Big kde-related update. 
I updated cmake to use CMAKE_PREFIX_PATH instead of CMAKE_INCLUDE_PATH and CMAKE_LIBRARY_PATH.
There were some expressions in kde that required CMAKE_PREFIX_PATH, and now they are not anymore
a special case.
I updated most kde-4.4 files to point to kde-4.4.0 sources instead of 4.3.4 .

svn path=/nixpkgs/trunk/; revision=19965
 2010-02-12 21:58:27 +00:00
Lluís Batlle i Rossell
333dfb869e More on kde44 builds. More findqt4.cmake copies around fixed, and 
set shared_desktop_ontologies to be propagated in kdelibs.
(Maybe only kdegraphics wants it? I think more will want it, so I set it
in propagatedBuildInputs)

svn path=/nixpkgs/trunk/; revision=19962
 2010-02-12 17:53:51 +00:00
Lluís Batlle i Rossell
3672eaf275 Forgot the patch for kde-4.4 findqt4. 
svn path=/nixpkgs/trunk/; revision=19961
 2010-02-12 17:04:15 +00:00
Lluís Batlle i Rossell
ffcac187e8 Trying to get kde-4.4 build *normally*. That is, without the hack "includeAllQtDirs". 
I patched properly their own copy of cmake findqt4 module, the same way as we had to
do in the cmake expression.
The findqt4 patch we have is already filled in the cmake buglist, but it seems it is
still not solved in in cmake 2.8.0

svn path=/nixpkgs/trunk/; revision=19960
 2010-02-12 17:02:45 +00:00
Sander van der Burg
740a6fe281 - Some updates to KDE 4.4. kdelibs is still broken though 
- Updated eduke32 to use the new polymer renderer which is so cool :-)


svn path=/nixpkgs/trunk/; revision=19930
 2010-02-11 13:34:28 +00:00
Lluís Batlle i Rossell
ef9ef781ea Trying to update kipi-plugins. 
svn path=/nixpkgs/trunk/; revision=19918
 2010-02-10 23:46:46 +00:00
Lluís Batlle i Rossell
3c441a4efb Trying to update digikam (both kde44 and kde43) 
svn path=/nixpkgs/trunk/; revision=19917
 2010-02-10 23:38:02 +00:00
Sander van der Burg
31cbd149d2 - Completed all dependencies for kdelibs-4.4.0 
- Added SIP 4.10 required for pyqt-4.7.x
- Removed kde libs experimental, which does not exists anymore in 4.4.0


svn path=/nixpkgs/trunk/; revision=19910
 2010-02-10 16:01:55 +00:00
Sander van der Burg
bcb6e407ea Added my initial KDE 4.4 expression 
svn path=/nixpkgs/trunk/; revision=19906
 2010-02-10 15:06:50 +00:00
Eelco Dolstra
d8c6bb130c * Sync with the trunk one last time. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19849
 2010-02-05 23:06:36 +00:00
Armijn Hemel
9ba64dc6d9 update Amarok to 2.2.2 
svn path=/nixpkgs/trunk/; revision=19826
 2010-02-04 22:33:18 +00:00
Eelco Dolstra
a617a7c239 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19786
 2010-02-03 14:23:43 +00:00
Eelco Dolstra
3687f56e7a * Drop the rhpl dependency in kdeadmin and kdeutils because it doesn't 
build.

svn path=/nixpkgs/branches/stdenv-updates/; revision=19779
 2010-02-03 12:56:57 +00:00
Eelco Dolstra
77bf39bf82 * Fix Nixpksg evaluation. 
svn path=/nixpkgs/trunk/; revision=19706
 2010-01-27 10:58:31 +00:00
Lluís Batlle i Rossell
029cd0a213 Adding gtkhtml, another program needed for gnucash to build. 
I thought gtkhtml was not needed, and in my previous commit I removed it as a gnucash dependency.


svn path=/nixpkgs/trunk/; revision=19639
 2010-01-24 22:07:53 +00:00
Lluís Batlle i Rossell
6f462d2c7c Adding (quite blindly) some gnome packages to get gnucash built. 
svn path=/nixpkgs/trunk/; revision=19638
 2010-01-24 21:32:09 +00:00
Armijn Hemel
53abbeb8e7 fix path for patch 
svn path=/nixpkgs/trunk/; revision=19502
 2010-01-17 20:19:47 +00:00
Armijn Hemel
fe20c0ad38 add patch from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=526164 
svn path=/nixpkgs/trunk/; revision=19501
 2010-01-17 20:12:04 +00:00
Lluís Batlle i Rossell
87e357c167 Enabling ACLs in kdelibs. Not in the cleanest way, but I wrote a comment about the hack. 
svn path=/nixpkgs/trunk/; revision=19496
 2010-01-17 00:15:22 +00:00
Lluís Batlle i Rossell
9b5743ceac Adding kerberos into kdelibs (I think this may enable konqueror browse https) 
svn path=/nixpkgs/trunk/; revision=19495
 2010-01-16 23:40:30 +00:00
Lluís Batlle i Rossell
1743ba3ba8 Adding the digikam I forgot before. Enabling in it and kipi-plugins 'platforms' for hydra 
to build them.

svn path=/nixpkgs/trunk/; revision=19490
 2010-01-16 21:07:32 +00:00
Lluís Batlle i Rossell
063ef1925d Adding digikam and kipi-plugins for kde4. 
svn path=/nixpkgs/trunk/; revision=19488
 2010-01-16 20:13:20 +00:00
Lluís Batlle i Rossell
30f1f2312d Updating strigi 
svn path=/nixpkgs/trunk/; revision=19483
 2010-01-16 15:06:55 +00:00
Michael Raskin
d263076f5a Minor update of libsoup 
svn path=/nixpkgs/trunk/; revision=19424
 2010-01-14 09:23:38 +00:00
Armijn Hemel
a8eaa8c486 update to 3.3.2 
svn path=/nixpkgs/trunk/; revision=19104
 2009-12-25 00:16:39 +00:00
Armijn Hemel
b668bddc97 update amarok to 2.2.1, doesn't run on Fedora 12 with GNOME though, possibly related to something else going wrong 
svn path=/nixpkgs/trunk/; revision=19100
 2009-12-24 23:11:30 +00:00
Armijn Hemel
fc8a7ab83a sync name with actual version 
svn path=/nixpkgs/trunk/; revision=19099
 2009-12-24 22:18:28 +00:00
Sander van der Burg
f8ad31189f Massive KDE upgrade: 
- Upgraded KDE to 4.3.4
- Upgraded KOffice to 2.1.0
- Upgraded Konversation to 1.2.1
- Upgraded kdesvn to 1.4.1
- Upgraded ktorrent to 3.3.1


svn path=/nixpkgs/trunk/; revision=18751
 2009-12-02 10:51:33 +00:00
Lluís Batlle i Rossell
c922164751 Adding filelight for kde4. 
svn path=/nixpkgs/trunk/; revision=18570
 2009-11-23 21:15:11 +00:00
Sander van der Burg
853bfbd0b6 Upgraded eigen to 2.0.9 
svn path=/nixpkgs/trunk/; revision=18484
 2009-11-20 13:21:58 +00:00
Michael Raskin
0c0f090bc9 Fix gnome-doc-utils 
svn path=/nixpkgs/trunk/; revision=18247
 2009-11-07 09:34:12 +00:00
Sander van der Burg
9d3ccc5116 Fixed kdenetwork and accessibility 
svn path=/nixpkgs/trunk/; revision=18168
 2009-11-05 22:16:31 +00:00
Sander van der Burg
775075a0e8 Upgraded KDE to 4.3.3 
svn path=/nixpkgs/trunk/; revision=18132
 2009-11-05 12:13:46 +00:00
Eelco Dolstra
304e339d4f * Added libglademm. 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18120
 2009-11-04 22:07:32 +00:00
Eelco Dolstra
81f1c3e7d5 * Get rid of Gnome 2.26. 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18119
 2009-11-04 21:50:13 +00:00
Eelco Dolstra
ac4d183051 * Added gnome-icon-theme. 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18118
 2009-11-04 21:44:01 +00:00
Eelco Dolstra
cfe0ffad3a * Fixed some more Gnome packages. 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18088
 2009-11-04 09:17:27 +00:00
Eelco Dolstra
7cec6e4f52 * Fix startup-notification. 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18087
 2009-11-04 07:33:27 +00:00
Eelco Dolstra
56ea7df62d * Several buildInputs of Gnome-related packages should be 
propagatedBuildInputs, because those inputs are required by the *.pc
  or *.la files of the package:

  - If a *.pc file references a non-propagated input, then Gnome
    packages have the bad tendency to silently ignore this problem in
    configure scripts - the failure of a command like `pkg-config
    --cflags foo' will be ignored if a dependency of foo.pc is
    missing, so no flags will be added, and the build will fail later
    on a missing header or library.

  - If a *.la file references a non-propagated input, the build will
    also fail, because Libtool will add library dependencies that it
    cannot find.  (Arguably *.la files should never reference packages
    that aren't in the corresponding *.pc file, but they do it
    anyway).

  By setting the propagatedBuildInputs properly, it should be possible
  to get rid of all the NIX_CFLAGS_COMPILE / NIX_LDFLAGS hacks in the
  Gnome expressions.

svn path=/nixpkgs/branches/xorg-7.5/; revision=18084
 2009-11-03 23:26:14 +00:00
Eelco Dolstra
6fbcf62941 * Fix libgsf. 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18081
 2009-11-03 21:48:09 +00:00
Eelco Dolstra
f1f8debe62 * Lots of packages refer to gnomevfs and startupnotification. 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18079
 2009-11-03 20:56:26 +00:00
Eelco Dolstra
9692c7f38c * Lots of packages refer to gnome.glib etc., so propagate them. 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18063
 2009-11-01 14:15:03 +00:00
Eelco Dolstra
18e5da0f60 * Delete the old Gnome. 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18062
 2009-11-01 14:14:27 +00:00
Eelco Dolstra
05ff927d83 * Bring back libXxf86misc and xf86miscproto. These were removed from 
X.org, but some packages still need them.

svn path=/nixpkgs/branches/xorg-7.5/; revision=18038
 2009-10-29 18:25:53 +00:00
Eelco Dolstra
5884530154 * Deleted KDE 4.2. 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18035
 2009-10-29 18:04:46 +00:00
Marc Weber
9252996ae7 ktorrent update - by Russell O'Connor 
svn path=/nixpkgs/trunk/; revision=17925
 2009-10-22 15:41:37 +00:00
Michael Raskin
bed14405fb Fix gtkglext build 
svn path=/nixpkgs/trunk/; revision=17906
 2009-10-21 07:02:04 +00:00
Michael Raskin
cfb6be6e31 Add gtkglext 
svn path=/nixpkgs/trunk/; revision=17905
 2009-10-20 22:20:58 +00:00
Lluís Batlle i Rossell
585654955f Removing references to libkipi. I just discovered it is for kde 3.x. 
svn path=/nixpkgs/trunk/; revision=17746
 2009-10-11 15:52:03 +00:00
Lluís Batlle i Rossell
613ae5e387 Trying to add kde43.libkipi. It still doesn't work, but the actual expression 
triggers "nix-instantiate killed by signal 6 (SIGABRT)". Try it with:
nix-build -A kde43.libkipi /etc/nixos/nixpkgs

svn path=/nixpkgs/trunk/; revision=17745
 2009-10-11 15:16:46 +00:00
Sander van der Burg
4232caa53f Added konversation for KDE 4.x package 
svn path=/nixpkgs/trunk/; revision=17741
 2009-10-10 12:51:51 +00:00
Sander van der Burg
730c14b4b7 Upgraded KDE to version 4.3.2 
svn path=/nixpkgs/trunk/; revision=17675
 2009-10-06 12:38:37 +00:00
Lluís Batlle i Rossell
d34b69e638 Adding all kde language files, and a script to update them for next kde versions. 
I added recurseIntoAttrs in the kde43 expression in order to get the next recurseIntoAttrs
in l10n working. But as I checked, the kde43 attributes were already shown by
nix-env -qa '*' without any recurseIntoAttrs, I don't know why. If anyone knows, let me know.

svn path=/nixpkgs/trunk/; revision=17628
 2009-10-03 13:37:31 +00:00
Sander van der Burg
a9e0071c02 Added builder script for KDE PIM runtime 
svn path=/nixpkgs/trunk/; revision=17626
 2009-10-03 12:25:57 +00:00