Eelco Dolstra 99b88cfb53 Merge remote-tracking branch 'origin/master' into multiple-outputs ... Conflicts: pkgs/development/libraries/acl/default.nix pkgs/development/libraries/atk/2.6.x.nix pkgs/development/libraries/attr/default.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/glib/2.34.x.nix pkgs/development/libraries/gtk+/2.24.x.nix pkgs/development/libraries/libtiff/default.nix pkgs/development/libraries/openssl/default.nix pkgs/development/libraries/pango/1.30.x.nix pkgs/misc/cups/default.nix pkgs/os-specific/linux/util-linux/default.nix pkgs/servers/x11/xorg/builder.sh pkgs/servers/x11/xorg/default.nix pkgs/top-level/all-packages.nix		2013-06-09 00:41:27 +02:00
..
audio	Merge remote-tracking branch 'origin/master' into multiple-outputs	2013-06-09 00:41:27 +02:00
display-managers	lightdm: Add lightdm and lightdm-gtk-greeter	2013-03-29 15:37:28 +01:00
editors	haskell-mode: update to current version from git	2013-06-03 10:51:27 +02:00
graphics	Merge pull request #551 from MarcWeber/submit/alchemy	2013-06-03 15:45:12 -07:00
misc	gphoto2-2.5.2 and libgphoto2-2.5.2	2013-06-07 10:58:39 -07:00
networking	chromium: Update stable and beta channels.	2013-06-07 14:39:00 +02:00
office	libreoffice: update from 3.6.2.2 to 3.6.6.2	2013-05-13 16:07:01 +02:00
science	Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions.	2013-06-07 03:15:45 +03: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	Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions.	2013-06-07 03:15:45 +03:00
video	kdenlive+mlt: enabling some subcomponents, parallel builds	2013-06-05 00:30:44 +02:00
virtualization	virtualbox+guest: Update to new upstream v4.2.12.	2013-04-13 10:31:36 +02:00
window-managers	openbox: upgrade to 3.5.0	2013-05-13 10:33:31 +08:00