Yury G. Kudryashov 72f2477f80 Use ocaml-3.12.1 by default ... ocaml-3.11.1 is broken in stdenv, so I made this change in stdenv without waiting for maintainer. Feel free to revert if you have a better solution. svn path=/nixpkgs/branches/stdenv-updates/; revision=31314		2012-01-05 17:06:15 +00:00
..
applications	Fix djvulibre compilation	2012-01-05 09:54:46 +00:00
build-support	svn merge ^/nixpkgs/trunk	2012-01-04 09:54:17 +00:00
data	shared-desktop-ontologies-0.8.1	2011-12-15 20:16:46 +00:00
desktops	Make gnome panel 2.28 build - it missed libtool as buildInputs.	2012-01-04 13:37:54 +00:00
development	svn merge ^/nixpkgs/trunk	2012-01-04 15:22:16 +00:00
games	Merge trunk	2012-01-03 17:25:24 +00:00
lib	svn merge ^/nixpkgs/trunk	2012-01-04 15:22:16 +00:00
misc	svn merge ^/nixpkgs/trunk	2012-01-04 09:54:17 +00:00
os-specific	svn merge ^/nixpkgs/trunk	2012-01-04 09:54:17 +00:00
servers	moved parts of extra.list back to tarballs-7.6.list	2011-12-31 15:37:51 +00:00
shells	Merge trunk	2012-01-02 14:12:40 +00:00
stdenv	* Add ‘xz’ to stdenv, as suggested by Michael Raskin.	2011-12-20 10:32:14 +00:00
test	Add a new way to handle option sets.	2008-08-05 17:16:35 +00:00
tools	svn merge ^/nixpkgs/trunk	2012-01-04 15:22:16 +00:00
top-level	Use ocaml-3.12.1 by default	2012-01-05 17:06:15 +00:00