Merge pull request #115276 from dfoxfranke/master

nvidia-x11: 460.39 -> 460.56

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

@@ -28,10 +28,10 @@ rec {
   # Policy: use the highest stable version as the default (on our master).
   stable = if stdenv.hostPlatform.system == "x86_64-linux"
     then generic {
-      version = "460.39";
-      sha256_64bit = "0zx3v4xas9z18yv1z3irp626h8kvcg8aw344sqpacfh1g106dw0b";
-      settingsSha256 = "15fa6lmfmgg02gya47ynx5d7cqsb73w4rbg4ly7lc1pnwl5f9qhm";
-      persistencedSha256 = "1dj3w03fa1i32c9c7w9392bg3nr2dk8mm4qm0wv12cv587zml0gx";
+      version = "460.56";
+      sha256_64bit = "003kwlsghlix2kilrqad7mn7ygkb755rzjlxd0b52vqz1nx1qmsf";
+      settingsSha256 = "1xwhbd78q0bc3v8fnlss9amkl03vnvf91ffpfnz0v7clvn3xymkf";
+      persistencedSha256 = "0sh2csv04fkimf1msbmdc608gxb3j95g8i3rqf32b1pl9jv0p5ly";
     }
     else legacy_390;
 

pkgs/os-specific/linux/nvidia-x11/nvidia-setttings-parallel-build.patch

@@ -1,12 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index acbb1b8..fe97103 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -242,6 +242,7 @@ endif
- 
- define BINARY_DATA_HEADER_RULE
-   $$(OUTPUTDIR)/$(notdir $(1)).h:
-+	$(at_if_quiet)$(MKDIR) $$(OUTPUTDIR)
- 	$(at_if_quiet){ \
- 	  $$(PRINTF) "extern const char _binary_$(subst .,_,$(notdir $(1)))_start[];\n"; \
- 	  $$(PRINTF) "extern const char _binary_$(subst .,_,$(notdir $(1)))_end[];\n"; \

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

@@ -45,12 +45,6 @@ stdenv.mkDerivation {
   version = nvidia_x11.settingsVersion;
   inherit src;
 
-  patches = [
-    # Fix a race condition in parallel builds.
-    # https://github.com/NVIDIA/nvidia-settings/issues/59#issuecomment-770302032
-    ./nvidia-setttings-parallel-build.patch
-  ];
-
   nativeBuildInputs = [ pkg-config m4 ];
 
   buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 gtk2 dbus ]