Turn more licenses into lib.licenses style

Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739

78 files changed, 131 insertions, 148 deletions

diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix
index 55f64234a32e..c3a960388bb4 100644
--- a/pkgs/development/compilers/cmucl/binary.nix
+++ b/pkgs/development/compilers/cmucl/binary.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
       which runs on most major Unix platforms.  It mainly conforms to the
       ANSI Common Lisp standard.
     '';
-    license = "free";		# public domain
+    license = stdenv.lib.licenses.free;		# public domain
     homepage = http://www.cons.org/cmucl/;
   };
 }
diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix
index 3eb9aef528c0..a8180947f4a0 100644
--- a/pkgs/development/compilers/emscripten-fastcomp/default.nix
+++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix
@@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/kripken/emscripten-fastcomp;
     description = "emscripten llvm";
     maintainers = with maintainers; [ bosu ];
-    license = "University of Illinois/NCSA Open Source License";
+    license = stdenv.lib.licenses.ncsa;
   };
 }
diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix
index 09245ba6d4bd..973a07b1295f 100644
--- a/pkgs/development/compilers/iasl/default.nix
+++ b/pkgs/development/compilers/iasl/default.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation {
   meta = {
     description = "Intel ACPI Compiler";
     homepage = http://www.acpica.org/;
-    license = "iasl"; # FIXME: is this a free software license?
+    license = stdenv.lib.licenses.iasl;
   };
 }
diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix
index 1b9e9118d56f..e098f48a24ce 100644
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@@ -56,6 +56,6 @@ stdenv.mkDerivation rec {
     description = "Cross platform, open source .NET development framework";
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice ];
-    license = "free"; # Combination of LGPL/X11/GPL ?
+    license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ?
   };
 }
diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix
index 1d68585d93a1..69a6a1f5f676 100644
--- a/pkgs/development/compilers/ocaml/3.10.0.nix
+++ b/pkgs/development/compilers/ocaml/3.10.0.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, x11, ncurses }:
 
 stdenv.mkDerivation (rec {
-  
+
   name = "ocaml-3.10.0";
-  
+
   src = fetchurl {
     url = "http://caml.inria.fr/pub/distrib/ocaml-3.10/${name}.tar.bz2";
     sha256 = "1ihmx1civ78s7k2hfc05z1s9vbyx2qw7fg8lnbxnfd6zxkk8878d";
@@ -13,7 +13,7 @@ stdenv.mkDerivation (rec {
   configureFlags = ["-no-tk" "-x11lib" x11];
   buildFlags = "world bootstrap world.opt";
   buildInputs = [x11 ncurses];
-  installTargets = "install installopt"; 
+  installTargets = "install installopt";
   patchPhase = ''
     CAT=$(type -tp cat)
     sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
@@ -25,7 +25,7 @@ stdenv.mkDerivation (rec {
 
   meta = {
     homepage = http://caml.inria.fr/ocaml;
-    license = "QPL, LGPL2 (library part)";
+    license = with stdenv.lib.licenses; [ qpl lgpl2 ];
     description = "Most popular variant of the Caml language";
   };
 
diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
index 4313dcd7537e..9b340f69e90b 100644
--- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
+++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, x11, ncurses }:
 
 stdenv.mkDerivation (rec {
-  
+
   name = "metaocaml-3.09-alpha-30";
-  
+
   src = fetchurl {
     url = "http://www.metaocaml.org/dist/old/MetaOCaml_309_alpha_030.tar.gz";
     sha256 = "0migbn0zwfb7yb24dy7qfqi19sv3drqcv4369xi7xzpds2cs35fd";
@@ -13,7 +13,7 @@ stdenv.mkDerivation (rec {
   configureFlags = ["-no-tk" "-x11lib" x11];
   buildFlags = "world bootstrap world.opt";
   buildInputs = [x11 ncurses];
-  installTargets = "install installopt"; 
+  installTargets = "install installopt";
   patchPhase = ''
     CAT=$(type -tp cat)
     sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
@@ -25,7 +25,7 @@ stdenv.mkDerivation (rec {
 
   meta = {
     homepage = http://www.metaocaml.org/;
-    license = "QPL, LGPL2 (library part)";
+    license = with stdenv.lib.licenses; [ qpl lgpl2 ];
     desctiption = "A compiled, type-safe, multi-stage programming language";
   };
 
diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix
index a29c0de65b87..dea7d3cd6e84 100644
--- a/pkgs/development/compilers/yap/default.nix
+++ b/pkgs/development/compilers/yap/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/";
     description = "Yap Prolog System is a ISO-compatible high-performance Prolog compiler";
-    license = "artistic";
+    license = stdenv.lib.licenses.artistic2;
 
     maintainers = [ stdenv.lib.maintainers.simons ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/eclipse/ecj/default.nix b/pkgs/development/eclipse/ecj/default.nix
index 0f52e879863e..19ec3a3a2fb5 100644
--- a/pkgs/development/eclipse/ecj/default.nix
+++ b/pkgs/development/eclipse/ecj/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.eclipse.org/jdt/core/index.php;
 
     # http://www.eclipse.org/legal/epl-v10.html (free software, copyleft)
-    license = "EPLv1.0";
+    license = stdenv.lib.licenses.epl10;
 
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index f70fb164623b..ab559aa9e659 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Ruby interpreter written in Java";
     homepage = http://jruby.org/;
-    license = "CPL-1.0 GPL-2 LGPL-2.1"; # one of those
+    license = with stdenv.lib.licenses; [ cpl10 gpl2 lgpl21 ];
   };
 }
diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix
index cec0d35bde52..2a8f7ca2c302 100644
--- a/pkgs/development/interpreters/kona/default.nix
+++ b/pkgs/development/interpreters/kona/default.nix
@@ -2,9 +2,9 @@ x@{builderDefsPackage
   , fetchgit
   , ...}:
 builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+(a :
+let
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
     ["fetchgit"];
 
   buildInputs = map (n: builtins.getAttr n x)
@@ -31,7 +31,7 @@ rec {
   prepareOut = a.fullDepEntry ''
     mkdir -p "$out/bin"
   '' ["minInit" "defEnsureDir"];
-      
+
   meta = {
     description = "An interpreter of K, APL-like programming language";
     maintainers = with a.lib.maintainers;
@@ -40,7 +40,7 @@ rec {
     ];
     platforms = with a.lib.platforms;
       linux;
-    license = "free-noncopyleft";
+    license = a.lib.licenses.free;
   };
   passthru = {
     updateInfo = {
@@ -48,4 +48,3 @@ rec {
     };
   };
 }) x
-
diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix
index 0edf5e608010..79363f189d02 100644
--- a/pkgs/development/interpreters/php/5.4.nix
+++ b/pkgs/development/interpreters/php/5.4.nix
@@ -185,12 +185,6 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
          php is build within this derivation in order to add the xdebug lines to the php.ini.
          So both Apache and command line php both use xdebug without having to configure anything.
          Xdebug could be put in its own derivation.
-      * /
-        meta = {
-                description = "debugging support for PHP";
-                homepage = http://xdebug.org;
-                license = "based on the PHP license - as is";
-                };
       */
     };
 
@@ -255,7 +249,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
   meta = {
     description = "An HTML-embedded scripting language";
     homepage = http://www.php.net/;
-    license = "PHP-3";
+    license = stdenv.lib.licenses.php301;
   };
 
   patches = [ ./fix-5.4.patch ];
diff --git a/pkgs/development/interpreters/ruby/ruby-1.8.7.nix b/pkgs/development/interpreters/ruby/ruby-1.8.7.nix
index 9b43368c6173..9f2945dfb768 100644
--- a/pkgs/development/interpreters/ruby/ruby-1.8.7.nix
+++ b/pkgs/development/interpreters/ruby/ruby-1.8.7.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    license = "Ruby";
+    license = stdenv.lib.licenses.ruby;
     homepage = "http://www.ruby-lang.org/en/";
     description = "The Ruby language";
   };
diff --git a/pkgs/development/interpreters/ruby/ruby-2.0.0.nix b/pkgs/development/interpreters/ruby/ruby-2.0.0.nix
index 4c3344f7672e..6e85d6c0330f 100644
--- a/pkgs/development/interpreters/ruby/ruby-2.0.0.nix
+++ b/pkgs/development/interpreters/ruby/ruby-2.0.0.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    license = "Ruby";
+    license = stdenv.lib.licenses.ruby;
     homepage = "http://www.ruby-lang.org/en/";
     description = "The Ruby language";
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.0.nix b/pkgs/development/interpreters/ruby/ruby-2.1.0.nix
index afe4cbef79d4..39884745635a 100644
--- a/pkgs/development/interpreters/ruby/ruby-2.1.0.nix
+++ b/pkgs/development/interpreters/ruby/ruby-2.1.0.nix
@@ -101,7 +101,7 @@ stdenv.