Merge pull request #240457 from Dessix/dev/dessix/update-cudatoolkit-12.2 (1bbdebb7) · Commits · nix / nixpkgs

pkgs/development/compilers/cudatoolkit/common.nix

+16 −10

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ args@
		, libsForQt5
		, libtiff
		, qt6Packages
		, qt6
		, rdma-core
		, ucx
		, rsync
		@@ -131,22 +132,23 @@ backendStdenv.mkDerivation rec {
		ucx
		xorg.libxshmfence
		xorg.libxkbfile
		] ++ lib.optionals (lib.versionAtLeast version "12.1") (map lib.getLib [
		] ++ (lib.optionals (lib.versionAtLeast version "12.1") (map lib.getLib ([
		# Used by `/target-linux-x64/CollectX/clx` and `/target-linux-x64/CollectX/libclx_api.so` for:
		# - `libcurl.so.4`
		curlMinimal

		# Used by `/target-linux-x64/libQt6Multimedia.so.6` for:
		# - `libgstaudio-1.0.so.0`
		# - `libgstvideo-1.0.so.0`
		# - `libgstpbutils-1.0.so.0`
		# - `libgstallocators-1.0.so.0`
		# - `libgstapp-1.0.so.0`
		# - `libgstbase-1.0.so.0`
		# - `libgstreamer-1.0.so.0`
		# Used by `/host-linux-x64/Scripts/WebRTCContainer/setup/neko/server/bin/neko`
		gst_all_1.gstreamer
		gst_all_1.gst-plugins-base
		]);
		]) ++ (with qt6; [
		qtmultimedia
		qttools
		qtpositioning
		qtscxml
		qtsvg
		qtwebchannel
		qtwebengine
		])));

		# Prepended to runpaths by autoPatchelf.
		# The order inherited from older rpath preFixup code
		@@ -258,6 +260,10 @@ backendStdenv.mkDerivation rec {
		rm -rf $out/lib
		''}

		${lib.optionalString (lib.versionAtLeast version "12.0") ''
		rm $out/host-linux-x64/libQt6*
		''}

		# Remove some cruft.
		${lib.optionalString ((lib.versionAtLeast version "7.0") && (lib.versionOlder version "10.1"))
		"rm $out/bin/uninstall*"}

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ final: prev: let
		"11.8" = ./manifests/redistrib_11.8.0.json;
		"12.0" = ./manifests/redistrib_12.0.1.json;
		"12.1" = ./manifests/redistrib_12.1.1.json;
		"12.2" = ./manifests/redistrib_12.2.0.json;
		};

		# Function to build a single cudatoolkit redist package

0 → 100644

+1151 −0

File added.

Preview size limit exceeded, changes collapsed.

+6 −0

Original line number	Diff line number	Diff line
		@@ -83,3 +83,9 @@ version = "12.1.1"
		url = "https://developer.download.nvidia.com/compute/cuda/12.1.1/local_installers/cuda_12.1.1_530.30.02_linux.run"
		sha256 = "sha256-10Ai1B2AEFMZ36Ib7qObd6W5kZU5wEh6BcqvJEbWpw4="
		gcc = "gcc12"

		["12.2"]
		version = "12.2.0"
		url = "https://developer.download.nvidia.com/compute/cuda/12.2.0/local_installers/cuda_12.2.0_535.54.03_linux.run"
		sha256 = "sha256-7PPSr63LrAKfD0UFeFgQ1S0AbkuHunn/P5hDNqK79Rg="
		gcc = "gcc12"

+1 −0

Original line number	Diff line number	Diff line
		@@ -6857,6 +6857,7 @@ with pkgs;

		cudaPackages_12_0 = callPackage ./cuda-packages.nix { cudaVersion = "12.0"; };
		cudaPackages_12_1 = callPackage ./cuda-packages.nix { cudaVersion = "12.1"; };
		cudaPackages_12_2 = callPackage ./cuda-packages.nix { cudaVersion = "12.2"; };
		cudaPackages_12 = cudaPackages_12_0;

		# TODO: try upgrading once there is a cuDNN release supporting CUDA 12. No