Peter Simons f67d5a9a39 Merge branch 'master' into stdenv-updates. ... Conflicts have been resolved in: pkgs/tools/misc/file/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/python-packages.nix		2012-11-21 16:20:36 +01:00
..
analysis	smatch: add dependency on Perl	2012-10-30 17:15:26 +01:00
boomerang	boomerang: Fix prefix in dlopen().	2012-08-10 15:02:19 +02:00
build-managers	cmake: Bump	2012-10-08 03:12:42 -04:00
cdecl
documentation	haskell-haddock: add version 2.13.1	2012-10-15 11:52:01 +02:00
guile	Fix url for guile-lint (geocities is dead now)	2012-06-22 14:36:11 -04:00
haskell	haskell-cabal2nix: update to version 1.42	2012-11-20 14:42:19 +01:00
java
literate-programming/noweb
misc	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00
neoload	neoload: link used jre to a location which is hard-coded into some binaries	2012-11-21 09:49:35 +01:00
ocaml	Update camlp5 to 6.06.	2012-10-09 14:03:12 -04:00
parsing	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00
profiling
pydb
selenium/remote-control