Lluís Batlle i Rossell 9183f21f7e Merging from trunk. ...

I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438

2010-01-14 14:49:31 +00:00

..

analysis

* Doh.

2009-09-23 19:50:31 +00:00

build-managers

Merging from trunk.

2010-01-14 14:49:31 +00:00

cdecl

Making cdecl compile with readline.

2009-04-08 10:09:14 +00:00

documentation

Updating doxygen from 1.5.8 to 1.6.1

2009-11-04 14:58:39 +00:00

guile

G-Wrap 1.9.13.

2009-10-29 11:23:10 +00:00

haskell

Version bumps for a number of Haskell packages.

2009-09-14 08:35:39 +00:00

java

Add FastJar.

2009-07-27 10:43:20 +00:00

literate-programming/noweb

* Get rid of all references to nix.cs.uu.nl.

2008-11-14 16:57:19 +00:00

misc

Merging from trunk.

2010-01-14 14:49:31 +00:00

ocaml/camlp5

Updated Coq to version 8.2pl1

2009-11-02 11:44:27 +00:00

parsing

The bison elf may call m4 (I saw that building binutils' gold).

2009-12-08 19:42:18 +00:00

profiling

* Improved a bunch of "name" attributes (mostly missing version

2009-10-28 14:06:56 +00:00

selenium/remote-control

downgrade selenium-rc to rev 2450. The newer one is buggy (Neither allows using a FirefoxProfile nor launches Opera)

2009-04-14 12:58:53 +00:00