diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-12-17 20:39:58 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-12-17 20:39:58 +0000 |
| commit | b48b2a7bb4add41c33f680df0117e3c92cc0515b (patch) | |
| tree | 2f7451135e2dd9619e142529c4672d0317b12312 /pkgs/os-specific/linux | |
| parent | e60ba9135a90808a3443d09fbd92f2259e9deea8 (diff) | |
| parent | a6f1f87697768e39c5ed7f1e475b3002e1418d46 (diff) | |
| download | nixpkgs-b48b2a7bb4add41c33f680df0117e3c92cc0515b.tar nixpkgs-b48b2a7bb4add41c33f680df0117e3c92cc0515b.tar.gz nixpkgs-b48b2a7bb4add41c33f680df0117e3c92cc0515b.tar.bz2 nixpkgs-b48b2a7bb4add41c33f680df0117e3c92cc0515b.tar.lz nixpkgs-b48b2a7bb4add41c33f680df0117e3c92cc0515b.tar.xz nixpkgs-b48b2a7bb4add41c33f680df0117e3c92cc0515b.tar.zst nixpkgs-b48b2a7bb4add41c33f680df0117e3c92cc0515b.zip | |
Merging from trunk. I solved some trivial merge conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-2.6.36.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.36.nix b/pkgs/os-specific/linux/kernel/linux-2.6.36.nix index a85ef2ecee1..84d5e1a2932 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.36.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.36.nix @@ -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; |