Peter Simons 9407832de4 Merge remote-tracking branch 'origin/master' into stdenv-updates. ... Conflicts: pkgs/development/libraries/gettext/default.nix		2013-09-23 10:59:44 +02:00
..
audio	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-09-23 10:59:44 +02:00
display-managers	lightdm updates (merge #574)	2013-08-04 19:16:41 +02:00
editors	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-09-23 10:59:44 +02:00
graphics	imagemagick: add link for $out/include/ImageMagick	2013-09-15 18:27:08 +02:00
misc	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-09-23 10:59:44 +02:00
networking	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-09-23 10:59:44 +02:00
office	libreoffice: unbreak .desktop files. Hopefully fixes nixos/nixos#252.	2013-09-18 10:11:54 +03:00
science	Added expression for PLINK	2013-09-19 09:39:14 +10:00
search	Adding doodle.	2013-04-22 20:57:14 +04:00
taxes	aangifte2012: preload library which seems needed	2013-04-05 00:34:14 +02:00
version-management	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-09-23 10:59:44 +02:00
video	Merge pull request #987 from oxij/mplayer-fontconfig	2013-09-18 08:08:24 -07:00
virtualization	virtualbox: Update to 4.2.18	2013-09-17 17:44:28 +02:00
window-managers	haskell-xmonad-extras: update to version 0.12	2013-08-30 10:53:02 +02:00