Unverified Commit 725e8ab4 authored by nviets's avatar nviets Committed by GitHub
Browse files

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



* cudaPackages: bump default cudaPackages_11_7 -> cudaPackages_11_8

* Switched format of cudaPackages.backendStdenv

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

* Removed reference to gcc11Stdenv in cuda-samples

* corrected stdenv reference in cuda-samples

---------

Co-authored-by: default avatarnviets <nathan.viets@gmail.com>
Co-authored-by: default avatarSamuel Ainsworth <skainsworth@gmail.com>
parent eafa1fd1

pkgs/test/cuda/cuda-samples/generic.nix

+6 −5
Original line number Diff line number Diff line 
{ 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

  '';

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -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"; };