From 0f414caa8f7a943b53c01cbf676d9ac23c2cbdc1 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Tue, 7 Nov 2023 19:55:19 +0000 Subject: cudaPackages.cuda-samples: use finalAttrs instead of rec --- pkgs/test/cuda/cuda-samples/generic.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/test') diff --git a/pkgs/test/cuda/cuda-samples/generic.nix b/pkgs/test/cuda/cuda-samples/generic.nix index 267eca10d8e88..1d7c2cf22ce91 100644 --- a/pkgs/test/cuda/cuda-samples/generic.nix +++ b/pkgs/test/cuda/cuda-samples/generic.nix @@ -9,14 +9,14 @@ , glfw3 , freeimage }: -cudaPackages.backendStdenv.mkDerivation rec { +cudaPackages.backendStdenv.mkDerivation (finalAttrs: { pname = "cuda-samples"; version = lib.versions.majorMinor cudatoolkit.version; src = fetchFromGitHub { owner = "NVIDIA"; - repo = pname; - rev = "v${version}"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; inherit sha256; }; @@ -25,7 +25,7 @@ cudaPackages.backendStdenv.mkDerivation rec { buildInputs = [ cudatoolkit ]; # See https://github.com/NVIDIA/cuda-samples/issues/75. - patches = lib.optionals (version == "11.3") [ + patches = lib.optionals (finalAttrs.version == "11.3") [ (fetchpatch { url = "https://github.com/NVIDIA/cuda-samples/commit/5c3ec60faeb7a3c4ad9372c99114d7bb922fda8d.patch"; sha256 = "sha256-0XxdmNK9MPpHwv8+qECJTvXGlFxc+fIbta4ynYprfpU="; @@ -58,4 +58,4 @@ cudaPackages.backendStdenv.mkDerivation rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ obsidian-systems-maintenance ]; }; -} +}) -- cgit 1.4.1 From 25fa662d3eef2c89fce6e072dba9bc17867c06c4 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Tue, 7 Nov 2023 19:55:50 +0000 Subject: cudaPackages.cuda-samples: add CUDA team as maintainers --- pkgs/test/cuda/cuda-samples/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/test') diff --git a/pkgs/test/cuda/cuda-samples/generic.nix b/pkgs/test/cuda/cuda-samples/generic.nix index 1d7c2cf22ce91..ed839da54da38 100644 --- a/pkgs/test/cuda/cuda-samples/generic.nix +++ b/pkgs/test/cuda/cuda-samples/generic.nix @@ -56,6 +56,6 @@ cudaPackages.backendStdenv.mkDerivation (finalAttrs: { description = "Samples for CUDA Developers which demonstrates features in CUDA Toolkit"; # CUDA itself is proprietary, but these sample apps are not. license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ obsidian-systems-maintenance ]; + maintainers = with lib.maintainers; [ obsidian-systems-maintenance ] ++ lib.teams.cuda.members; }; }) -- cgit 1.4.1 From 4eae7523f08dfe967bf9bf319dba97f21f62c3b2 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Tue, 7 Nov 2023 19:56:47 +0000 Subject: cudaPackages.cuda-samples: switch to autoAddOpenGLRunpathHook from manual addOpenGLRunpath --- pkgs/test/cuda/cuda-samples/generic.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'pkgs/test') diff --git a/pkgs/test/cuda/cuda-samples/generic.nix b/pkgs/test/cuda/cuda-samples/generic.nix index ed839da54da38..e57be1723436e 100644 --- a/pkgs/test/cuda/cuda-samples/generic.nix +++ b/pkgs/test/cuda/cuda-samples/generic.nix @@ -2,7 +2,7 @@ , cudaPackages , fetchFromGitHub , fetchpatch -, addOpenGLRunpath +, autoAddOpenGLRunpathHook , cudatoolkit , pkg-config , sha256 @@ -20,7 +20,7 @@ cudaPackages.backendStdenv.mkDerivation (finalAttrs: { inherit sha256; }; - nativeBuildInputs = [ pkg-config addOpenGLRunpath glfw3 freeimage ]; + nativeBuildInputs = [ pkg-config autoAddOpenGLRunpathHook glfw3 freeimage ]; buildInputs = [ cudatoolkit ]; @@ -46,12 +46,6 @@ cudaPackages.backendStdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - postFixup = '' - for exe in $out/bin/*; do - addOpenGLRunpath $exe - done - ''; - meta = { description = "Samples for CUDA Developers which demonstrates features in CUDA Toolkit"; # CUDA itself is proprietary, but these sample apps are not. -- cgit 1.4.1 From 3543eaf4ff58a879fffa7c273ca502964f7c4733 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Tue, 7 Nov 2023 19:59:11 +0000 Subject: cudaPackages.cuda-samples: use packages from cudaPackages scope; not top-level --- pkgs/test/cuda/cuda-samples/generic.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs/test') diff --git a/pkgs/test/cuda/cuda-samples/generic.nix b/pkgs/test/cuda/cuda-samples/generic.nix index e57be1723436e..94d96fc4f1aa6 100644 --- a/pkgs/test/cuda/cuda-samples/generic.nix +++ b/pkgs/test/cuda/cuda-samples/generic.nix @@ -1,17 +1,18 @@ { lib -, cudaPackages +, backendStdenv , fetchFromGitHub , fetchpatch , autoAddOpenGLRunpathHook , cudatoolkit +, cudaVersion , pkg-config , sha256 , glfw3 , freeimage }: -cudaPackages.backendStdenv.mkDerivation (finalAttrs: { +backendStdenv.mkDerivation (finalAttrs: { pname = "cuda-samples"; - version = lib.versions.majorMinor cudatoolkit.version; + version = cudaVersion; src = fetchFromGitHub { owner = "NVIDIA"; @@ -41,7 +42,7 @@ cudaPackages.backendStdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -Dm755 -t $out/bin bin/${cudaPackages.backendStdenv.hostPlatform.parsed.cpu.name}/${cudaPackages.backendStdenv.hostPlatform.parsed.kernel.name}/release/* + install -Dm755 -t $out/bin bin/${backendStdenv.hostPlatform.parsed.cpu.name}/${backendStdenv.hostPlatform.parsed.kernel.name}/release/* runHook postInstall ''; -- cgit 1.4.1 From 98d0da512af284f3181c7610df8cef8f98ea847f Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Tue, 7 Nov 2023 20:02:57 +0000 Subject: cudaPackages_12_1.cuda-samples: init at 12.1 --- pkgs/test/cuda/cuda-samples/extension.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/test') diff --git a/pkgs/test/cuda/cuda-samples/extension.nix b/pkgs/test/cuda/cuda-samples/extension.nix index 05861ee5e0eb6..1878f3e0d7331 100644 --- a/pkgs/test/cuda/cuda-samples/extension.nix +++ b/pkgs/test/cuda/cuda-samples/extension.nix @@ -14,6 +14,7 @@ final: prev: let "11.7" = throw "The tag 11.7 of cuda-samples does not exist"; "11.8" = "sha256-7+1P8+wqTKUGbCUBXGMDO9PkxYr2+PLDx9W2hXtXbuc="; "12.0" = "sha256-Lj2kbdVFrJo5xPYPMiE4BS7Z8gpU5JLKXVJhZABUe/g="; + "12.1" = "sha256-xE0luOMq46zVsIEWwK4xjLs7NorcTIi9gbfZPVjIlqo="; }.${prev.cudaVersion}; in { -- cgit 1.4.1 From 3441e3d32eab0e50a4fd3ea1bc7cb8a0190f21dc Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Tue, 7 Nov 2023 20:03:14 +0000 Subject: cudaPackages_12_2.cuda-samples: init at 12.2 --- pkgs/test/cuda/cuda-samples/extension.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/test') diff --git a/pkgs/test/cuda/cuda-samples/extension.nix b/pkgs/test/cuda/cuda-samples/extension.nix index 1878f3e0d7331..6dace2085b415 100644 --- a/pkgs/test/cuda/cuda-samples/extension.nix +++ b/pkgs/test/cuda/cuda-samples/extension.nix @@ -15,6 +15,7 @@ final: prev: let "11.8" = "sha256-7+1P8+wqTKUGbCUBXGMDO9PkxYr2+PLDx9W2hXtXbuc="; "12.0" = "sha256-Lj2kbdVFrJo5xPYPMiE4BS7Z8gpU5JLKXVJhZABUe/g="; "12.1" = "sha256-xE0luOMq46zVsIEWwK4xjLs7NorcTIi9gbfZPVjIlqo="; + "12.2" = "sha256-pOy0qfDjA/Nr0T9PNKKefK/63gQnJV2MQsN2g3S2yng="; }.${prev.cudaVersion}; in { -- cgit 1.4.1 From 30be50b0809c93314b41f448dbdb8400502be54b Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Tue, 7 Nov 2023 20:17:01 +0000 Subject: cudaPackages.cuda-samples: don't list package for unsupported CUDA version --- pkgs/test/cuda/cuda-samples/extension.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/test') diff --git a/pkgs/test/cuda/cuda-samples/extension.nix b/pkgs/test/cuda/cuda-samples/extension.nix index 6dace2085b415..664349416b713 100644 --- a/pkgs/test/cuda/cuda-samples/extension.nix +++ b/pkgs/test/cuda/cuda-samples/extension.nix @@ -11,15 +11,15 @@ final: prev: let "11.4" = "082dkk5y34wyvjgj2p5j1d00rk8xaxb9z0mhvz16bd469r1bw2qk"; "11.5" = "sha256-AKRZbke0K59lakhTi8dX2cR2aBuWPZkiQxyKaZTvHrI="; "11.6" = "sha256-AsLNmAplfuQbXg9zt09tXAuFJ524EtTYsQuUlV1tPkE="; - "11.7" = throw "The tag 11.7 of cuda-samples does not exist"; + # The tag 11.7 of cuda-samples does not exist "11.8" = "sha256-7+1P8+wqTKUGbCUBXGMDO9PkxYr2+PLDx9W2hXtXbuc="; "12.0" = "sha256-Lj2kbdVFrJo5xPYPMiE4BS7Z8gpU5JLKXVJhZABUe/g="; "12.1" = "sha256-xE0luOMq46zVsIEWwK4xjLs7NorcTIi9gbfZPVjIlqo="; "12.2" = "sha256-pOy0qfDjA/Nr0T9PNKKefK/63gQnJV2MQsN2g3S2yng="; - }.${prev.cudaVersion}; + }; -in { +in prev.lib.attrsets.optionalAttrs (builtins.hasAttr prev.cudaVersion sha256) { cuda-samples = final.callPackage ./generic.nix { - inherit sha256; + sha256 = sha256.${prev.cudaVersion}; }; } -- cgit 1.4.1 From b807a32c2cb972b1f19c3282116b71ab43dd32f4 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Tue, 7 Nov 2023 20:22:58 +0000 Subject: cudaPackages.cuda-samples: fix CMake build error on 12.2+ --- pkgs/test/cuda/cuda-samples/generic.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'pkgs/test') diff --git a/pkgs/test/cuda/cuda-samples/generic.nix b/pkgs/test/cuda/cuda-samples/generic.nix index 94d96fc4f1aa6..e88d7b0c31591 100644 --- a/pkgs/test/cuda/cuda-samples/generic.nix +++ b/pkgs/test/cuda/cuda-samples/generic.nix @@ -1,5 +1,6 @@ { lib , backendStdenv +, cmake , fetchFromGitHub , fetchpatch , autoAddOpenGLRunpathHook @@ -21,7 +22,20 @@ backendStdenv.mkDerivation (finalAttrs: { inherit sha256; }; - nativeBuildInputs = [ pkg-config autoAddOpenGLRunpathHook glfw3 freeimage ]; + nativeBuildInputs = [ + pkg-config + autoAddOpenGLRunpathHook + glfw3 + freeimage + ] + # CMake has to run as a native, build-time dependency for libNVVM samples. + ++ lib.lists.optionals (lib.strings.versionAtLeast finalAttrs.version "12.2") [ + cmake + ]; + + # CMake is not the primary build tool -- that's still make. + # As such, we disable CMake's build system. + dontUseCmakeConfigure = true; buildInputs = [ cudatoolkit ]; -- cgit 1.4.1 From 83d5298d37fd77d812787950f0e16a16b5ecf1bb Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Thu, 9 Nov 2023 14:48:17 +0000 Subject: cudaPackages.cuda-samples: alphabetize arguments --- pkgs/test/cuda/cuda-samples/generic.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs/test') diff --git a/pkgs/test/cuda/cuda-samples/generic.nix b/pkgs/test/cuda/cuda-samples/generic.nix index e88d7b0c31591..e690f32959f2a 100644 --- a/pkgs/test/cuda/cuda-samples/generic.nix +++ b/pkgs/test/cuda/cuda-samples/generic.nix @@ -1,15 +1,15 @@ -{ lib +{ autoAddOpenGLRunpathHook , backendStdenv , cmake -, fetchFromGitHub -, fetchpatch -, autoAddOpenGLRunpathHook , cudatoolkit , cudaVersion +, fetchFromGitHub +, fetchpatch +, freeimage +, glfw3 +, lib , pkg-config , sha256 -, glfw3 -, freeimage }: backendStdenv.mkDerivation (finalAttrs: { pname = "cuda-samples"; -- cgit 1.4.1