From 6e0173462496cda1ffc53dca42b0718688ebc231 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Tue, 18 Jul 2023 16:42:13 +0200 Subject: [PATCH 01/11] linuxPackages.nvidia_x11_legacy470: 470.182.03 -> 470.199.02 Also add tentative patch for linux 6.5 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 5a54dd93de6c..73ba504b3bb0 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -81,23 +81,18 @@ rec { # Last one supporting Kepler architecture legacy_470 = generic { - version = "470.182.03"; - sha256_64bit = "sha256-PbwUCPxIuGXT3azvxF9KP8E7kLg6Yo7lRrAIKrLD/Hk="; - sha256_aarch64 = "sha256-FEoWikgQjZKkHvAHgtkxnDhB41GdYplZTttEUBit4QQ="; - settingsSha256 = "sha256-TRKQ4brLnCbBZt1smGSIHTfwW+wEFPWWPEwDxjVXN7s="; - persistencedSha256 = "sha256-fSJMx49z9trdNxx0iPI45oG57smvvhaqVNxsRnfXKCI="; + version = "470.199.02"; + sha256_64bit = "sha256-/fggDt8RzjLDW0JiGjr4aV4RGnfEKL8MTTQ4tCjXaP0="; + sha256_aarch64 = "sha256-UmF7LszdrO2d+bOaoQYrTVKXUwDqzMy1UDBW5SPuZy4="; + settingsSha256 = "sha256-FkKPE4QV5IiVizGYUNUYoEXRpEhojt/cbH/I8iCn3hw="; + persistencedSha256 = "sha256-JP71wt3uCNOgheLNlQbW3DqVFQNTC5vj4y4COWKQzAs="; patchFlags = [ "-p1" "-d" "kernel" ]; patches = [ - # source: https://gist.github.com/joanbm/d10e9cbbbb8e245b6e7e27b2db338faf + # source: https://gist.github.com/joanbm/dfe8dc59af1c83e2530a1376b77be8ba (fetchpatch { - url = "https://gist.github.com/joanbm/d10e9cbbbb8e245b6e7e27b2db338faf/raw/f5d5238bdbaa16cd4008658a0f82b9dd84f1b38f/nvidia-470xx-fix-linux-6.3.patch"; - hash = "sha256-mR+vXDHgVhWC0JeLgGlbNVCH8XTs7XnhEJS6BV75tI8="; - }) - # 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="; + url = "https://gist.github.com/joanbm/dfe8dc59af1c83e2530a1376b77be8ba/raw/37ff2b5ccf99f295ff958c9a44ca4ed4f42503b4/nvidia-470xx-fix-linux-6.5.patch"; + hash = "sha256-s5r7nwuMva0BLy2qJBVKqNtnUN9am5+PptnVwNdzdbk="; }) ]; }; From f181dbf64c99bfc0d964216fff507761496ae89a Mon Sep 17 00:00:00 2001 From: Kiskae Date: Wed, 14 Jun 2023 22:05:12 +0200 Subject: [PATCH 02/11] linuxPackages.nvidia_x11_production: 525.116.04 -> 535.54.03 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 73ba504b3bb0..e51585830b0f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -25,14 +25,12 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest; production = generic { - version = "525.116.04"; - sha256_64bit = "sha256-hhDsgkR8/3LLXxizZX7ppjSlFRZiuK2QHrgfTE+2F/4="; - sha256_aarch64 = "sha256-k7k22z5PYZdBVfuYXVcl9SFUMqZmK4qyxoRwlYyRdgU="; - openSha256 = "sha256-dktHCoESqoNfu5M73aY5MQGROlZawZwzBqs3RkOyfoQ="; - settingsSha256 = "sha256-qNjfsT9NGV151EHnG4fgBonVFSKc4yFEVomtXg9uYD4="; - persistencedSha256 = "sha256-ci86XGlno6DbHw6rkVSzBpopaapfJvk0+lHcR4LDq50="; - - ibtSupport = true; + version = "535.54.03"; + sha256_64bit = "sha256-RUdk9X6hueGRZqNw94vhDnHwYmQ4+xl/cm3DyvBbQII="; + sha256_aarch64 = "sha256-SUxW/Z8sJJ7bc/yhozTh8Wd2gKLsniJwKmXh1tJwUm8="; + openSha256 = "sha256-dp74UiiZfsQbZbAKHgFkLdRNyYbRlVMF3tIXcxok7FU"; + settingsSha256 = "sha256-5yIdOAaYQCQ2CmCayD/a5opoQppjK56s9cDqLmm17ww="; + persistencedSha256 = "sha256-R5WCh09BSPjfifui0ODkCsdIXTowceNjLDq5XHwda08="; }; latest = selectHighestVersion production (generic { From 67700c5d4645a3d8180f1e71e23f05a978c62c43 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Tue, 18 Jul 2023 17:53:23 +0200 Subject: [PATCH 03/11] linuxPackages.nvidia_x11_production: 535.54.03 -> 535.86.05 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index e51585830b0f..0ab8acb6419b 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -25,12 +25,12 @@ rec { stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest; production = generic { - version = "535.54.03"; - sha256_64bit = "sha256-RUdk9X6hueGRZqNw94vhDnHwYmQ4+xl/cm3DyvBbQII="; - sha256_aarch64 = "sha256-SUxW/Z8sJJ7bc/yhozTh8Wd2gKLsniJwKmXh1tJwUm8="; - openSha256 = "sha256-dp74UiiZfsQbZbAKHgFkLdRNyYbRlVMF3tIXcxok7FU"; - settingsSha256 = "sha256-5yIdOAaYQCQ2CmCayD/a5opoQppjK56s9cDqLmm17ww="; - persistencedSha256 = "sha256-R5WCh09BSPjfifui0ODkCsdIXTowceNjLDq5XHwda08="; + version = "535.86.05"; + sha256_64bit = "sha256-QH3wyjZjLr2Fj8YtpbixJP/DvM7VAzgXusnCcaI69ts="; + sha256_aarch64 = "sha256-ON++eWPDWHnm/NuJmDSYkR4sKKvCdX+kwxS7oA2M5zU="; + openSha256 = "sha256-qCYEQP54cT7G+VrLmuMT+RWIwuGdBhlbYTrCDcztfNs="; + settingsSha256 = "sha256-0NAxQosC+zPz5STpELuRKDMap4KudoPGWKL4QlFWjLQ="; + persistencedSha256 = "sha256-Ak4Wf59w9by08QJ0x15Zs5fHOhiIatiJfjBQfnY65Mg="; }; latest = selectHighestVersion production (generic { From c2b0548148e061346e44c9d5290811ebb96f1c79 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Thu, 15 Jun 2023 20:33:04 +0200 Subject: [PATCH 04/11] linuxPackages.nvidia_x11_vulkan_beta: 525.47.26 -> 525.47.27 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 0ab8acb6419b..2dc06a324540 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -63,11 +63,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "525.47.26"; + version = "525.47.27"; persistencedVersion = "525.116.04"; settingsVersion = "525.116.04"; - sha256_64bit = "sha256-QfxEUTi71Pav1qzO0mObmKbsyg6FHTAyc7jkOj9D4lY="; - openSha256 = "sha256-QFpFRPpBXAB7v2+NP/M/1T1qKDqjdhigHkktnVyWw20="; + sha256_64bit = "sha256-PEbaspVKTONl9W3M80RJfzPQwd6p231NTjcCXhB+MX4="; + openSha256 = "sha256-TyI77WGCL6JPVgx7SjdcTqwQ5neEqehrWo0QHKpAVrM="; settingsSha256 = "sha256-qNjfsT9NGV151EHnG4fgBonVFSKc4yFEVomtXg9uYD4="; persistencedSha256 = "sha256-ci86XGlno6DbHw6rkVSzBpopaapfJvk0+lHcR4LDq50="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; From 138c74de8f045fbf7739a5472ff33d43d0b0f3f1 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Tue, 11 Jul 2023 21:05:50 +0200 Subject: [PATCH 05/11] linuxPackages.nvidia_x11_vulkan_beta: 525.47.27 -> 525.47.31 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 2dc06a324540..55a47dd8ec50 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -63,11 +63,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "525.47.27"; + version = "525.47.31"; persistencedVersion = "525.116.04"; settingsVersion = "525.116.04"; - sha256_64bit = "sha256-PEbaspVKTONl9W3M80RJfzPQwd6p231NTjcCXhB+MX4="; - openSha256 = "sha256-TyI77WGCL6JPVgx7SjdcTqwQ5neEqehrWo0QHKpAVrM="; + sha256_64bit = "sha256-NA+n7MK3K4MMmR3IoVrvVeB48+9qCR3YvZTBMLpF1c0="; + openSha256 = "sha256-0ERYghSnkfSqRbkt2SxGTq+jwsvU140bdlDJtfwxiNA="; settingsSha256 = "sha256-qNjfsT9NGV151EHnG4fgBonVFSKc4yFEVomtXg9uYD4="; persistencedSha256 = "sha256-ci86XGlno6DbHw6rkVSzBpopaapfJvk0+lHcR4LDq50="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; From 0a034dec63eeffd34e852fc6d7d977eefed3c755 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Mon, 24 Jul 2023 20:44:06 +0200 Subject: [PATCH 06/11] linuxPackages.nvidia_x11_vulkan_beta: 525.47.31 -> 525.47.34 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 55a47dd8ec50..5f324c2e33ca 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -63,11 +63,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "525.47.31"; + version = "525.47.34"; persistencedVersion = "525.116.04"; settingsVersion = "525.116.04"; - sha256_64bit = "sha256-NA+n7MK3K4MMmR3IoVrvVeB48+9qCR3YvZTBMLpF1c0="; - openSha256 = "sha256-0ERYghSnkfSqRbkt2SxGTq+jwsvU140bdlDJtfwxiNA="; + sha256_64bit = "sha256-/QJmOZtzS7mnjWupz1RwVeqDAiqx4nw4xPp6mEGUHlk="; + openSha256 = "sha256-bQ7qW9KOPAxccbBfQs7s+UX4TrIW/eI4CvjIMlLekfo="; settingsSha256 = "sha256-qNjfsT9NGV151EHnG4fgBonVFSKc4yFEVomtXg9uYD4="; persistencedSha256 = "sha256-ci86XGlno6DbHw6rkVSzBpopaapfJvk0+lHcR4LDq50="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; From 9d783cedc2ecb6bb6baddad28a732b03f48f488e Mon Sep 17 00:00:00 2001 From: Kiskae Date: Mon, 5 Jun 2023 19:49:17 +0200 Subject: [PATCH 07/11] linuxPackages.nvidia_x11_beta: fix optix denoiser OptiX tries loading `$ORIGIN/nvoptix.bin` before `/usr/share/nvidia/nvoptix.bin`. Additionally OptiX isn't supported for 32-bit. --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 2ca74fb5f058..2b0f55c03879 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -126,6 +126,12 @@ installPhase() { fi done + + # OptiX tries loading `$ORIGIN/nvoptix.bin` first + if [ -e nvoptix.bin ]; then + install -Dm444 -t $out/lib/ nvoptix.bin + fi + if [ -n "$bin" ]; then # Install the X drivers. mkdir -p $bin/lib/xorg/modules From 0dcaf834d13b46de29cf180141330dc05df0ead6 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Tue, 30 May 2023 19:40:40 +0200 Subject: [PATCH 08/11] linuxPackages.nvidia_x11_beta: 530.41.03 -> 535.43.02 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 5f324c2e33ca..8825c5f39b3e 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -52,12 +52,12 @@ rec { }); beta = selectHighestVersion latest (generic { - version = "530.30.02"; - sha256_64bit = "sha256-R/3bvXoiumYZI9vObn9R7sVN9oBQxAbMBJDDv77eeWM="; - sha256_aarch64 = "sha256-/b5Jdow+O7ExXjtXTzDX38qgmBDUYDUl+5zxXvbi1ts="; - openSha256 = "sha256-LCtTyuJ8s8isTBt9HetItLqSjL1GOn0tPUarjuxHpMk="; - settingsSha256 = "sha256-6mynLNSaWeiB52HdwZ0EQNyPg+tuat0oEqpZGSb2yQo="; - persistencedSha256 = "sha256-h6iq0iD9F41a7s6jWKPTI+oVzgDRIr1Kk97LNH9rg7E="; + version = "535.43.02"; + sha256_64bit = "sha256-4KTdk4kGDmBGyHntMIzWRivUpEpzmra+p7RBsTL8mYM="; + sha256_aarch64 = "sha256-0blD8R+xpOVlitWefIbtw1d3KAnmWHBy7hkxGZHBrE4="; + openSha256 = "sha256-W1fwbbEEM7Z/S3J0djxGTtVTewbSALqX1G1OSpdajCM="; + settingsSha256 = "sha256-j0sSEbtF2fapv4GSthVTkmJga+ycmrGc1OnGpV6jEkc="; + persistencedSha256 = "sha256-M0ovNaJo8SZwLW4CQz9accNK79Z5JtTJ9kKwOzicRZ4="; }); # Vulkan developer beta driver From 27db9ee2cc433007c25043e1a7eb6d53936e78e8 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Tue, 30 May 2023 20:14:57 +0200 Subject: [PATCH 09/11] linuxPackages.nvidia_x11_beta: add new dependency new `libnvidia-pkcs11*` libraries depend on openssl, used by cuda --- pkgs/os-specific/linux/nvidia-x11/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 6455010d9887..2571812b9645 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -50,7 +50,7 @@ let libPathFor = pkgs: lib.makeLibraryPath (with pkgs; [ libdrm xorg.libXext xorg.libX11 xorg.libXv xorg.libXrandr xorg.libxcb zlib stdenv.cc.cc - wayland mesa libGL + wayland mesa libGL openssl ]); self = stdenv.mkDerivation { From 96f7a7468d768ff3b459ec567514666ce2480960 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Tue, 30 May 2023 20:22:39 +0200 Subject: [PATCH 10/11] linuxPackages.nvidia_x11_beta: install nvoptix.bin --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 2b0f55c03879..b2bdef37a983 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -124,6 +124,10 @@ installPhase() { if [ -e nvngx.dll ] && [ -e _nvngx.dll ]; then install -Dm644 -t $i/lib/nvidia/wine/ nvngx.dll _nvngx.dll fi + + if [ -e nvoptix.bin ]; then + install -Dm444 -t $i/share/nvidia/ nvoptix.bin + fi done From c25b1ea037d6c83a9a26368f718735df5e11c475 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Mon, 5 Jun 2023 19:49:17 +0200 Subject: [PATCH 11/11] linuxPackages.nvidia_x11_beta: fix optix denoiser OptiX tries loading `$ORIGIN/nvoptix.bin` before `/usr/share/nvidia/nvoptix.bin`. Additionally OptiX isn't supported for 32-bit. --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index b2bdef37a983..2b0f55c03879 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -124,10 +124,6 @@ installPhase() { if [ -e nvngx.dll ] && [ -e _nvngx.dll ]; then install -Dm644 -t $i/lib/nvidia/wine/ nvngx.dll _nvngx.dll fi - - if [ -e nvoptix.bin ]; then - install -Dm444 -t $i/share/nvidia/ nvoptix.bin - fi done