From eba8679bc50e6f1ca6175b1a92eef2b104317605 Mon Sep 17 00:00:00 2001
From: Luke Adams <luke4450@gmail.com>
Date: Tue, 17 Jul 2018 22:21:57 -0500
Subject: cudnn*_cudatoolkit*: use public NVIDIA mirror (#31551)

* cudnn*_cudatoolkit*: use NVIDIA mirror instead of requireFile

* cudnn_cudatoolkit7: update hash since public mirror is different
---
 pkgs/development/libraries/science/math/cudnn/default.nix |  7 ++++---
 pkgs/development/libraries/science/math/cudnn/generic.nix | 14 ++++----------
 2 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'pkgs/development')

diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix
index 1a98ecc874365..c89e9e4296cfd 100644
--- a/pkgs/development/libraries/science/math/cudnn/default.nix
+++ b/pkgs/development/libraries/science/math/cudnn/default.nix
@@ -9,10 +9,11 @@ in
 
 {
   cudnn_cudatoolkit_7 = generic rec {
-    version = "4.0";
+    # Old URL is v4 instead of v4.0 for some reason...
+    version = "4";
     cudatoolkit = cudatoolkit_7;
-    srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}-prod.tgz";
-    sha256 = "0zgr6qdbc29qw6sikhrh6diwwz7150rqc8a49f2qf37j2rvyyr2f";
+    srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v4.0-prod.tgz";
+    sha256 = "01a4v5j4v9n2xjqcc4m28c3m67qrvsx87npvy7zhx7w8smiif2fd";
   };
 
   cudnn_cudatoolkit_7_5 = generic rec {
diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix
index 51bda19cf1391..bb1258655b5bf 100644
--- a/pkgs/development/libraries/science/math/cudnn/generic.nix
+++ b/pkgs/development/libraries/science/math/cudnn/generic.nix
@@ -5,24 +5,18 @@
 
 { stdenv
 , lib
-, requireFile
 , cudatoolkit
+, fetchurl
 }:
 
 stdenv.mkDerivation rec {
   name = "cudatoolkit-${cudatoolkit.majorVersion}-cudnn-${version}";
 
   inherit version;
-
-  src = requireFile rec {
-    name = srcName;
+  src = fetchurl {
+    # URL from NVIDIA docker containers: https://gitlab.com/nvidia/cuda/blob/centos7/7.0/runtime/cudnn4/Dockerfile
+    url = "https://developer.download.nvidia.com/compute/redist/cudnn/v${version}/${srcName}";
     inherit sha256;
-    message = ''
-      This nix expression requires that ${name} is already part of the store.
-      Register yourself to NVIDIA Accelerated Computing Developer Program, retrieve the cuDNN library
-      at https://developer.nvidia.com/cudnn, and run the following command in the download directory:
-      nix-prefetch-url file://\$PWD/${name}
-    '';
   };
 
   installPhase = ''
-- 
cgit 1.4.1