Peter Simons 1abdc56a12 Synchronized stdenv-updates branch with trunk. ... There were conflicting patches of pkgs/os-specific/linux/module-init-tools. Apparently, the expression was updated independently in both branches. I've resolved the conflict by preferring the patches from stdenv-updates, because those patches appeared to be more sophisticated, i.e. they build the manual, etc. svn path=/nixpkgs/branches/stdenv-updates/; revision=29680		2011-10-06 09:37:22 +00:00
..
audio	* Spotify needs OpenSSL now.	2011-09-23 15:37:15 +00:00
display-managers/slim
editors	Add kde4.kile	2011-10-04 11:12:11 +00:00
graphics	Use fetchurl_gnome in dia	2011-09-20 06:31:37 +00:00
misc	calibre-0.8.21	2011-10-04 15:20:17 +00:00
networking	Merge from trunk	2011-10-01 18:12:00 +00:00
office	haskell-hledger-interest: updated to version 1.3	2011-09-02 18:12:31 +00:00
science	Merge from trunk	2011-09-23 16:58:45 +00:00
taxes
version-management	git-subtree: updated to version 0.4-2-g2793ee6	2011-09-18 14:56:46 +00:00
video	Upgrading Kdenlive to 0.8	2011-08-20 23:26:59 +00:00
virtualization	virtualbox-4.1.2	2011-10-05 19:54:44 +00:00
window-managers	haskell-xmonad-extras: updated build expression	2011-09-05 18:25:59 +00:00