Unverified Commit 236d7724 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #223939 from Kiskae/patch-1 

linuxPackages.nvidia_x11_production: 525.89.02 -> 525.105.17
parents 3903d428 ea126529

nixos/modules/hardware/video/nvidia.nix

+3 −1
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ let 
  nvidiaPersistencedEnabled =  cfg.nvidiaPersistenced;

  nvidiaSettings = cfg.nvidiaSettings;

  busIDType = types.strMatching "([[:print:]]+[\:\@][0-9]{1,3}\:[0-9]{1,2}\:[0-9])?";



  ibtSupport = cfg.open || (nvidia.ibtSupport or false);

in



{
@@ -462,7 +464,7 @@ in 
    boot.kernelParams = optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1"

      ++ optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1"

      ++ optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1"

      ++ optional (!cfg.open && config.boot.kernelPackages.kernel.kernelAtLeast "6.2" && lib.versionOlder nvidia_x11.version "530") "ibt=off";

      ++ optional (config.boot.kernelPackages.kernel.kernelAtLeast "6.2" && !ibtSupport) "ibt=off";



    services.udev.extraRules =

      ''

pkgs/os-specific/linux/nvidia-x11/default.nix

+7 −5
Original line number Diff line number Diff line
@@ -25,11 +25,13 @@ rec { 
  stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest;



  production = generic {

    version = "525.89.02";

    sha256_64bit = "sha256-DkEsiMW9mPhCqDmm9kYU8g5MCVDvfP+xKxWKcWM1k+k=";

    openSha256 = "sha256-MP9ir0Fuodar239r3PbqVxIHd0vHvpDj8Rw55TeFtZM=";

    settingsSha256 = "sha256-7rHaJWm0XHJXsKL8VnU9XT15t/DU8jdsCXQwQT+KaV0=";

    persistencedSha256 = "sha256-4AmOL6b3GKCjGs6bRDpQAkEG4n41X395znyQF1x9VEs=";

    version = "525.105.17";

    sha256_64bit = "sha256-xjWiGigsm1NIXxnrtkoPS1NqlouU1Nl2KeC8VHpYFCo=";

    openSha256 = "sha256-O3XB8tNLmNkzrYoVyJVEE0IcE772lOdr8qn4rQHIupE=";

    settingsSha256 = "sha256-KUw31Am9Zfwk5QTs6th8+J3C4oUBacNgb7ZUNeV68W4=";

    persistencedSha256 = "sha256-jhBtsf9MXrkU/SsBndR1ESGUHhgUWiSH7R75swk3m40=";



    ibtSupport = true;

  };



  latest = selectHighestVersion production (generic {

pkgs/os-specific/linux/nvidia-x11/generic.nix

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
, useProfiles ? true

, preferGtk2 ? false

, settings32Bit ? false

, ibtSupport ? false



, prePatch ? ""

, postPatch ? null
@@ -116,6 +117,7 @@ let 
      persistenced = mapNullable (hash: callPackage (import ./persistenced.nix self hash) { }) persistencedSha256;

      inherit persistencedVersion settingsVersion;

      compressFirmware = false;

      ibtSupport = ibtSupport || (lib.versionAtLeast version "530");

    } // optionalAttrs (!i686bundled) {

      inherit lib32;

    };