diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-12-21 15:14:33 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-12-21 15:14:33 +0000 |
| commit | c14382cb45678668422d9f368fbf7999eed94b7f (patch) | |
| tree | 8618c2d77e59bc89a0919baf2d406f5c80af8acd /pkgs/os-specific | |
| parent | c7de6bfeb39ecc84244dd25ad2038a7ba91c874a (diff) | |
| parent | e1a0b9472b0a39259d80050d5e73fd84b590febb (diff) | |
| download | nixpkgs-c14382cb45678668422d9f368fbf7999eed94b7f.tar nixpkgs-c14382cb45678668422d9f368fbf7999eed94b7f.tar.gz nixpkgs-c14382cb45678668422d9f368fbf7999eed94b7f.tar.bz2 nixpkgs-c14382cb45678668422d9f368fbf7999eed94b7f.tar.lz nixpkgs-c14382cb45678668422d9f368fbf7999eed94b7f.tar.xz nixpkgs-c14382cb45678668422d9f368fbf7999eed94b7f.tar.zst nixpkgs-c14382cb45678668422d9f368fbf7999eed94b7f.zip | |
* Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25225
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-2.6.32.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix index a81085fd5e2..1cef6d035f4 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix @@ -198,11 +198,11 @@ in import ./generic.nix ( rec { - version = "2.6.32.26"; + version = "2.6.32.27"; src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "1kpkl5ps8xrwddmn90rzynra49am9rdm37smplhf3w3ifvpc1mf3"; + sha256 = "08zj1mysfhqz81vmly2cassbf6r5nzi9y6sps27c8sz9xfwzly5c"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index ff85f8f8b97..dd6c1875362 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; -let versionNumber = "260.19.21"; in +let versionNumber = "260.19.29"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; @@ -18,12 +18,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "1gr11icpi1jcba39i86mvb6yvawika04hja2c2gri9mz7bbbn1kp"; + sha256 = "0zbjmpwbc35bzg15j8zs7xy3qlaywhrb8mmps7df8bv59fb0krxn"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "1pl5pwp72vdvw74449pv9h4hnygg5sasz8z3f0vbmch4c8hdmyz9"; + sha256 = "119dhzafkfijfw94hw7sz0iffp1lshdh6vadvr6d1vr6hpcggdw6"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; |