From 75254979ac1e4b7ff031b4c31fc121824df83743 Mon Sep 17 00:00:00 2001 From: Tyler Benster Date: Mon, 23 Dec 2019 00:33:19 -0800 Subject: [PATCH] cudnn_cudatoolkit: add NVIDIA license --- lib/licenses.nix | 6 ------ .../development/libraries/science/math/cudnn/generic.nix | 9 +++++++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index e6005c3baef7..beb4be391080 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -883,12 +883,6 @@ in mkLicense lset) ({ free = false; }; - nvidiaCudnn = { - fullName = "cuDNN Supplement to Software License Agreement for NVIDIA Software Development Kits"; - url = "https://docs.nvidia.com/deeplearning/sdk/cudnn-sla/index.html#supplement"; - free = false; - }; - obsidian = { fullName = "Obsidian End User Agreement"; url = "https://obsidian.md/eula"; diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index b1e03e35df12..709974070e84 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -153,8 +153,13 @@ in description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; homepage = "https://developer.nvidia.com/cudnn"; sourceProvenance = with sourceTypes; [binaryNativeCode]; - # TODO: consider marking unfreRedistributable when not using runfile - license = licenses.unfree; + license = { + fullName = "cuDNN Supplement to Software License Agreement for NVIDIA Software Development Kits"; + url = "https://docs.nvidia.com/deeplearning/sdk/cudnn-sla/index.html#supplement"; + free = false; + } // lib.optionalAttrs (!useCudatoolkitRunfile) { + redistributable = true; + }; platforms = ["x86_64-linux"]; maintainers = with maintainers; [mdaiter samuela]; # Force the use of the default, fat output by default (even though `dev` exists, which