Yury G. Kudryashov 2bca92e32d Merge trunk ... Conflicts: 1. cmake upgrade: use 2.8.7 2. openssl: left FreeBSD-asm patch. svn path=/nixpkgs/branches/stdenv-updates/; revision=31245		2012-01-03 17:25:24 +00:00
..
analysis	LCOV: Add `meta.platforms'.	2011-12-06 14:12:43 +00:00
build-managers	cmake-2.8.7	2012-01-03 16:38:53 +00:00
cdecl	Making cdecl compile with readline.	2009-04-08 10:09:14 +00:00
documentation	haskell-haddock: updated to version 2.9.4	2011-10-04 14:58:28 +00:00
guile	Fix references to the guileLib' attribute, now guile_lib'.	2010-09-06 07:58:17 +00:00
haskell	haskell-cabal2nix: updated to version 1.23	2011-12-25 16:18:34 +00:00
java	Add FastJar.	2009-07-27 10:43:20 +00:00
literate-programming/noweb	noweb-2.11b	2010-06-22 19:49:06 +00:00
misc	* Test xz in stdenv.	2011-12-20 13:05:51 +00:00
ocaml	Update ocaml-findlib to version 1.2.7	2011-12-16 09:22:31 +00:00
parsing	* Sync with the trunk.	2011-12-12 16:54:35 +00:00
profiling	OProfile: Add dependency on zlib.	2010-11-29 17:42:50 +00:00
selenium/remote-control	* More cleanup.	2010-07-28 18:01:17 +00:00