MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix bad licenses on CUDA packages

Browse source 
They were marked as "nonfree" rather than "unfree", causing them to be
allowed with allowUnfree = false.
This commit is contained in:
Eelco Dolstra 2015-02-15 22:28:32 +01:00
parent 33fa065f17
commit 2ba9ae0129
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/compilers/cudatoolkit/5.5.nix
View file

@ -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 , xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib
} : } :
@ -57,6 +57,6 @@ stdenv.mkDerivation rec {
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
meta = { meta = {
license = [ "nonfree" ]; license = lib.licenses.unfree;
}; };
} }

4
pkgs/development/compilers/cudatoolkit/6.0.nix
View file

@ -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 , xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib
} : } :
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
meta = { meta = {
license = [ "nonfree" ]; license = lib.licenses.unfree;
}; };
} }

14
pkgs/development/compilers/nvidia-cg-toolkit/default.nix
View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl, patchelf }: { lib, stdenv, fetchurl, patchelf }:
assert stdenv ? glibc; assert stdenv ? glibc;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.1"; version = "3.1";
date = "April2012"; date = "April2012";
name = "nvidia-cg-toolkit-${version}"; name = "nvidia-cg-toolkit-${version}";
src = src =
if stdenv.system == "x86_64-linux" then if stdenv.system == "x86_64-linux" then
fetchurl { fetchurl {
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
sha256 = "cef3591e436f528852db0e8c145d3842f920e0c89bcfb219c466797cb7b18879"; sha256 = "cef3591e436f528852db0e8c145d3842f920e0c89bcfb219c466797cb7b18879";
} }
else throw "nvidia-cg-toolkit does not support platform ${stdenv.system}"; else throw "nvidia-cg-toolkit does not support platform ${stdenv.system}";
installPhase = '' installPhase = ''
for b in cgc cgfxcat cginfo for b in cgc cgfxcat cginfo
do do
@ -38,9 +38,9 @@ stdenv.mkDerivation rec {
mkdir -p "$out/share/doc/$name/" mkdir -p "$out/share/doc/$name/"
cp -v -r local/Cg/* "$out/share/doc/$name/" cp -v -r local/Cg/* "$out/share/doc/$name/"
''; '';
meta = { meta = {
homepage = http://developer.nvidia.com/cg-toolkit; homepage = http://developer.nvidia.com/cg-toolkit;
license = [ "nonfree-redistributable" ]; license = lib.licenses.unfreeRedistributable;
}; };
} }