Unverified Commit f1f16f3a authored by Samuel Ainsworth's avatar Samuel Ainsworth Committed by GitHub
Browse files

Merge pull request #185316 from NixOS/revert-179912-dg/cudatoolkit_11_7_0 

Revert "cudatoolkit_11_7: init at 11.7.0"
parents 4949fcec 90c50579

pkgs/development/compilers/cudatoolkit/redist/extension.nix

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ final: prev: let 
    "11.4" = ./manifests/redistrib_11.4.4.json;

    "11.5" = ./manifests/redistrib_11.5.2.json;

    "11.6" = ./manifests/redistrib_11.6.2.json;

    "11.7" = ./manifests/redistrib_11.7.0.json;

  };



  # Function to build a single cudatoolkit redist package

pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_11.7.0.json

deleted100644 → 0
+0 −879

File deleted.

Preview size limit exceeded, changes collapsed.

pkgs/development/compilers/cudatoolkit/redist/overrides.nix

+2 −6
Original line number Diff line number Diff line
@@ -37,12 +37,8 @@ in (lib.filterAttrs (attr: _: (prev ? "${attr}")) { 
  ];



  nsight_compute = prev.nsight_compute.overrideAttrs (oldAttrs: {

    nativeBuildInputs = oldAttrs.nativeBuildInputs

      ++ lib.optionals (lib.versionOlder   prev.nsight_compute.version "2022.2.0") [ pkgs.qt5.wrapQtAppsHook ]

      ++ lib.optionals (lib.versionAtLeast prev.nsight_compute.version "2022.2.0") [ pkgs.qt6.wrapQtAppsHook ];

      buildInputs = oldAttrs.buildInputs

      ++ lib.optionals (lib.versionOlder   prev.nsight_compute.version "2022.2.0") [ pkgs.qt5.qtwebview ]

      ++ lib.optionals (lib.versionAtLeast prev.nsight_compute.version "2022.2.0") [ pkgs.qt6.qtwebview ];

    nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ pkgs.qt5.wrapQtAppsHook ];

    buildInputs = oldAttrs.buildInputs ++ [ pkgs.libsForQt5.qt5.qtwebview ];

  });



  nsight_systems = prev.nsight_systems.overrideAttrs (oldAttrs: {

pkgs/development/compilers/cudatoolkit/versions.toml

+0 −6
Original line number Diff line number Diff line
@@ -59,9 +59,3 @@ version = "11.6.1" 
url = "https://developer.download.nvidia.com/compute/cuda/11.6.1/local_installers/cuda_11.6.1_510.47.03_linux.run"

sha256 = "sha256-qyGa/OALdCABEyaYZvv/derQN7z8I1UagzjCaEyYTX4="

gcc = "gcc11"
 


["11.7"]

version = "11.7.0"

url = "https://developer.download.nvidia.com/compute/cuda/11.7.0/local_installers/cuda_11.7.0_515.43.04_linux.run"

sha256 = "sha256-CH/fy7ofeVQ7H3jkOo39rF9tskLQQt3oIOFtwYWJLyY="

gcc = "gcc11"

pkgs/development/libraries/science/math/cudnn/extension.nix

+1 −18
Original line number Diff line number Diff line
@@ -94,23 +94,7 @@ final: prev: let 
        fullVersion = "8.3.2.44";

        hash = "sha256-VQCVPAjF5dHd3P2iNPnvvdzb5DpTsm3AqCxyP6FwxFc=";

        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz";

        supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.4" "11.5" "11.6" "11.7" ];

      }

    ];

    "8.4.0" = [

      rec {

        fileVersion = "10.2";

        fullVersion = "8.4.0.27";

        hash = "sha256-FMXjykJYJxmW0f2VnELRfFgs5Nmv9FH4RSRGnnhP0VQ=";

        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz";

        supportedCudaVersions = [ "10.2" ];

      }

      rec {

        fileVersion = "11.6";

        fullVersion = "8.4.0.27";

        hash = "sha256-0Zva/ZgAx50p5vb/+p+eLBDREy1sL/ELFZPgV+dN0FA=";

        url = "${urlPrefix}/v${majorMinorPatch fullVersion}/local_installers/${fileVersion}/cudnn-linux-x86_64-${fullVersion}_cuda${fileVersion}-archive.tar.xz";

        supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.4" "11.5" "11.6" "11.7" ];

        supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.4" "11.5" "11.6" ];

      }

    ];

  };
@@ -127,7 +111,6 @@ final: prev: let 
    "11.4" = "8.3.2";

    "11.5" = "8.3.2";

    "11.6" = "8.3.2";

    "11.7" = "8.4.0";

  }.${cudaVersion};



in cuDnnPackages