jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cudaPackages: bump default cudaPackages_11_7 -> cudaPackages_11_8 (#238622)

Browse Source 
* cudaPackages: bump default cudaPackages_11_7 -> cudaPackages_11_8

* Switched format of cudaPackages.backendStdenv

Co-authored-by: Samuel Ainsworth <skainsworth@gmail.com>

* Removed reference to gcc11Stdenv in cuda-samples

* corrected stdenv reference in cuda-samples

---------

Co-authored-by: nviets <nathan.viets@gmail.com>
Co-authored-by: Samuel Ainsworth <skainsworth@gmail.com>
This commit is contained in:
nviets 2023-06-20 13:12:54 -05:00 committed by GitHub
parent eafa1fd10d
commit 725e8ab49c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/test/cuda/cuda-samples/generic.nix
View File

@ -1,14 +1,15 @@
{ lib
, stdenv
, cudaPackages
, fetchFromGitHub
, fetchpatch
, addOpenGLRunpath
, cudatoolkit
, pkg-config
, sha256
, glfw3
, freeimage
}:
stdenv.mkDerivation rec {
cudaPackages.backendStdenv.mkDerivation rec {
pname = "cuda-samples";
version = lib.versions.majorMinor cudatoolkit.version;
@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
inherit sha256;
};
nativeBuildInputs = [ pkg-config addOpenGLRunpath ];
nativeBuildInputs = [ pkg-config addOpenGLRunpath glfw3 freeimage ];
buildInputs = [ cudatoolkit ];
@ -40,7 +41,7 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
install -Dm755 -t $out/bin bin/${stdenv.hostPlatform.parsed.cpu.name}/${stdenv.hostPlatform.parsed.kernel.name}/release/*
install -Dm755 -t $out/bin bin/${cudaPackages.backendStdenv.hostPlatform.parsed.cpu.name}/${cudaPackages.backendStdenv.hostPlatform.parsed.kernel.name}/release/*
runHook postInstall
'';

2
pkgs/top-level/all-packages.nix
View File

@ -6767,7 +6767,7 @@ with pkgs;
cudaPackages_11_6 = callPackage ./cuda-packages.nix { cudaVersion = "11.6"; };
cudaPackages_11_7 = callPackage ./cuda-packages.nix { cudaVersion = "11.7"; };
cudaPackages_11_8 = callPackage ./cuda-packages.nix { cudaVersion = "11.8"; };
cudaPackages_11 = cudaPackages_11_7;
cudaPackages_11 = cudaPackages_11_8;
cudaPackages_12_0 = callPackage ./cuda-packages.nix { cudaVersion = "12.0"; };
cudaPackages_12_1 = callPackage ./cuda-packages.nix { cudaVersion = "12.1"; };