summary refs log tree commit diff
diff options
context:
space:
mode:
authorJaka Hudoklin <jakahudoklin@gmail.com>2014-01-31 13:38:53 +0100
committerVladimír Čunát <vcunat@gmail.com>2014-01-31 18:39:21 +0100
commit2778c00bfe1b472c40400a0867e3dfbf0be27481 (patch)
treecece0276a9fb148474def6ac2d9e273e0de2b776
parentb913a2eb81b03250a370ecd4456cad2f290f3870 (diff)
downloadnixpkgs-2778c00bfe1b472c40400a0867e3dfbf0be27481.tar
nixpkgs-2778c00bfe1b472c40400a0867e3dfbf0be27481.tar.gz
nixpkgs-2778c00bfe1b472c40400a0867e3dfbf0be27481.tar.bz2
nixpkgs-2778c00bfe1b472c40400a0867e3dfbf0be27481.tar.lz
nixpkgs-2778c00bfe1b472c40400a0867e3dfbf0be27481.tar.xz
nixpkgs-2778c00bfe1b472c40400a0867e3dfbf0be27481.tar.zst
nixpkgs-2778c00bfe1b472c40400a0867e3dfbf0be27481.zip
amdadl-sdk: set license to unfree (close #1647)
We cannot auto build amdadl-sdk on hydra, so setting license to unfree disable
auto builds. I also remove amdadl license, because it's irrelevant.

vcunat changed string license to attribute.
-rw-r--r--lib/licenses.nix6
-rw-r--r--pkgs/development/misc/amdadl-sdk/default.nix2
2 files changed, 1 insertions, 7 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix
index b13a72f3f64..cda43583279 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -28,12 +28,6 @@
     url = "http://developer.amd.com/amd-license-agreement/";
   };
 
-  amdadl = {
-    shortName = "amd-adl";
-    fullName = "amd-adl license";
-    url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/licenses/AMD-ADL?revision=1.1";
-  };
-
   # Apple Public Source License 2.0;
   # http://opensource.org/licenses/APSL-2.0
   apsl20 = "APSL 2.0";
diff --git a/pkgs/development/misc/amdadl-sdk/default.nix b/pkgs/development/misc/amdadl-sdk/default.nix
index f131295bcba..6907a38d5a4 100644
--- a/pkgs/development/misc/amdadl-sdk/default.nix
+++ b/pkgs/development/misc/amdadl-sdk/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "API to access display driver functionality for ATI graphics cards";
     homepage = http://developer.amd.com/tools/graphics-development/display-library-adl-sdk/;
-    license = licenses.amdadl;
+    license = "unfree";
     maintainers = [ maintainers.offline ];
     platforms = stdenv.lib.platforms.linux;
     hydraPlatforms = [];