diff options
| author | Kiskae <Kiskae@users.noreply.github.com> | 2023-10-31 17:22:53 +0100 |
|---|---|---|
| committer | Kiskae <Kiskae@users.noreply.github.com> | 2023-11-01 11:24:17 +0100 |
| commit | 3ac4cd157e075ad0c656d653e50243968e7834f7 (patch) | |
| tree | 64e62a602c37241a997abb5c13a4f50035ef79d9 /pkgs/os-specific/linux/nvidia-x11 | |
| parent | 0cbe9f69c234a7700596e943bfae7ef27a31b735 (diff) | |
| download | nixpkgs-3ac4cd157e075ad0c656d653e50243968e7834f7.tar nixpkgs-3ac4cd157e075ad0c656d653e50243968e7834f7.tar.gz nixpkgs-3ac4cd157e075ad0c656d653e50243968e7834f7.tar.bz2 nixpkgs-3ac4cd157e075ad0c656d653e50243968e7834f7.tar.lz nixpkgs-3ac4cd157e075ad0c656d653e50243968e7834f7.tar.xz nixpkgs-3ac4cd157e075ad0c656d653e50243968e7834f7.tar.zst nixpkgs-3ac4cd157e075ad0c656d653e50243968e7834f7.zip | |
linuxPackages.nvidia_x11: 530.41.03 -> 545.29.02
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11')
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/settings.nix | 4 |
2 files changed, 10 insertions, 14 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 39ebe3e27e2..998e431a5b4 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -36,21 +36,15 @@ rec { }; latest = selectHighestVersion production (generic { - version = "530.41.03"; - sha256_64bit = "sha256-riehapaMhVA/XRYd2jQ8FgJhKwJfSu4V+S4uoKy3hLE="; - sha256_aarch64 = "sha256-uM5zMEO/AO32VmqUOzmc05FFm/lz76jPSSaQmeZUlFo="; - openSha256 = "sha256-etbtw6LMRUcFoZC9EDDRrTDekV8JFRYmkp3idLaMk5g="; - settingsSha256 = "sha256-8KB6T9f+gWl8Ni+uOyrJKiiH5mNx9eyfCcW/RjPTQQA="; - persistencedSha256 = "sha256-zrstlt/0YVGnsPGUuBbR9ULutywi2wNDVxh7OhJM7tM="; + version = "545.29.02"; + sha256_64bit = "sha256-RncPlaSjhvBFUCOzWdXSE3PAfRPCIrWAXyJMdLPKuIU="; + sha256_aarch64 = "sha256-Y2RDOuDtiIclr06gmLrPDfE5VFmFamXxiIIKtKAewro="; + openSha256 = "sha256-PukpOBtG5KvZKWYfJHVQO6SuToJUd/rkjpOlEi8pSmk="; + settingsSha256 = "sha256-zj173HCZJaxAbVV/A2sbJ9IPdT1+3yrwyxD+AQdkSD8="; + persistencedSha256 = "sha256-mmMi2pfwzI1WYOffMVdD0N1HfbswTGg7o57x9/IiyVU="; patchFlags = [ "-p1" "-d" "kernel" ]; - patches = [ - # source: https://gist.github.com/joanbm/77f0650d45747b9a4dc8e330ade2bf5c - (fetchpatch { - url = "https://gist.github.com/joanbm/77f0650d45747b9a4dc8e330ade2bf5c/raw/688b612624945926676de28059fe749203b4b549/nvidia-470xx-fix-linux-6.4.patch"; - hash = "sha256-OyRmezyzqAi7mSJHDjsWQVocSsgJPTW5DvHDFVNX7Dk="; - }) - ]; + patches = []; }); beta = selectHighestVersion latest (generic { diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index 0b801d4b272..b11dc06c85e 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -69,7 +69,9 @@ stdenv.mkDerivation { url = "https://github.com/NVIDIA/nvidia-settings/commit/a7c1f5fce6303a643fadff7d85d59934bd0cf6b6.patch"; hash = "sha256-ZwF3dRTYt/hO8ELg9weoz1U/XcU93qiJL2d1aq1Jlak="; }) - ++ lib.optional (lib.versionAtLeast nvidia_x11.settingsVersion "515.43.04") + ++ lib.optional + ((lib.versionAtLeast nvidia_x11.settingsVersion "515.43.04") + && (lib.versionOlder nvidia_x11.settingsVersion "545.29")) (fetchpatch { # fix wayland support for compositors that use wl_output version 4 url = "https://github.com/NVIDIA/nvidia-settings/pull/99/commits/2e0575197e2b3247deafd2a48f45afc038939a06.patch"; |