diff options
author | Silvan Mosberger <infinisil@icloud.com> | 2018-10-23 12:01:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-23 12:01:58 +0200 |
commit | 6f002761710fc8716780e55c059d49d01d60b4c4 (patch) | |
tree | af28ae69cce64ecca2e2c2b94c3e3c6c37d2300d /pkgs/os-specific/linux | |
parent | e82af6003cb51a2a38763373d9322ab3e115722b (diff) | |
parent | 67e9be79904742fa16932d307c6f6a1a15ef257a (diff) | |
download | nixlib-6f002761710fc8716780e55c059d49d01d60b4c4.tar nixlib-6f002761710fc8716780e55c059d49d01d60b4c4.tar.gz nixlib-6f002761710fc8716780e55c059d49d01d60b4c4.tar.bz2 nixlib-6f002761710fc8716780e55c059d49d01d60b4c4.tar.lz nixlib-6f002761710fc8716780e55c059d49d01d60b4c4.tar.xz nixlib-6f002761710fc8716780e55c059d49d01d60b4c4.tar.zst nixlib-6f002761710fc8716780e55c059d49d01d60b4c4.zip |
Merge pull request #48661 from baracoder/nvidia-update
nvidia_x11: 390.87 -> 410.66
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 492b268610f1..44598588db9d 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, fetchurl }: +{ lib, callPackage, fetchurl, stdenv }: let generic = args: callPackage (import ./generic.nix args) { }; @@ -16,7 +16,17 @@ let in rec { # Policy: use the highest stable version as the default (on our master). - stable = generic { + stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_410 else stable_390; + + stable_410 = generic { + version = "410.66"; + sha256_64bit = "05xjzvj0fgmkpz36dbd7hy2vzl6xxiflzx7kml3k7ad9gy2svdlg"; + settingsSha256 = "1nsxz1byshgjs3c03lyx6ya36dp0f2vg2l0d9pkh1i6cpzkp53kz"; + persistencedSha256 = "0m4wdpb8w4y323d8py105p9hizwmf2ai8frkl7h77sn3ski17zw6"; + }; + + # Last one supporting x86 + stable_390 = generic { version = "390.87"; sha256_32bit = "0rlr1f4lnpb8c4qz4w5r8xw5gdy9bzz26qww45qyl1qav3wwaaaw"; sha256_64bit = "07k1kq8lkgbvjyr2dnbxcz6nppcwpq17wf925w8kfq78345hla9q"; @@ -26,12 +36,8 @@ rec { patches = lib.optional (kernel.meta.branch == "4.19") ./drm_mode_connector.patch; }; - beta = generic { - version = "410.57"; - sha256_64bit = "08534rv3wcmzslbwq11kd3s7cxm72p48dia6540c0586xwgjwg2w"; - settingsSha256 = "1phhhzlc8n3rqdhrn757mnlqmsp616d079a6h1qjpa6jba9z9915"; - persistencedSha256 = "1z7c1ff0y486yp9i5w0siwh9dnprml22x2avarbjfgqwm4f652lw"; - }; + # No active beta right now + beta = stable; legacy_340 = generic { version = "340.104"; |