public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merging from trunk.

Browse Source 
I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.


svn path=/nixpkgs/branches/stdenv-updates/; revision=22878
This commit is contained in:
Lluís Batlle i Rossell
2010-08-02 15:48:19 +00:00
parent 9724fb271b fd268b4852
commit 5417c720fd
674 changed files with 10063 additions and 117749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/kernel-headers/2.6.32.nix
View File

@@ -3,7 +3,7 @@
assert cross == null -> stdenv.isLinux;
let
version = "2.6.32.9";
version = "2.6.32.16";
kernelHeadersBaseConfig = if (cross == null) then
stdenv.platform.kernelHeadersBaseConfig
else
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
sha256 = "1g6hs7j5kmifb3phbnckdmrnxd0cpqrijnnbry86z26npsh9my7l";
sha256 = "1ndvqvfaxachsklzzr5db1bzvfhnzz8diddrm1zlv7171fzmn13j";
};
targetConfig = if (cross != null) then cross.config else null;