nvidia: 346.47 -> 346.59
This commit is contained in:
parent
46ce3823d1
commit
6ffd44c4c3
|
@ -13,9 +13,6 @@ let
|
||||||
# driver.
|
# driver.
|
||||||
nvidiaForKernel = kernelPackages:
|
nvidiaForKernel = kernelPackages:
|
||||||
if elem "nvidia" drivers then
|
if elem "nvidia" drivers then
|
||||||
if versionAtLeast kernelPackages.kernel.version "4.0" then
|
|
||||||
kernelPackages.nvidia_x11_beta
|
|
||||||
else
|
|
||||||
kernelPackages.nvidia_x11
|
kernelPackages.nvidia_x11
|
||||||
else if elem "nvidiaLegacy173" drivers then
|
else if elem "nvidiaLegacy173" drivers then
|
||||||
kernelPackages.nvidia_x11_legacy173
|
kernelPackages.nvidia_x11_legacy173
|
||||||
|
|
|
@ -12,10 +12,7 @@ assert (!libsOnly) -> kernel != null;
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
# TODO: Remove the use of the beta driver for kernel 4.0 in
|
versionNumber = "346.59";
|
||||||
# nixos/modules/hardware/video/nvidia.nix when this driver supports
|
|
||||||
# kernel 4.0
|
|
||||||
versionNumber = "346.47";
|
|
||||||
|
|
||||||
# Policy: use the highest stable version as the default (on our master).
|
# Policy: use the highest stable version as the default (on our master).
|
||||||
inherit (stdenv.lib) makeLibraryPath;
|
inherit (stdenv.lib) makeLibraryPath;
|
||||||
|
@ -31,12 +28,12 @@ stdenv.mkDerivation {
|
||||||
if stdenv.system == "i686-linux" then
|
if stdenv.system == "i686-linux" then
|
||||||
fetchurl {
|
fetchurl {
|
||||||
url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
|
url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
|
||||||
sha256 = "0vkayz6nhw00kn2nvxvr9hsh4sa555nbbr9swlx5x1frziym48dv";
|
sha256 = "0a91mmv9846chyx6rbf3hx39gr344cffmgic45a9sf82rky87kv5";
|
||||||
}
|
}
|
||||||
else if stdenv.system == "x86_64-linux" then
|
else if stdenv.system == "x86_64-linux" then
|
||||||
fetchurl {
|
fetchurl {
|
||||||
url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
|
url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
|
||||||
sha256 = "0xqnjs54i281pnkky7dnz4n7jcn2vqjba0kra8da1wnyklm6gdni";
|
sha256 = "0rz7pdzdviz1086w8ks6qiv83ah84y13h3051xr1p4wa4kll2yac";
|
||||||
}
|
}
|
||||||
else throw "nvidia-x11 does not support platform ${stdenv.system}";
|
else throw "nvidia-x11 does not support platform ${stdenv.system}";
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user