Peter Simons 4914e63a89 Merge changes from branch 'master' into stdenv-updates. ... Conflicts: pkgs/development/libraries/icu/default.nix pkgs/tools/misc/coreutils/default.nix		2013-04-19 11:48:11 +02:00
..
audio	Remove the "proprietary" license	2013-04-12 14:37:50 +02:00
display-managers	lightdm: Add lightdm and lightdm-gtk-greeter	2013-03-29 15:37:28 +01:00
editors	emacs-prolog-mode: update to version 1.25	2013-04-12 21:33:37 +02:00
graphics	darktable: Update to 1.2	2013-04-08 18:22:15 +02:00
misc	Merge changes from branch 'master' into stdenv-updates.	2013-04-19 11:48:11 +02:00
networking	Changing the source of skype4pidgin	2013-04-16 14:53:59 +02:00
office	koffice, kbluetooth: remove from hydra	2013-03-02 09:21:11 +01:00
science	kicad: upgrade to stable version 20130325, libraries to r220	2013-03-31 19:17:02 -07:00
search/recoll	Fix tarball	2013-04-05 06:59:16 -04:00
taxes	aangifte2012: preload library which seems needed	2013-04-05 00:34:14 +02:00
version-management	Merge changes from branch 'master' into stdenv-updates.	2013-04-19 11:48:11 +02:00
video	vlc: upgrade to 2.0.6	2013-04-12 11:40:33 +02:00
virtualization	virtualbox+guest: Update to new upstream v4.2.12.	2013-04-13 10:31:36 +02:00
window-managers	dwm: adding a patch I missed in a recent commit	2013-04-05 12:50:42 +02:00