Merging from trunk. I solved some trivial merge conflicts.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
This commit is contained in:
Lluís Batlle i Rossell
2010-12-17 20:39:58 +00:00
137 changed files with 1155 additions and 478 deletions

View File

@@ -192,11 +192,11 @@ in
import ./generic.nix (
rec {
version = "2.6.36";
version = "2.6.36.2";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
sha256 = "15a076d1a435a6bf8e92834eba4b390b4ec094ce06d47f89d071ca9e5788ce04";
sha256 = "06wshmpgwfswdfqx5cc5nsqaa8vjyg3wab2zpzmvmc1gw564b8ll";
};
config = configWithPlatform stdenv.platform;