Yury G. Kudryashov a670a7aca1 merge trunk ...

A few conflicts due to renames

svn path=/nixpkgs/branches/stdenv-updates/; revision=30947

2011-12-16 22:57:21 +00:00

..

audio

amarok: added missing function arguments

2011-12-16 11:44:40 +00:00

display-managers/slim

…

editors

svn merge https://nixos.org/repos/nix/nixpkgs/trunk

2011-12-15 19:16:38 +00:00

graphics

xournal: prepare to poppler upgrade

2011-12-15 08:01:03 +00:00

misc

wacomtablet-1.3.5

2011-12-16 22:33:28 +00:00

networking

merge trunk

2011-12-16 22:57:21 +00:00

office

* GnuCash updated to 2.4.8.

2011-12-06 18:44:05 +00:00

science

merge trunk

2011-12-16 22:57:21 +00:00

taxes

…

version-management

Update fossil to version 1.21

2011-12-13 22:19:06 +00:00

video

added libdvbpsi and added it to the dependency list of vlc so that vlc can play DVB

2011-12-06 23:09:19 +00:00

virtualization

Bumped virtualbox version to 4.1.6

2011-11-30 14:44:29 +00:00

window-managers

haskell-xmonad-extras: updated to version 0.10.1

2011-11-28 18:11:27 +00:00