From ea1be31262c93155c03c953078fa50f27de14de5 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Fri, 30 Nov 2018 13:50:47 -0500 Subject: [PATCH] nvidia: expose nvidia_x11_legacy390 --- nixos/modules/hardware/video/nvidia.nix | 2 ++ pkgs/os-specific/linux/nvidia-x11/default.nix | 22 +++++++++---------- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 21e12395498..c37392841c4 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -20,6 +20,8 @@ let kernelPackages.nvidia_x11_legacy304 else if elem "nvidiaLegacy340" drivers then kernelPackages.nvidia_x11_legacy340 + else if elem "nvidiaLegacy390" drivers then + kernelPackages.nvidia_x11_legacy390 else null; nvidia_x11 = nvidiaForKernel config.boot.kernelPackages; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 49f1500f206..c0f0d18dc3e 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -16,17 +16,20 @@ let in rec { # Policy: use the highest stable version as the default (on our master). - stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_410 else stable_390; + stable = if stdenv.hostPlatform.system != "x86_64-linux" + then legacy_390 + else generic { + version = "410.78"; + sha256_64bit = "1ciabnmvh95gsfiaakq158x2yws3m9zxvnxws3p32lz9riblpdjx"; + settingsSha256 = "1677g7rcjbcs5fja1s4p0syhhz46g9x2qqzyn3wwwrjsj7rwaz77"; + persistencedSha256 = "01kvd3zp056i4n8vazj7gx1xw0h4yjdlpazmspnsmwg24ijb82x4"; + }; - stable_410 = generic { - version = "410.78"; - sha256_64bit = "1ciabnmvh95gsfiaakq158x2yws3m9zxvnxws3p32lz9riblpdjx"; - settingsSha256 = "1677g7rcjbcs5fja1s4p0syhhz46g9x2qqzyn3wwwrjsj7rwaz77"; - persistencedSha256 = "01kvd3zp056i4n8vazj7gx1xw0h4yjdlpazmspnsmwg24ijb82x4"; - }; + # No active beta right now + beta = stable; # Last one supporting x86 - stable_390 = generic { + legacy_390 = generic { version = "390.87"; sha256_32bit = "0rlr1f4lnpb8c4qz4w5r8xw5gdy9bzz26qww45qyl1qav3wwaaaw"; sha256_64bit = "07k1kq8lkgbvjyr2dnbxcz6nppcwpq17wf925w8kfq78345hla9q"; @@ -36,9 +39,6 @@ rec { patches = lib.optional (kernel.meta.branch == "4.19") ./drm_mode_connector.patch; }; - # No active beta right now - beta = stable; - legacy_340 = generic { version = "340.107"; sha256_32bit = "0mh83affz6bim26ws7kkwwcfj2s6vkdy4d45hifsbshr82qd52wd"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 333373f0605..1b32587a6c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14494,6 +14494,7 @@ with pkgs; nvidia_x11_legacy304 = nvidiaPackages.legacy_304; nvidia_x11_legacy340 = nvidiaPackages.legacy_340; + nvidia_x11_legacy390 = nvidiaPackages.legacy_390; nvidia_x11_beta = nvidiaPackages.beta; nvidia_x11 = nvidiaPackages.stable;