diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-02-15 22:28:32 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-02-15 22:29:47 +0100 |
commit | 2ba9ae0129e84cfc6e34bb2a6bda0cbc3c40bc37 (patch) | |
tree | 67e629b31c73914fee90f04602450ec1f8d24c4e /pkgs/development | |
parent | 33fa065f176dbff99477811b9417564d5d549756 (diff) |
Fix bad licenses on CUDA packages
They were marked as "nonfree" rather than "unfree", causing them to be allowed with allowUnfree = false.
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/cudatoolkit/5.5.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/cudatoolkit/6.0.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/nvidia-cg-toolkit/default.nix | 14 |
3 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/development/compilers/cudatoolkit/5.5.nix b/pkgs/development/compilers/cudatoolkit/5.5.nix index e1d8ab13a513c..aea58867a4471 100644 --- a/pkgs/development/compilers/cudatoolkit/5.5.nix +++ b/pkgs/development/compilers/cudatoolkit/5.5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib +{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib , xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib } : @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = { - license = [ "nonfree" ]; + license = lib.licenses.unfree; }; } diff --git a/pkgs/development/compilers/cudatoolkit/6.0.nix b/pkgs/development/compilers/cudatoolkit/6.0.nix index f8b4506ee4262..558034721efe3 100644 --- a/pkgs/development/compilers/cudatoolkit/6.0.nix +++ b/pkgs/development/compilers/cudatoolkit/6.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib +{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib , xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib } : @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = { - license = [ "nonfree" ]; + license = lib.licenses.unfree; }; } diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix index 68b4a22220e69..9c6d07c4681e9 100644 --- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix +++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, patchelf }: +{ lib, stdenv, fetchurl, patchelf }: assert stdenv ? glibc; stdenv.mkDerivation rec { version = "3.1"; - + date = "April2012"; - + name = "nvidia-cg-toolkit-${version}"; - + src = if stdenv.system == "x86_64-linux" then fetchurl { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "cef3591e436f528852db0e8c145d3842f920e0c89bcfb219c466797cb7b18879"; } else throw "nvidia-cg-toolkit does not support platform ${stdenv.system}"; - + installPhase = '' for b in cgc cgfxcat cginfo do @@ -38,9 +38,9 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/doc/$name/" cp -v -r local/Cg/* "$out/share/doc/$name/" ''; - + meta = { homepage = http://developer.nvidia.com/cg-toolkit; - license = [ "nonfree-redistributable" ]; + license = lib.licenses.unfreeRedistributable; }; } |