BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
39412 commits 1 branch 0 tags 3.8 GiB
Commit graph

1173 commits

Author SHA1 Message Date
Eelco Dolstra
7bfdeb102b kde-workspace: Disable parallel building 
Maybe this fixes this build failure:

In file included from /tmp/nix-build-103m3iz49n04a7h1pzinalqnw7x5g0da-kde-workspace-4.8.4.drv-0/kde-workspace-4.8.4/plasma/generic/runners/kill/killrunner.h:28:0,
                 from /tmp/nix-build-103m3iz49n04a7h1pzinalqnw7x5g0da-kde-workspace-4.8.4.drv-0/kde-workspace-4.8.4/plasma/generic/runners/kill/killrunner.cpp:20:
/tmp/nix-build-103m3iz49n04a7h1pzinalqnw7x5g0da-kde-workspace-4.8.4.drv-0/kde-workspace-4.8.4/plasma/generic/runners/kill/killrunner_config.h:24:34: fatal error: ui_killrunner_config.h: No such file or directory
compilation terminated.

http://hydra.nixos.org/build/2837527
 2012-07-25 14:49:16 -04:00
Joachim Schiele
538b17a791 fixed most virt-manager issues! 2012-07-20 23:27:24 +00:00
Antono Vasiljev
cd7027bdae GNOME3: at-spi2-atk (TODO: deal with gschemas.compiled conflict) 2012-07-18 01:46:29 +03:00
Antono Vasiljev
78c742c720 GNOME3: at-spi2-core 2012-07-18 01:29:22 +03:00
Antono Vasiljev
78310258e3 Attempt to define isolated attrset for gnome-3 2012-07-10 19:03:13 +03:00
Peter Simons
f9d9a0c4ca gtkglextmm: add version 1.2.0 
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
 2012-07-02 17:13:36 +02:00
Peter Simons
07e94a8892 gconfmm: add version 2.28.3 
Patch submitted by Jan Malakhovski <oxij@oxij.org>.
 2012-07-02 17:13:35 +02:00
Yury G. Kudryashov
29b8d20f33 Fix old typo in kdeutils/superkaramba.nix 
svn path=/nixpkgs/trunk/; revision=34408
 2012-06-09 13:09:59 +00:00
Yury G. Kudryashov
98a130a504 Fix some find_* 
svn path=/nixpkgs/trunk/; revision=34407
 2012-06-09 13:09:56 +00:00
Yury G. Kudryashov
e4c0e87db0 KDE SC 4.8.4 (automatic changes) 
svn path=/nixpkgs/trunk/; revision=34400
 2012-06-09 13:09:29 +00:00
Cillian de Roiste
6bf4d9522a Submitting patch by qknight (Joachim Schiele) to add Gnome2 python bindings 
svn path=/nixpkgs/trunk/; revision=34203
 2012-05-21 22:46:40 +00:00
Rickard Nilsson
5a270abcb6 Added missing pygtk dependency to Gnome VTE library. 
svn path=/nixpkgs/trunk/; revision=34194
 2012-05-21 14:58:16 +00:00
Rickard Nilsson
cd55352e46 Updated the Xfce URLs. 
The upstream releases have moved from http://www.xfce.org/archive to
http://archive.xfce.org.

svn path=/nixpkgs/trunk/; revision=34128
 2012-05-15 21:45:35 +00:00
Mathijs Kwik
6ef610851e kde okular: include pkgconfig, otherwise libspectre isn't found (.ps viewing) 
svn path=/nixpkgs/trunk/; revision=33676
 2012-04-09 10:17:20 +00:00
Yury G. Kudryashov
ef0b72dd6c kde-runtime: drop patch (applied upstream) 
svn path=/nixpkgs/trunk/; revision=33632
 2012-04-05 20:04:51 +00:00
Yury G. Kudryashov
7aeb6ef2bb Remove ksecrets, fix outputHash 
svn path=/nixpkgs/trunk/; revision=33622
 2012-04-05 13:50:47 +00:00
Yury G. Kudryashov
e1743e57be qt-4.8.1, kde-4.8.2 
svn path=/nixpkgs/trunk/; revision=33621
 2012-04-05 13:50:34 +00:00
Yury G. Kudryashov
defd86049c Merge ^/nixpkgs/trunk. 
This merge leads to a big rebuild, but this wouldn't hurt as I'm going to
reintegrate this branch soon.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33455
 2012-03-28 15:42:42 +00:00
Alexander Tsamutali
b1952ce587 desktops/e17: Updated. 
svn path=/nixpkgs/trunk/; revision=33404
 2012-03-25 13:50:39 +00:00
Yury G. Kudryashov
295971e153 Disable smokekde.attica 
svn path=/nixpkgs/trunk/; revision=33387
 2012-03-23 18:56:41 +00:00
Yury G. Kudryashov
a827b5f709 smokekde: disable akonadi&kdepimlibs 
svn path=/nixpkgs/trunk/; revision=33345
 2012-03-22 08:43:14 +00:00
Yury G. Kudryashov
9bb1684622 Add kde48.qtruby 
svn path=/nixpkgs/trunk/; revision=33313
 2012-03-20 22:10:53 +00:00
Yury G. Kudryashov
9dcf8dffa2 Enable perlqt and smokekde from kdebindings 
I had to patch their buildsystem. I'm going to submit the patches upstream next
week.

svn path=/nixpkgs/trunk/; revision=33309
 2012-03-20 21:45:15 +00:00
Yury G. Kudryashov
b113433d51 Move libwnck to top-level 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33253
 2012-03-19 04:36:47 +00:00
Yury G. Kudryashov
3d0b778848 Move gnome-doc-utils and gtk-doc to top-level 
Add compatibility attrs.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33252
 2012-03-19 04:36:41 +00:00
Yury G. Kudryashov
a466941945 Move last piece o gnome3 to top-level 
Since there is no common release schedule, I'd prefer to avoid gnome3 set at
all.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33203
 2012-03-17 16:46:12 +00:00
Yury G. Kudryashov
ee5b976a93 Remove gnome3.clutter 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33202
 2012-03-17 16:46:06 +00:00
Yury G. Kudryashov
d1860f6def Move gnome3.GConf to GConf3 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33201
 2012-03-17 16:46:02 +00:00
Yury G. Kudryashov
ddb01436a0 Move gnome3.libgnome_keyring to libgnome_keyring3 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33200
 2012-03-17 16:45:56 +00:00
Yury G. Kudryashov
60669aa0fc Remove gnome3.glib_networking 
Use pkgs.glib_networking

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33199
 2012-03-17 16:45:50 +00:00
Yury G. Kudryashov
eee4797659 gnome-3: we use the top-level glib 
GNOME-3 uses the top-level glib. If this will change later, one should override
*many* packages in gnome3 set.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33198
 2012-03-17 16:45:43 +00:00
Yury G. Kudryashov
d96524476d Move libsoup to development/libraries 
It is used in many packages outside of gnome2 set.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33197
 2012-03-17 16:45:37 +00:00
Yury G. Kudryashov
785d18e02b svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33111
 2012-03-15 15:09:36 +00:00
Yury G. Kudryashov
fe1115caf4 Make nixpkgs ready for gst_all attrset removal 
svn path=/nixpkgs/trunk/; revision=33092
 2012-03-14 22:44:52 +00:00
Yury G. Kudryashov
68fe867e19 Get rid of most references to gtkLibs 
svn path=/nixpkgs/trunk/; revision=33088
 2012-03-14 21:57:32 +00:00
Yury G. Kudryashov
c719876055 Remove unused files 
svn path=/nixpkgs/trunk/; revision=32991
 2012-03-11 14:52:03 +00:00
Yury G. Kudryashov
39ceaa7aff kde-runtime: apply patch that (hopefully) fixes virtuoso-t eating 100% CPU 
svn path=/nixpkgs/trunk/; revision=32988
 2012-03-11 14:35:19 +00:00
Yury G. Kudryashov
0a66c08eb9 kdepim-runtime: drop patch 
svn path=/nixpkgs/trunk/; revision=32984
 2012-03-11 14:07:30 +00:00
Yury G. Kudryashov
736ecb4c53 Remove esound and libaudiofile 
svn path=/nixpkgs/trunk/; revision=32983
 2012-03-11 14:07:27 +00:00
Yury G. Kudryashov
0cea832a1b Remove unused builder 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=32946
 2012-03-09 07:13:14 +00:00
Yury G. Kudryashov
e060892aac gvfs-1.10.1 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=32945
 2012-03-09 07:13:11 +00:00
Yury G. Kudryashov
91fb91d9e0 libsoup-2.36.1 
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=32944
 2012-03-09 07:13:08 +00:00
Yury G. Kudryashov
a5eb37cc37 gnome-doc-utils-0.18.1 
svn path=/nixpkgs/trunk/; revision=32934
 2012-03-08 23:15:51 +00:00
Yury G. Kudryashov
b0dbd38ea6 Move libcroco and librsvg to top-level 
svn path=/nixpkgs/trunk/; revision=32933
 2012-03-08 22:57:05 +00:00
Yury G. Kudryashov
01c4e30a8a gnome-control-center-2.32.1 
svn path=/nixpkgs/trunk/; revision=32932
 2012-03-08 22:46:10 +00:00
Yury G. Kudryashov
711fada6ee gnome-settings-daemon-2.32.1 
svn path=/nixpkgs/trunk/; revision=32931
 2012-03-08 22:46:06 +00:00
Yury G. Kudryashov
86080768f1 metacity-2.30.3 
svn path=/nixpkgs/trunk/; revision=32930
 2012-03-08 22:46:03 +00:00
Yury G. Kudryashov
793d0c983c Move gsettings-desktop-schemas to data/misc 
svn path=/nixpkgs/trunk/; revision=32929
 2012-03-08 22:45:58 +00:00
Yury G. Kudryashov
ec84a1f0b8 libcroco-0.6.4 
svn path=/nixpkgs/trunk/; revision=32928
 2012-03-08 22:45:54 +00:00
Yury G. Kudryashov
b196e5f125 libgnomekbd-2.32.0 
svn path=/nixpkgs/trunk/; revision=32927
 2012-03-08 22:45:51 +00:00
Yury G. Kudryashov
c3eb93ae3b gnome-panel-2.32.1 
svn path=/nixpkgs/trunk/; revision=32926
 2012-03-08 22:45:47 +00:00
Yury G. Kudryashov
3372c8abfd librsvg-2.34.2 
svn path=/nixpkgs/trunk/; revision=32925
 2012-03-08 22:45:42 +00:00
Yury G. Kudryashov
396fcedaed libwnck-2.30.7 
svn path=/nixpkgs/trunk/; revision=32924
 2012-03-08 22:45:38 +00:00
Yury G. Kudryashov
a85944b665 gnome-desktop-2.32.1 
svn path=/nixpkgs/trunk/; revision=32922
 2012-03-08 22:45:32 +00:00
Yury G. Kudryashov
cfe4427418 gnome-session-2.32.1 
svn path=/nixpkgs/trunk/; revision=32921
 2012-03-08 22:45:28 +00:00
Yury G. Kudryashov
dff711a9db GConf: depend on gtk 
It needs gtk only for 'gtk-sanity-check-2' program. We should split this program
to a dedicated package.

svn path=/nixpkgs/trunk/; revision=32920
 2012-03-08 22:45:25 +00:00
Yury G. Kudryashov
9a4c1acfb5 GConf-2.32.4 
svn path=/nixpkgs/trunk/; revision=32919
 2012-03-08 22:45:22 +00:00
Yury G. Kudryashov
b409732c69 gnome-menus-2.30.5 
svn path=/nixpkgs/trunk/; revision=32918
 2012-03-08 22:45:18 +00:00
Yury G. Kudryashov
9fb93537bb zenity-2.32.1, remove CPPFLAGS magic 
svn path=/nixpkgs/trunk/; revision=32917
 2012-03-08 22:45:15 +00:00
Yury G. Kudryashov
e7e3a28ac6 gnome-vfs-monikers: cleanup CPPFLAGS 
svn path=/nixpkgs/trunk/; revision=32916
 2012-03-08 22:45:11 +00:00
Yury G. Kudryashov
5d42d15d15 at-spi-1.32.0 
svn path=/nixpkgs/trunk/; revision=32915
 2012-03-08 22:45:02 +00:00
Yury G. Kudryashov
b88e0e8807 libgnomeui depends on libgnome-keyring, not gnome-keyring 
svn path=/nixpkgs/trunk/; revision=32907
 2012-03-08 17:16:04 +00:00
Yury G. Kudryashov
1a62d14cdd Move glib-networking to top namespace 
svn path=/nixpkgs/trunk/; revision=32905
 2012-03-08 16:49:08 +00:00
Yury G. Kudryashov
065d71635d gnome-icon-theme-2.30.3 
svn path=/nixpkgs/trunk/; revision=32900
 2012-03-08 15:37:23 +00:00
Yury G. Kudryashov
5020497c95 libsoup: depend on libgnome-keyring 
svn path=/nixpkgs/trunk/; revision=32899
 2012-03-08 15:37:19 +00:00
Yury G. Kudryashov
99337fff9d gnome-keyring-2-30.3 
svn path=/nixpkgs/trunk/; revision=32897
 2012-03-08 15:36:34 +00:00
Yury G. Kudryashov
e402a4a6a6 gvfs: depend on libgnome-keyring, not gnome-keyring 
svn path=/nixpkgs/trunk/; revision=32888
 2012-03-08 13:06:47 +00:00
Yury G. Kudryashov
9abf1b03a9 Move libgnome-keyring to development/libraries 
svn path=/nixpkgs/trunk/; revision=32887
 2012-03-08 13:06:44 +00:00
Yury G. Kudryashov
7390600a6e libsoup-2.34.3 
svn path=/nixpkgs/trunk/; revision=32883
 2012-03-08 10:14:37 +00:00
Yury G. Kudryashov
91ef1c05ab gnome2: gvfs-1.8.2 
svn path=/nixpkgs/trunk/; revision=32877
 2012-03-08 09:27:13 +00:00
Yury G. Kudryashov
c65ada160e KDE-4.8.1 
* Switch to .tar.xz.
* Update fixed-output derivations hashes.
* Add kde-base-artwork (ksplashx themes)

svn path=/nixpkgs/trunk/; revision=32874
 2012-03-08 06:53:44 +00:00
Peter Simons
f7896f322e libgnomeprint: fix gcc 4.6 compilation error 
svn path=/nixpkgs/trunk/; revision=32832
 2012-03-06 20:04:58 +00:00
Yury G. Kudryashov
b7642bfdfb svn merge ^/nixpkgs/trunk 
I need the latest KDE-related changes

svn path=/nixpkgs/branches/stdenv-updates/; revision=32806
 2012-03-05 21:01:47 +00:00
Yury G. Kudryashov
296eff8fbd Pass pkgconfig to kdeplasma-addons 
svn path=/nixpkgs/trunk/; revision=32805
 2012-03-05 20:59:19 +00:00
Yury G. Kudryashov
3b39886275 Oops, fix evaluation 
Forgotten to pass pkgconfig to kdeplasma-addons

svn path=/nixpkgs/trunk/; revision=32804
 2012-03-05 20:59:15 +00:00
Yury G. Kudryashov
55adb6c2f7 kdeplasma-addons depends on libdbusmenu-qt 
svn path=/nixpkgs/trunk/; revision=32803
 2012-03-05 20:51:25 +00:00
Yury G. Kudryashov
4767246246 kdeplasma-addons needs pkg-config to find some dependencies 
svn path=/nixpkgs/trunk/; revision=32802
 2012-03-05 20:51:18 +00:00
Yury G. Kudryashov
57fd764a39 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
 2012-03-05 10:00:23 +00:00
Yury G. Kudryashov
e07a111edc kdelibs depend on xz. Really. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32397
 2012-02-19 11:19:11 +00:00
Yury G. Kudryashov
313a029f16 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
 2012-02-19 11:16:24 +00:00
Yury G. Kudryashov
5c6a3faf4e Merge ^/nixpkgs/trunk 
svn tried to change libpng/default.nix version, I've changed libpng/12.nix
version manually.

svn path=/nixpkgs/branches/libpng15/; revision=32395
 2012-02-19 11:06:00 +00:00
Yury G. Kudryashov
08f6682666 KDE-4.7: build with qt-4.8 
svn path=/nixpkgs/trunk/; revision=32392
 2012-02-19 09:22:33 +00:00
Yury G. Kudryashov
024c247807 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32382
 2012-02-18 16:26:34 +00:00
Eelco Dolstra
ce544df561 * Revert r31596 (which changes the Qt for KDE 4.7). This doesn't 
belong in the stdenv branch and breaks KDE
  (http://hydra.nixos.org/build/2068311).

svn path=/nixpkgs/branches/stdenv-updates/; revision=32381
 2012-02-18 01:30:22 +00:00
Arie Middelkoop
453768b1cc kde-runtime requires libjpeg as buildInput. 
svn path=/nixpkgs/trunk/; revision=32363
 2012-02-17 18:55:36 +00:00
Yury G. Kudryashov
14a5b4991c svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32360
 2012-02-17 17:44:20 +00:00
Yury G. Kudryashov
79d0d410cb svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32350
 2012-02-17 13:43:31 +00:00
Yury G. Kudryashov
882b8ea871 kde47.libkdcraw: fix build with qt-4.8 
svn path=/nixpkgs/trunk/; revision=32349
 2012-02-17 13:36:41 +00:00
Yury G. Kudryashov
070874c5f1 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=32321
 2012-02-16 11:23:36 +00:00
Yury G. Kudryashov
c81f618a34 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32273
 2012-02-14 14:33:10 +00:00
Yury G. Kudryashov
5d70cfcb25 kdepim-runtime: fix mailindexer eating 100% CPU 
svn path=/nixpkgs/trunk/; revision=32271
 2012-02-14 14:29:22 +00:00
Yury G. Kudryashov
e155073b2c svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31888
 2012-01-27 17:49:20 +00:00
Yury G. Kudryashov
b31c67e24d svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31887
 2012-01-27 16:43:39 +00:00
Yury G. Kudryashov
afc0aea6d1 kalzium: patch pushed upstream 
svn path=/nixpkgs/trunk/; revision=31886
 2012-01-27 16:31:54 +00:00
Yury G. Kudryashov
3256c40575 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31878
 2012-01-27 11:48:58 +00:00
Yury G. Kudryashov
fdae7ad9f4 Pass stable/unstable to l10n 
svn path=/nixpkgs/trunk/; revision=31876
 2012-01-27 10:03:32 +00:00
Yury G. Kudryashov
94372bc342 akonadi-1.7.0 
svn path=/nixpkgs/trunk/; revision=31871
 2012-01-26 20:07:54 +00:00
Yury G. Kudryashov
5b132f6e96 svn merge ^/nixpkgs/trunk 
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
 2012-01-26 15:27:03 +00:00
Yury G. Kudryashov
68d3727a41 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31848
 2012-01-26 10:11:47 +00:00
Yury G. Kudryashov
2ac0c88674 Fix errors found by test-eval-release 
svn path=/nixpkgs/trunk/; revision=31847
 2012-01-26 10:07:00 +00:00
Yury G. Kudryashov
2ced89b7f1 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31846
 2012-01-26 08:45:19 +00:00
Yury G. Kudryashov
ecea8900e7 KDE-4.8.0 
svn path=/nixpkgs/trunk/; revision=31845
 2012-01-26 08:36:28 +00:00
Karn Kallio
3206dbd63d As pointed out by Yury Kudryashov kde48.kdelibs does not in fact need 
pkgconfig

svn path=/nixpkgs/trunk/; revision=31832
 2012-01-24 22:26:10 +00:00
Karn Kallio
151fcc6133 Get kdelibs from kde48 release candidate to build. 
svn path=/nixpkgs/trunk/; revision=31801
 2012-01-24 01:54:49 +00:00
Karn Kallio
90563b958f kde 4.8 release candidate uses unstable directory for download. 
svn path=/nixpkgs/trunk/; revision=31798
 2012-01-23 21:56:33 +00:00
Yury G. Kudryashov
84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
 2012-01-19 21:31:51 +00:00
Yury G. Kudryashov
a525fdb18d svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31718
 2012-01-19 21:00:43 +00:00
Yury G. Kudryashov
8899e60693 Remove unused patches, fix pykde4 patch 
svn path=/nixpkgs/trunk/; revision=31712
 2012-01-19 20:27:59 +00:00
Eelco Dolstra
3fa83e15e7 * Missed a reference to xz. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31682
 2012-01-19 13:56:57 +00:00
Eelco Dolstra
d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
 2012-01-18 20:53:01 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
 2012-01-18 20:16:00 +00:00
Eelco Dolstra
48ee2523da * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31633
 2012-01-18 15:53:12 +00:00
Eelco Dolstra
2f1edcc1eb * Added Xfce's appfinder application. 
svn path=/nixpkgs/trunk/; revision=31611
 2012-01-17 18:08:09 +00:00
Eelco Dolstra
24431bd0f6 * Update various Xfce packages. 
svn path=/nixpkgs/trunk/; revision=31607
 2012-01-17 17:43:48 +00:00
Yury G. Kudryashov
3aa99d803e Remove PATHS from find-svn.patch 
svn path=/nixpkgs/trunk/; revision=31605
 2012-01-17 16:27:57 +00:00
Yury G. Kudryashov
c7a1f309a7 Backport some fixes from kde-4.8 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31597
 2012-01-16 17:43:55 +00:00
Yury G. Kudryashov
bd7fe12cef Use qt-4.8 by default 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31596
 2012-01-16 17:39:40 +00:00
Yury G. Kudryashov
81b4eef864 jasper: propagate libjpeg, kopete: remove 'fix' 
svn path=/nixpkgs/trunk/; revision=31595
 2012-01-16 17:36:59 +00:00
Yury G. Kudryashov
13c81f6c79 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/libpng15/; revision=31568
 2012-01-14 21:40:24 +00:00
Yury G. Kudryashov
d5b73eadeb Fix kalzium build 
svn path=/nixpkgs/trunk/; revision=31564
 2012-01-14 18:04:25 +00:00
Yury G. Kudryashov
810ab36e24 kde48.krdc depends on libjpeg 
svn path=/nixpkgs/trunk/; revision=31563
 2012-01-14 18:04:21 +00:00
Yury G. Kudryashov
cd62169a20 kopete: depend on sqlite, fix FindJasper 
svn path=/nixpkgs/trunk/; revision=31562
 2012-01-14 18:04:18 +00:00
Yury G. Kudryashov
abcc1e56db Fix gwenview build 
svn path=/nixpkgs/trunk/; revision=31561
 2012-01-14 18:04:14 +00:00
Yury G. Kudryashov
3d8668b713 Fix ksecrets build 
svn path=/nixpkgs/trunk/; revision=31560
 2012-01-14 18:04:10 +00:00
Yury G. Kudryashov
84d691d520 kget depends on sqlite 
svn path=/nixpkgs/trunk/; revision=31559
 2012-01-14 18:04:07 +00:00
Yury G. Kudryashov
50e898b904 kscreensaver depends on libXt and needs pkg-config at build time 
svn path=/nixpkgs/trunk/; revision=31558
 2012-01-14 18:04:03 +00:00
Yury G. Kudryashov
547827b73b kmousetool depends on libXt 
svn path=/nixpkgs/trunk/; revision=31557
 2012-01-14 18:04:00 +00:00
Yury G. Kudryashov
269b696112 libkdcraw: depend o libjpeg and lcms1 
svn path=/nixpkgs/trunk/; revision=31556
 2012-01-14 18:03:56 +00:00
Yury G. Kudryashov
893994372f Depend on libjpeg 
svn path=/nixpkgs/trunk/; revision=31555
 2012-01-14 18:03:53 +00:00
Yury G. Kudryashov
e36b7005cc Pass sqlite and pkgconfig to kdegames 
svn path=/nixpkgs/trunk/; revision=31554
 2012-01-14 18:03:48 +00:00
Yury G. Kudryashov
4dfdbed318 Fix kde48.kde_workspace FTBFS 
svn path=/nixpkgs/trunk/; revision=31553
 2012-01-14 18:03:45 +00:00
Yury G. Kudryashov
bbee586d14 kde48.kalgebra: depend on kde48.analitza 
svn path=/nixpkgs/trunk/; revision=31549
 2012-01-14 18:03:31 +00:00
Yury G. Kudryashov
4675c738e6 PyKDE4: one part of purity patch fixed upstream 
svn path=/nixpkgs/trunk/; revision=31548
 2012-01-14 18:03:27 +00:00
Yury G. Kudryashov
dab22380e0 KDE4.8.kdemultimedia: depend on pulseaudio 
svn path=/nixpkgs/trunk/; revision=31547
 2012-01-14 18:03:24 +00:00
Yury G. Kudryashov
4024d33469 kde48.kdepim: depend on prison 
svn path=/nixpkgs/trunk/; revision=31546
 2012-01-14 18:03:20 +00:00
Yury G. Kudryashov
5df14ab40f konsole: depend on kde-baseapps for libkonq 
svn path=/nixpkgs/trunk/; revision=31545
 2012-01-14 18:03:17 +00:00
Yury G. Kudryashov
8133e47172 Fix output hash 
svn path=/nixpkgs/trunk/; revision=31544
 2012-01-14 18:03:12 +00:00
Yury G. Kudryashov
94af5f0664 kde48.kactivities: depend on SDO 
svn path=/nixpkgs/trunk/; revision=31543
 2012-01-14 18:03:08 +00:00
Yury G. Kudryashov
8b66ae590f kde48.kdelibs: use kerberos 
svn path=/nixpkgs/trunk/; revision=31461
 2012-01-09 23:44:48 +00:00
Yury G. Kudryashov
af58b6ec5f Pass libpng12 to qt3 and kdelibs3 
svn path=/nixpkgs/branches/libpng15/; revision=31441
 2012-01-08 20:51:49 +00:00
Yury G. Kudryashov
7e320a7043 State qt version (3/4) in packages, not in all-packages.nix 
svn path=/nixpkgs/trunk/; revision=31406
 2012-01-07 17:06:49 +00:00
Yury G. Kudryashov
a3f507892a Add gnome2.libgnome_keyring 
svn path=/nixpkgs/trunk/; revision=31404
 2012-01-07 15:31:36 +00:00
Yury G. Kudryashov
50dab98373 gnome2.gnome_vfs: disable HAL, enable ACL 
svn path=/nixpkgs/trunk/; revision=31403
 2012-01-07 15:31:31 +00:00
Yury G. Kudryashov
735de44b72 KDE SC 4.8: latest unstable akonadi 
svn path=/nixpkgs/trunk/; revision=31391
 2012-01-07 00:10:22 +00:00
Yury G. Kudryashov
1f0c154676 Make test-eval-release happy 
svn path=/nixpkgs/trunk/; revision=31389
 2012-01-07 00:02:36 +00:00
Yury G. Kudryashov
50de8e181f Fix kde48.kdelibs evaluation error 
Will write kactivities.nix when hydra will build kde48.kdelibs

svn path=/nixpkgs/trunk/; revision=31388
 2012-01-07 00:02:28 +00:00
Yury G. Kudryashov
d4509553e6 Fix oxygen-icons outputHash 
svn path=/nixpkgs/trunk/; revision=31387
 2012-01-07 00:02:23 +00:00
Yury G. Kudryashov
cfc9de7311 KDE SC 4.8 RC2 
(Semi-)automatic updates

svn path=/nixpkgs/trunk/; revision=31384
 2012-01-06 23:03:43 +00:00
Yury G. Kudryashov
b9c72433cc Copy kde-4.7->kde-4.8 
svn path=/nixpkgs/trunk/; revision=31380
 2012-01-06 21:50:10 +00:00
Yury G. Kudryashov
a6288f1701 gnome3.gnome-user-docs 
svn path=/nixpkgs/trunk/; revision=31373
 2012-01-06 20:09:54 +00:00
Yury G. Kudryashov
a9dc08d887 Add meta to many GNOME3 packages 
svn path=/nixpkgs/trunk/; revision=31367
 2012-01-06 18:54:02 +00:00
Yury G. Kudryashov
80480acf78 Remove TODO.txt 
svn path=/nixpkgs/trunk/; revision=31366
 2012-01-06 18:53:52 +00:00
Yury G. Kudryashov
af347062d0 Add gnome3.clutter 
svn path=/nixpkgs/trunk/; revision=31363
 2012-01-06 18:13:51 +00:00
Yury G. Kudryashov
24448ed3de gnome3.libsoup 
svn path=/nixpkgs/trunk/; revision=31361
 2012-01-06 18:13:33 +00:00
Yury G. Kudryashov
f3923f5b4a Remove some 'rec' 
svn path=/nixpkgs/trunk/; revision=31360
 2012-01-06 18:13:26 +00:00
Yury G. Kudryashov
265b149db1 Add gnome3.libgnome_keyring 
svn path=/nixpkgs/trunk/; revision=31359
 2012-01-06 18:13:19 +00:00
Yury G. Kudryashov
09060a0a19 Add gnome3.{glib_networking,gsettings_desktop_schemas} 
Cherry-pick from stdenv-updates

svn path=/nixpkgs/trunk/; revision=31356
 2012-01-06 18:12:38 +00:00
Yury G. Kudryashov
20973a9280 GConf-2.28.1, policykit->polkit 
svn path=/nixpkgs/trunk/; revision=31333
 2012-01-06 00:55:14 +00:00
Yury G. Kudryashov
6a27a67605 gnome-2/audiofile-0.3.2 
svn path=/nixpkgs/trunk/; revision=31331
 2012-01-06 00:54:39 +00:00
Lluís Batlle i Rossell
8046598a80 Make gnome panel 2.28 build - it missed libtool as buildInputs. 
svn path=/nixpkgs/trunk/; revision=31275
 2012-01-04 13:37:54 +00:00
Yury G. Kudryashov
15ab248bca Revert "Use qt-4.8 by default" 
This reverts r31196. Will re-apply after fixing most packages broken by this
change.

svn path=/nixpkgs/trunk/; revision=31203
 2012-01-02 12:54:22 +00:00
Yury G. Kudryashov
b8a3e5fbc9 kdelibs: depend on libjpeg 
svn path=/nixpkgs/trunk/; revision=31202
 2012-01-02 12:52:43 +00:00
Yury G. Kudryashov
6639c58398 Use qt-4.8 by default 
Some packages may break because pkgconfig is no longer propagated.

svn path=/nixpkgs/trunk/; revision=31196
 2012-01-02 10:42:25 +00:00
Yury G. Kudryashov
c93380381c kdelibs: remove unused parameter 
svn path=/nixpkgs/trunk/; revision=30939
 2011-12-16 19:38:43 +00:00
Yury G. Kudryashov
0971831ddc Reintegrate branches/drop-kde4.5 
svn path=/nixpkgs/trunk/; revision=30928
 2011-12-16 10:39:22 +00:00
Alexander Tsamutali
4451d32a36 desktops/e17: Updated everything. 
svn path=/nixpkgs/trunk/; revision=30820
 2011-12-10 18:11:37 +00:00
Eelco Dolstra
55688e9d57 * KDE 4.7.4. 
svn path=/nixpkgs/trunk/; revision=30803
 2011-12-08 12:49:26 +00:00
Eelco Dolstra
89fb4363b4 * Oops, forgot to commit. 
svn path=/nixpkgs/trunk/; revision=30385
 2011-11-11 02:21:25 +00:00
Eelco Dolstra
5b622e20a1 * KDE 4.7.3. 
svn path=/nixpkgs/trunk/; revision=30384
 2011-11-10 23:35:58 +00:00
Yury G. Kudryashov
2109983477 Fix comment 
svn path=/nixpkgs/trunk/; revision=29852
 2011-10-15 13:32:05 +00:00
Yury G. Kudryashov
b5861542dd gtkLibs3x.atkmm 
svn path=/nixpkgs/trunk/; revision=29748
 2011-10-10 22:26:41 +00:00
Yury G. Kudryashov
57b11967c8 Remove already packaged packages from gnome-3/TODO.txt 
svn path=/nixpkgs/trunk/; revision=29747
 2011-10-10 22:10:18 +00:00
Yury G. Kudryashov
c3863358ef libgnomeui-2.24.5; add libtool to deps 
svn path=/nixpkgs/trunk/; revision=29746
 2011-10-10 21:48:21 +00:00
Yury G. Kudryashov
57d384459e Add gnome3. Do not recurse into attrs 
svn path=/nixpkgs/trunk/; revision=29732
 2011-10-09 17:23:54 +00:00
Yury G. Kudryashov
da80ec5203 libbonoboui-2.24.4, fix build 
svn path=/nixpkgs/trunk/; revision=29731
 2011-10-09 17:23:47 +00:00
Yury G. Kudryashov
f865f7c26d libIDL-0.8.14 
svn path=/nixpkgs/trunk/; revision=29725
 2011-10-09 07:11:38 +00:00
Yury G. Kudryashov
026325e75b Update a few gnome packages 
svn path=/nixpkgs/trunk/; revision=29724
 2011-10-09 07:11:28 +00:00
Yury G. Kudryashov
bbd24e9c87 Update gnome-common 
svn path=/nixpkgs/trunk/; revision=29723
 2011-10-08 19:12:24 +00:00
Yury G. Kudryashov
2fdeacfebb libunique-1.1.6 
svn path=/nixpkgs/trunk/; revision=29722
 2011-10-08 19:05:13 +00:00
Yury G. Kudryashov
e60fe8673b gnome: use callPackage, move to gnome-2 
gnome28 was a mix of packages from various releases, so do not mention 2.28 in
the attribute name.

svn path=/nixpkgs/trunk/; revision=29721
 2011-10-08 16:58:32 +00:00
Yury G. Kudryashov
a2d0e3b739 libgnome-2.32.1, drop esound dependency 
svn path=/nixpkgs/trunk/; revision=29720
 2011-10-08 14:08:44 +00:00
Yury G. Kudryashov
0ba5532d4b gnome-vfs-2.24.4 
svn path=/nixpkgs/trunk/; revision=29719
 2011-10-08 14:08:39 +00:00
Yury G. Kudryashov
c35c6ec9fa Drop 'gnomevfs = gnome_vfs;' alias 
s/gnomevfs/gnome_vfs/ in packages

svn path=/nixpkgs/trunk/; revision=29718
 2011-10-08 12:06:03 +00:00
Yury G. Kudryashov
bc0b96370f KDE-4.7.2 mass update 
Regenerate manifests+update oxygen-icons hash; kde-wallpapers hash remains the
same.

svn path=/nixpkgs/trunk/; revision=29717
 2011-10-08 11:59:24 +00:00
Yury G. Kudryashov
7e3c1b357b Drop kde3.kdebase 
Hydra fails to build it for a while, and nobody noticed.

svn path=/nixpkgs/trunk/; revision=29714
 2011-10-07 20:46:21 +00:00
Eelco Dolstra
b1b09c1510 * gnome-keyring: drop the (unused) dependency on HAL. 
svn path=/nixpkgs/trunk/; revision=29692
 2011-10-06 11:56:18 +00:00
Yury G. Kudryashov
371cd8bc51 kde3: use meta.platforms 
svn path=/nixpkgs/trunk/; revision=29596
 2011-10-02 21:15:36 +00:00
Alexander Tsamutali
3a24231510 pkgs/desktops/e17: Some fixes and now I can start it! \o/ 
svn path=/nixpkgs/trunk/; revision=29518
 2011-09-27 23:49:28 +00:00
Yury G. Kudryashov
e3c935cd2c kde-4.7: akonadi-1.6.1 
svn path=/nixpkgs/trunk/; revision=29515
 2011-09-27 15:40:54 +00:00
Yury G. Kudryashov
109b36eca9 Move soprano to top-level namespace 
svn path=/nixpkgs/trunk/; revision=29513
 2011-09-27 15:40:40 +00:00
Alexander Tsamutali
e3ccdb4bcd desktops/e17: 
Add e17. WIP. Make hangs during build of enlightenment.

svn path=/nixpkgs/trunk/; revision=29506
 2011-09-26 22:28:35 +00:00
Yury G. Kudryashov
ef664e90a0 Re-enable ntrack support in KDE-4.7 
It seems that the patches applied to ntrack in r29105 fixed the problem.

svn path=/nixpkgs/trunk/; revision=29338
 2011-09-19 05:16:11 +00:00
Peter Simons
12e7407abe libgnomeprint: updated to version 2.18.8 
I made this update hoping that it would fix the build errors with CUPS 1.5.x,
but unfortunately the new version still fails to compile:

  gnome-print-cups-transport.c:59:2: error: expected specifier-qualifier-list before 'FILE'
  gnome-print-cups-transport.c: In function 'gp_transport_cups_init':
  gnome-print-cups-transport.c:128:11: error: 'GPTransportCups' has no member named 'file'
  gnome-print-cups-transport.c: In function 'gp_transport_cups_finalize':
  gnome-print-cups-transport.c:140:15: error: 'GPTransportCups' has no member named 'file'
  gnome-print-cups-transport.c: In function 'gp_transport_cups_open':
  gnome-print-cups-transport.c:194:11: error: 'GPTransportCups' has no member named 'file'
  gnome-print-cups-transport.c:196:15: error: 'GPTransportCups' has no member named 'file'
  gnome-print-cups-transport.c: In function 'gp_transport_cups_close':
  gnome-print-cups-transport.c:238:2: error: 'GPTransportCups' has no member named 'file'
  gnome-print-cups-transport.c:241:23: error: 'GPTransportCups' has no member named 'file'
  gnome-print-cups-transport.c:245:11: error: 'GPTransportCups' has no member named 'file'
  gnome-print-cups-transport.c: In function 'gp_transport_cups_write':
  gnome-print-cups-transport.c:270:2: error: 'GPTransportCups' has no member named 'file'
  gnome-print-cups-transport.c:276:13: warning: incompatible implicit declaration of built-in function 'fwrite'
  gnome-print-cups-transport.c:276:57: error: 'GPTransportCups' has no member named 'file'
  make[4]: *** [gnome-print-cups-transport.lo] Error 1

I commit the update anyway, because (a) I feel that having the latest version
probably can't hurt and (b) the old expression had an incorrect name attribute,
which is now fixed.

svn path=/nixpkgs/trunk/; revision=29281
 2011-09-14 17:35:26 +00:00
Peter Simons
2f7372b107 libgnomecups-0.2.3: cosmetic, no functional change 
svn path=/nixpkgs/trunk/; revision=29280
 2011-09-14 17:35:20 +00:00
Karn Kallio
37651d0e68 Fix kremotecontrol build. 
svn path=/nixpkgs/trunk/; revision=29229
 2011-09-12 18:46:21 +00:00
Eelco Dolstra
74e4d96e7e * Remove the kde_baseapps wrapper because 
1) It broke the Gwenview build (it ended up depending on the
     wrapper).
  2) It's confusing to have two identically named packages.
  3) If upstream's kde_baseapps doesn't include Konsole and Kate, then
     why should ours?

svn path=/nixpkgs/trunk/; revision=29206
 2011-09-12 12:45:59 +00:00
Eelco Dolstra
f16c8d72db * Remove obsolete file. 
svn path=/nixpkgs/trunk/; revision=29205
 2011-09-12 12:40:58 +00:00
Eelco Dolstra
3e3613c75a * Update the oxygen-icons output hash. 
svn path=/nixpkgs/trunk/; revision=29204
 2011-09-12 12:34:06 +00:00
Yury G. Kudryashov
b6648e207d KDE SC 4.7.1 
Mostly automatic update. The only manual change caused by some movements on
projects.kde.org. Untested.

svn path=/nixpkgs/trunk/; revision=29179
 2011-09-11 12:39:06 +00:00
Yury G. Kudryashov
134fb92f73 Drop unused buildInput 
Mark virtuoso as a runtime dependency of kdebase-runtime.
The propagatedUserEnvPackages is not used by buildEnv, but I'm going to let it
use this property (instead of/in addition to)
$prefix/nix-support/propagated-user-env-packages.

svn path=/nixpkgs/trunk/; revision=29162
 2011-09-11 07:25:30 +00:00
Yury G. Kudryashov
e236848406 Disable networkmanager in kdebase-workspace-4.5.5 
NM-0.8 never worked in NixOS, and KDE-4.5 doesn't support newer NM

svn path=/nixpkgs/trunk/; revision=29161
 2011-09-10 20:09:11 +00:00
Yury G. Kudryashov
5fb9815469 kioslave-svn does not need subversion server 
svn path=/nixpkgs/trunk/; revision=29104
 2011-09-07 22:53:20 +00:00
Yury G. Kudryashov
133310cb87 soprano: find virtuoso without LD_LIBRARY_PATH hack 
Now it finds virtuoso driver provided that virtuoso-t binary is in PATH.

svn path=/nixpkgs/trunk/; revision=29103
 2011-09-07 22:53:11 +00:00
Eelco Dolstra
30bf1fcb29 * Add libgdu as a dependency to gvfs to enable mounting of volumes 
(through udisks) in Xfce.  Libgdu is part of gnome-disk-utility,
  which would pull in lots of Gnome dependencies, so some hackery is
  necessary to build only the useful part.

svn path=/nixpkgs/trunk/; revision=29054
 2011-09-06 01:00:23 +00:00
Eelco Dolstra
0b7d7153e3 * Urgh. Should test first. 
svn path=/nixpkgs/trunk/; revision=29052
 2011-09-05 23:31:04 +00:00
Eelco Dolstra
fde6f69688 * Oops. 
svn path=/nixpkgs/trunk/; revision=29051
 2011-09-05 23:30:42 +00:00
Eelco Dolstra
d80391b7df * Add Xfce 4.8 to the channel. 
svn path=/nixpkgs/trunk/; revision=29050
 2011-09-05 23:30:26 +00:00
Eelco Dolstra
ad51692715 * Style fixes. 
svn path=/nixpkgs/trunk/; revision=29048
 2011-09-05 21:02:21 +00:00
Eelco Dolstra
0dfd245a17 * Add thunar-volman and gvfs. 
svn path=/nixpkgs/trunk/; revision=29043
 2011-09-05 20:36:37 +00:00
Eelco Dolstra
378009ff4a * Turn parallel building support on again (got lost somewhere...). 
svn path=/nixpkgs/trunk/; revision=29035
 2011-09-05 19:23:06 +00:00
Yury G. Kudryashov
50f5c15996 Trying to fix nepomukserver startup problem 
svn path=/nixpkgs/trunk/; revision=28909
 2011-08-29 22:43:03 +00:00
Michael Raskin
6a49d6a920 Re-add GNU TLS 2.12 - it does fix glib-networking 
svn path=/nixpkgs/trunk/; revision=28853
 2011-08-27 17:04:25 +00:00
Yury G. Kudryashov
3244114412 Remove copies from hydra jobs 
Namely, kde45.kde4.kdenetwork == kde45.kdenetwork etc.

svn path=/nixpkgs/trunk/; revision=28843
 2011-08-26 20:08:46 +00:00
Yury G. Kudryashov
597412252a Wrap kde-related packages in kdePackagesFor 
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
 2011-08-26 13:49:23 +00:00
Yury G. Kudryashov
5c90976c6a Add meta to kde-4.7 'subdir' pkgs 
svn path=/nixpkgs/trunk/; revision=28816
 2011-08-25 20:00:55 +00:00
Eelco Dolstra
f3d7bcc851 * Fix description. 
svn path=/nixpkgs/trunk/; revision=28779
 2011-08-23 12:10:08 +00:00
Eelco Dolstra
8c37d99fd9 * Forgot to commit. 
svn path=/nixpkgs/trunk/; revision=28778
 2011-08-23 12:08:21 +00:00
Eelco Dolstra
8a70005921 * Updated xfce4-power-manager. 
svn path=/nixpkgs/trunk/; revision=28763
 2011-08-22 23:08:42 +00:00
Eelco Dolstra
ffe1af714d * Xfce 4.8. 
svn path=/nixpkgs/trunk/; revision=28761
 2011-08-22 22:51:23 +00:00
Eelco Dolstra
1475781b19 * Rename xfce-4 to xfce-4.6 in preparation for Xfce 4.8. 
svn path=/nixpkgs/trunk/; revision=28757
 2011-08-22 17:40:07 +00:00
Eelco Dolstra
0b99612c18 * Layout. 
svn path=/nixpkgs/trunk/; revision=28717
 2011-08-21 00:13:34 +00:00
Yury G. Kudryashov
b815a9ea40 Pass individual packages in kde-4.7 
E.g., use
{ ..., marble, ... } : marble
instead of
{ ..., kdeedu, ... } : kdeedu.marble

svn path=/nixpkgs/trunk/; revision=28694
 2011-08-19 15:42:58 +00:00
Yury G. Kudryashov
365cb2d262 kde-4.7: let nix-env and hydra find all modules 
List of changes:
 * All individual packages moved to the top-level kde47 namespace.
 * Utility functions moved back to kde-package/default.nix

nix-env will not find kde-4.7 modules unless you add something like
'kde4 = pkgs.recurseIntoAttrs pkgs.kde47;' to your packageOverrides.

This is done because kde-4.7.0 on NixOS is not ready yet.

svn path=/nixpkgs/trunk/; revision=28693
 2011-08-19 15:37:12 +00:00
Yury G. Kudryashov
25461a3939 kde-runtime-4.7: don't use ntrack as it causes kded4 to consume 100% CPU 
svn path=/nixpkgs/trunk/; revision=28654
 2011-08-18 12:52:35 +00:00
Yury G. Kudryashov
c6458b5269 Do not pass kdebase to kget as buildInput 
svn path=/nixpkgs/trunk/; revision=28653
 2011-08-18 12:52:29 +00:00
Yury G. Kudryashov
06a34e5825 Use soprano-2.7.0 in kde-4.5.5 
svn path=/nixpkgs/trunk/; revision=28601
 2011-08-15 20:45:48 +00:00
Yury G. Kudryashov
519f4ea4b8 Add attribute that holds the resulting hierarchy 
See comment in the committed code for details

svn path=/nixpkgs/trunk/; revision=28600
 2011-08-15 19:28:12 +00:00
Yury G. Kudryashov
8abd44f249 Big kde-4.7.0 update 
* Remove a lot of code duplication.
* Package almost all (except for smoke-based bindings).

svn path=/nixpkgs/trunk/; revision=28597
 2011-08-15 18:06:26 +00:00
Yury G. Kudryashov
5a70c2dca8 Add samba and ntrack to deps 
svn path=/nixpkgs/trunk/; revision=28471
 2011-08-10 20:20:00 +00:00
Yury G. Kudryashov
63ea7f8950 Add boost and gpsd to deps 
svn path=/nixpkgs/trunk/; revision=28470
 2011-08-10 20:19:55 +00:00
Andres Löh
ce5ccbb0ea Updating leksah. 
svn path=/nixpkgs/trunk/; revision=28376
 2011-08-08 07:41:45 +00:00
Karn Kallio
d0fa51f709 Fi wrapper kde47 runtime.nix 
svn path=/nixpkgs/trunk/; revision=28224
 2011-08-07 17:50:45 +00:00
Karn Kallio
b2a20db522 Copy kde45 wrap of nepomukservicestub with virtuoso. 
svn path=/nixpkgs/trunk/; revision=28223
 2011-08-07 17:50:32 +00:00
Karn Kallio
a233ebf891 Switch to forward compatibility of kde45 on kde_baseapps. 
svn path=/nixpkgs/trunk/; revision=28217
 2011-08-07 01:45:26 +00:00
Karn Kallio
875b65ca0e Backwards compatibility on kdebase breaks detection. 
svn path=/nixpkgs/trunk/; revision=28216
 2011-08-07 01:27:23 +00:00
Karn Kallio
cc160e2dc6 Extend kde47 backwards compatibility to include kdebase. 
svn path=/nixpkgs/trunk/; revision=28215
 2011-08-07 01:14:34 +00:00
Karn Kallio
278cc6dc0b First few programs of kde 4.7 kdeedu. 
svn path=/nixpkgs/trunk/; revision=28213
 2011-08-07 00:38:11 +00:00
Karn Kallio
37c45263c6 Repair kruler build (phonon is required). 
svn path=/nixpkgs/trunk/; revision=28212
 2011-08-07 00:37:49 +00:00
Karn Kallio
d587e3720b Forgot to move kruler.nix 
svn path=/nixpkgs/trunk/; revision=28211
 2011-08-07 00:37:32 +00:00
Karn Kallio
7648a6cf65 Set up kdegraphics section in kde 4.7 
svn path=/nixpkgs/trunk/; revision=28210
 2011-08-07 00:37:14 +00:00
Eelco Dolstra
99ff06be3e * KDE 4.5 needs an older version of shared-desktop-ontologies. 
svn path=/nixpkgs/branches/kde-4.7/; revision=28103
 2011-08-01 09:08:57 +00:00
Eelco Dolstra
08b9b370a4 * KDE 4.5: use an old ffmpeg. 
svn path=/nixpkgs/branches/kde-4.7/; revision=28102
 2011-08-01 08:32:20 +00:00
Eelco Dolstra
483bedccda * Disable kdebindings in the old KDE 4.5. It doesn't build anymore 
due to changes in Phonon and other packages.  It's not really
  important anyway.

svn path=/nixpkgs/branches/kde-4.7/; revision=28022
 2011-07-31 19:12:10 +00:00
Eelco Dolstra
35437ef75b * Updated kdepim-runtime and kdepim. 
svn path=/nixpkgs/branches/kde-4.7/; revision=28008
 2011-07-29 19:05:52 +00:00
Eelco Dolstra
980b453102 * Fix localisation. 
svn path=/nixpkgs/branches/kde-4.7/; revision=28007
 2011-07-29 17:48:39 +00:00
Eelco Dolstra
76fffef175 * More stuff. 
svn path=/nixpkgs/branches/kde-4.7/; revision=28006
 2011-07-29 17:24:59 +00:00
Eelco Dolstra
aee4ccdee0 * Updated kdeartwork. 
svn path=/nixpkgs/branches/kde-4.7/; revision=28005
 2011-07-29 16:09:55 +00:00
Eelco Dolstra
d3df8a3085 * Updated kdeaccessibility. 
svn path=/nixpkgs/branches/kde-4.7/; revision=28001
 2011-07-29 14:30:07 +00:00
Eelco Dolstra
2d4c4ae1bd * Updated kdewebdev. 
svn path=/nixpkgs/branches/kde-4.7/; revision=28000
 2011-07-29 14:16:12 +00:00
Eelco Dolstra
9650b1283e * Updated kdesdk. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27999
 2011-07-29 13:50:53 +00:00
Eelco Dolstra
e7b76a6db3 * Updated kdetoys. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27998
 2011-07-29 12:41:31 +00:00
Eelco Dolstra
dd8cc506b5 * Update kdeutils. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27997
 2011-07-29 12:31:07 +00:00
Eelco Dolstra
7d06b01a34 * Fix KDE's fixed-output derivations. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27995
 2011-07-29 08:43:43 +00:00
Eelco Dolstra
6f8c9ddc39 * KDE 4.7.0. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27989
 2011-07-28 12:52:15 +00:00
Eelco Dolstra
bf229fc985 * Move Phonon out of KDE. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27988
 2011-07-28 12:20:12 +00:00
Eelco Dolstra
6c4f6ceb4f * Remove the KDE 4.6 RC expressions. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27984
 2011-07-28 11:18:57 +00:00
Eelco Dolstra
9725e1376f * Updated kdemultimedia. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27953
 2011-07-25 20:17:36 +00:00
Eelco Dolstra
012e221de9 * kde-workspace requires PAM. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27907
 2011-07-22 23:59:59 +00:00
Eelco Dolstra
a5a9f1fb2e * Fix kpythonpluginfactory. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27899
 2011-07-22 01:54:04 +00:00
Eelco Dolstra
9379248ef3 * Update kdeadmin and kdegames. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27898
 2011-07-22 01:28:09 +00:00
Eelco Dolstra
5a03576cb4 * Update kdegames. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27894
 2011-07-21 21:54:40 +00:00
Eelco Dolstra
aa6f8184b5 * Update kdepimlibs. 
* Remove unnecessary NIX_LDFLAGS hacks.

svn path=/nixpkgs/branches/kde-4.7/; revision=27887
 2011-07-21 19:16:21 +00:00
Eelco Dolstra
439714b3fa * Allow KDE to find the xkeyboard-config files. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27871
 2011-07-21 12:33:44 +00:00
Eelco Dolstra
ef041b7aa3 * Hack to fix evaluation. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27869
 2011-07-21 11:56:11 +00:00
Eelco Dolstra
b32ea60b4e * Remove some obsolete expressions. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27868
 2011-07-21 11:53:49 +00:00
Eelco Dolstra
7ae6dbd7d6 * Add the GStreamer backend for Phonon. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27819
 2011-07-18 12:37:50 +00:00
Eelco Dolstra
3c668adea1 * Pass Phonon as a dependency where needed. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27815
 2011-07-18 10:29:20 +00:00
Eelco Dolstra
9e92839468 * Fix incorrect path to kde4-config in startkde. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27812
 2011-07-17 15:55:33 +00:00
Eelco Dolstra
f3d8b47f22 * Add kde-wallpapers, which contains the default KDE and KDM 
wallpaper.

svn path=/nixpkgs/branches/kde-4.7/; revision=27811
 2011-07-17 14:24:43 +00:00
Eelco Dolstra
e482393ad1 * Add kde-runtime. It requires a newer Phonon than provided by Qt, so 
add that as well.  Maybe we should build Qt without Phonon to remove
  potential interference...

svn path=/nixpkgs/branches/kde-4.7/; revision=27810
 2011-07-17 14:10:41 +00:00
Eelco Dolstra
bc16ee83ae * The NixOS kdm.nix module expects a kdebase_workspace attribute. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27794
 2011-07-15 09:50:37 +00:00
Eelco Dolstra
298c78ef40 * Build kdm. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27772
 2011-07-14 08:42:01 +00:00
Eelco Dolstra
71c508f641 * Akonadi updated to 1.6.0. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27768
 2011-07-13 18:15:57 +00:00
Eelco Dolstra
a90c3142ee * KDE 4.7rc2. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27759
 2011-07-13 13:08:49 +00:00
Eelco Dolstra
c3e3111231 * Add kde-workspace. 
* Make sure that polkit actions get installed in $out.

svn path=/nixpkgs/branches/kde-4.7/; revision=27737
 2011-07-12 13:24:35 +00:00
Eelco Dolstra
b39f08ea8e * Added Kamera. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27736
 2011-07-12 13:14:23 +00:00
Eelco Dolstra
2c35988c77 * More KDE apps. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27728
 2011-07-11 16:26:17 +00:00
Eelco Dolstra
8cb2e1860f * Add libkipi and libkexiv2. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27727
 2011-07-11 16:13:40 +00:00
Eelco Dolstra
9bf61690e8 * Added kde-baseapps and Gwenview. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27726
 2011-07-11 15:33:41 +00:00
Eelco Dolstra
4b02855065 * Added Konsole. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27725
 2011-07-11 14:47:39 +00:00
Eelco Dolstra
dce69134d0 * Added Okular (which is a separate package now). 
svn path=/nixpkgs/branches/kde-4.7/; revision=27723
 2011-07-11 14:29:27 +00:00
Eelco Dolstra
76ec0dd430 * Update a bunch of dependencies of kdelibs. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27702
 2011-07-11 10:49:21 +00:00
Eelco Dolstra
22ab3fe1ab * Start of KDE 4.7. Only kdelibs builds currently. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27645
 2011-07-07 20:48:51 +00:00
Eelco Dolstra
7737d33233 * Use libsoup 2.33 everywhere. 
svn path=/nixpkgs/trunk/; revision=27613
 2011-07-05 15:14:44 +00:00
Eelco Dolstra
b5b7cbb9ea * Removed unused libsoup version. 
svn path=/nixpkgs/trunk/; revision=27612
 2011-07-05 14:52:15 +00:00
Alexander Tsamutali
ff910beca6 desktops/gnome-2.28/desktop/vte: Updated to 0.28.0. 
svn path=/nixpkgs/trunk/; revision=27430
 2011-06-13 14:08:04 +00:00
Cillian de Roiste
8135f030f0 Adding libgnomecanvasmm, a dependency for Ardour3 
svn path=/nixpkgs/trunk/; revision=27074
 2011-05-01 13:45:46 +00:00
Shea Levy
30701417c8 Bump libgweather to 2.30.3 
svn path=/nixpkgs/trunk/; revision=26922
 2011-04-22 17:30:39 +00:00
Shea Levy
ad67aa4549 Bump gtkhtml to 3.32.2 
svn path=/nixpkgs/trunk/; revision=26921
 2011-04-22 17:08:02 +00:00
Michael Raskin
cc6ecaeeef Add glib-networking: module to use with TLS 
svn path=/nixpkgs/trunk/; revision=26848
 2011-04-15 05:24:06 +00:00
Michael Raskin
bac6b69e18 Fix build of libsoup 2.31 
svn path=/nixpkgs/trunk/; revision=26846
 2011-04-14 19:04:39 +00:00
Karn Kallio
422455271c GnuTLS now introduces a dependency on gmp. 
-- also removed poorly considered earlier individual patches.

svn path=/nixpkgs/trunk/; revision=26810
 2011-04-12 16:59:52 +00:00
Karn Kallio
4453c35785 Pass gmp to libsoup. 
svn path=/nixpkgs/trunk/; revision=26807
 2011-04-12 16:23:42 +00:00
Ludovic Courtès
5f6260ed3e libsoup: Add missing dependency on libgcrypt. 
svn path=/nixpkgs/trunk/; revision=26800
 2011-04-12 09:19:54 +00:00
Michael Raskin
ac108080c2 libsoup 2.33 
svn path=/nixpkgs/trunk/; revision=26415
 2011-03-18 08:25:46 +00:00
Michael Raskin
80f5df945d Add libsoup 2.33 
svn path=/nixpkgs/trunk/; revision=26412
 2011-03-18 08:02:48 +00:00
Eelco Dolstra
27e2e063fb * Enable parallel building of KDE. 
svn path=/nixpkgs/branches/x-updates/; revision=26282
 2011-03-11 16:41:10 +00:00
Eelco Dolstra
eff916e9d9 * Don't do compositing when using the OpenGL software renderer 
(NixOS/121).

svn path=/nixpkgs/branches/x-updates/; revision=26281
 2011-03-11 16:40:59 +00:00
Yury G. Kudryashov
4a5b7854a8 Move eigen outside of kde-4.x 
Michael, sorry for overriding your work but I want to maintain it...

svn path=/nixpkgs/trunk/; revision=26058
 2011-02-22 11:54:56 +00:00
Yury G. Kudryashov
0646cfee1e Move strigi outside of kde-4.x 
svn path=/nixpkgs/trunk/; revision=26057
 2011-02-22 11:54:49 +00:00
Yury G. Kudryashov
78127c3b86 Move qimageblitz outside of kde-4.x 
svn path=/nixpkgs/trunk/; revision=26056
 2011-02-22 11:54:42 +00:00
Yury G. Kudryashov
68299a0202 Move qca2 outside of kde-4.x 
svn path=/nixpkgs/trunk/; revision=26053
 2011-02-22 09:53:01 +00:00
Yury G. Kudryashov
75f4d9972d More explicit dependencies 
svn path=/nixpkgs/trunk/; revision=26052
 2011-02-22 09:52:54 +00:00
Yury G. Kudryashov
513947cf9f polkit-qt-1: add pkgconfig to explicit buildInputs 
svn path=/nixpkgs/trunk/; revision=26051
 2011-02-22 06:19:21 +00:00
Yury G. Kudryashov
db67fc27a3 Explicitly depend on pkgconfig 
svn path=/nixpkgs/trunk/; revision=26050
 2011-02-22 06:19:17 +00:00
Yury G. Kudryashov
3b3f50e405 Move automoc4 out of kde-4.x/ 
kde-4.x/ is for software that is released with kde releases,
not for anything hosted on *.kde.org or in kde svn/git.

svn path=/nixpkgs/trunk/; revision=26048
 2011-02-22 06:19:05 +00:00
Yury G. Kudryashov
a37558d8df Remove unused manifests 
svn path=/nixpkgs/trunk/; revision=26039
 2011-02-21 07:32:55 +00:00
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