Yury G. Kudryashov 9ee0a9df9b svn merge ^/nixpkgs/trunk ... A few trivial conflicts svn path=/nixpkgs/branches/stdenv-updates/; revision=31434		2012-01-08 16:01:12 +00:00
..
analysis	LCOV: Add `meta.platforms'.	2011-12-06 14:12:43 +00:00
build-managers	Add a warning to cmake/default.nix	2012-01-03 18:00:02 +00:00
cdecl	Making cdecl compile with readline.	2009-04-08 10:09:14 +00:00
documentation	State qt version (3/4) in packages, not in all-packages.nix	2012-01-07 17:06:49 +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	svn merge ^/nixpkgs/trunk	2012-01-08 16:01:12 +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