Update for CUDA/gcc changes

Author: danieldk

lib/torch-extension/arch.nix

@@ -10,6 +10,7 @@
   build2cmake,
   cmake,
   cmakeNvccThreadsHook,
+  cuda_nvcc,
   get-kernel-check,
   kernel-abi-check,
   ninja,
@@ -133,7 +134,7 @@ stdenv.mkDerivation (prevAttrs: {
   ]
   ++ lib.optionals cudaSupport [
     cmakeNvccThreadsHook
-    cudaPackages.cuda_nvcc
+    cuda_nvcc
   ]
   ++ lib.optionals rocmSupport [
     clr

lib/torch-extension/default.nix

@@ -6,6 +6,7 @@
   callPackage,
   stdenv,
   stdenvGlibc_2_27,
+  cudaPackages,
   rocmPackages,
   writeScriptBin,
   xpuPackages,
@@ -28,6 +29,12 @@ let
     }
   );
 
+  cuda_nvcc = cudaPackages.cuda_nvcc.override {
+    backendStdenv = cudaPackages.backendStdenv.override {
+      stdenv = effectiveStdenv;
+    };
+  };
+
   oneapi-torch-dev = xpuPackages.oneapi-torch-dev.override { stdenv = effectiveStdenv; };
   onednn-xpu = xpuPackages.onednn-xpu.override {
     inherit oneapi-torch-dev;
@@ -45,6 +52,7 @@ in
   mkExtension = callPackage ./arch.nix {
     inherit
       clr
+      cuda_nvcc
       oneapi-torch-dev
       onednn-xpu
       torch

pkgs/stdenv-glibc-2_27/default.nix

@@ -3,10 +3,9 @@
   cudaSupport ? config.cudaSupport,
   fetchFromGitHub,
   overrideCC,
-  system,
   wrapBintoolsWith,
   wrapCCWith,
-  gcc12Stdenv,
+  gcc13Stdenv,
   stdenv,
   bintools-unwrapped,
   cudaPackages,
@@ -19,7 +18,7 @@ let
     repo = "nixpkgs";
     rev = "a9eb3eed170fa916e0a8364e5227ee661af76fde";
     hash = "sha256-1ycrr9HMrGA3ZDM8qmKcZICBupE5UShnIIhPRWdvAzA=";
-  }) { inherit system; };
+  }) { inherit (stdenv.hostPlatform) system; };
 
   glibc_2_27 = nixpkgs_20191230.glibc.overrideAttrs (prevAttrs: {
     # Slight adjustments for compatibility with modern nixpkgs:
@@ -64,10 +63,9 @@ let
           bintools = bintools-unwrapped;
           libc = newGlibc;
         };
-        libcxx = cc.lib;
       };
     in
     overrideCC stdenv compilerWrapped;
 
 in
-stdenvWith glibc_2_27 (if cudaSupport then cudaPackages.backendStdenv else gcc12Stdenv).cc.cc stdenv
+stdenvWith glibc_2_27 (if cudaSupport then cudaPackages.backendStdenv else gcc13Stdenv).cc.cc stdenv

versions.nix

@@ -137,14 +137,14 @@
   }
 
   # Non-standard versions; not included in bundle builds.
-  {
-    torchVersion = "2.8";
-    cudaVersion = "12.4";
-    cxx11Abi = true;
-    systems = [
-      "x86_64-linux"
-      "aarch64-linux"
-    ];
-    sourceBuild = true;
-  }
+  #{
+  #  torchVersion = "2.8";
+  #  cudaVersion = "12.4";
+  #  cxx11Abi = true;
+  #  systems = [
+  #    "x86_64-linux"
+  #    "aarch64-linux"
+  #  ];
+  #  sourceBuild = true;
+  #}
 ]