Fix some "meta.licenses" attributes

pkgs/applications/networking/browsers/icecat-3/default.nix

@@ -105,7 +105,7 @@ stdenv.mkDerivation {
     '';
 
     homepage = http://www.gnu.org/software/gnuzilla/;
-    licenses = [ "GPLv2+" "LGPLv2+" "MPLv1+" ];
+    license = [ "GPLv2+" "LGPLv2+" "MPLv1+" ];
 
     maintainers = [ ];
     platforms = stdenv.lib.platforms.gnu;

pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A browser plugin to manage Swedish BankID:s";
     homepage = http://fribid.se;
-    licenses = [ "GPLv2" "MPLv1" ];
+    license = [ "GPLv2" "MPLv1" ];
     maintainers = [ stdenv.lib.maintainers.edwtjo ];
     platforms = with stdenv.lib.platforms; linux;
   };

pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix

@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A browser plugin that uses mplayer to play digital media from websites";
     homepage = http://mplayerplug-in.sourceforge.net/;
-    licenses = [ "GPLv2+" "LGPLv2+" "MPLv1+" ];
+    license = [ "GPLv2+" "LGPLv2+" "MPLv1+" ];
   };
 }

pkgs/development/compilers/ocaml/3.11.2.nix

@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://caml.inria.fr/ocaml;
-    licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
+    license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
     description = "Objective Caml, the most popular variant of the Caml language";
 
     longDescription =

pkgs/development/compilers/ocaml/3.12.1.nix

@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://caml.inria.fr/ocaml;
-    licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
+    license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
     description = "OCaml, the most popular variant of the Caml language";
 
     longDescription =

pkgs/development/compilers/ocaml/4.00.1.nix

@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://caml.inria.fr/ocaml;
-    licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
+    license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
     description = "OCaml, the most popular variant of the Caml language";
 
     longDescription =

pkgs/development/compilers/ocaml/4.01.0.nix

@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://caml.inria.fr/ocaml;
-    licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
+    license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
     description = "OCaml, the most popular variant of the Caml language";
 
     longDescription =

pkgs/development/compilers/ocaml/ber-metaocaml-003.nix

@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://okmij.org/ftp/ML/index.html#ber-metaocaml";
-    licenses = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
+    license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
     description = "a conservative extension of OCaml with the primitive type of code values, and three basic multi-stage expression forms: Brackets, Escape, and Run";
   };
 }

pkgs/development/libraries/cairo/default.nix

@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://cairographics.org/;
 
-    licenses = [ "LGPLv2+" "MPLv1" ];
+    license = [ "LGPLv2+" "MPLv1" ];
 
     platforms = stdenv.lib.platforms.all;
   };

pkgs/development/libraries/cairomm/default.nix

@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
 
     homepage = http://cairographics.org/;
 
-    licenses = [ "LGPLv2+" "MPLv1" ];
+    license = [ "LGPLv2+" "MPLv1" ];
   };
 }

pkgs/development/libraries/java/rhino/default.nix

@@ -52,6 +52,6 @@ stdenv.mkDerivation {
 
     homepage = http://www.mozilla.org/rhino/;
 
-    licenses = [ "MPLv1.1" /* or */ "GPLv2+" ];
+    license = [ "MPLv1.1" /* or */ "GPLv2+" ];
   };
 }

pkgs/development/libraries/sbc/default.nix

@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.bluez.org/;
 
-    licenses = stdenv.lib.licenses.gpl2;
+    license = stdenv.lib.licenses.gpl2;
   };
 }

pkgs/development/libraries/zziplib/default.nix

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       zip/unzip tools.
     '';
 
-    licenses = [ "LGPLv2+" "MPLv1.1" ];
+    license = [ "LGPLv2+" "MPLv1.1" ];
 
     homepage = http://zziplib.sourceforge.net/;
 

pkgs/development/ocaml-modules/menhir/default.nix

@@ -41,7 +41,7 @@ stdenv.mkDerivation {
       to OCaml code.  Menhir was designed and implemented by François Pottier
       and Yann Régis-Gianas.
     '';
-    licenses = [ "QPL" /* generator */ "LGPLv2" /* library */ ];
+    license = [ "QPL" /* generator */ "LGPLv2" /* library */ ];
     platforms = ocaml.meta.platforms;
     maintainers = [
       stdenv.lib.maintainers.z77z

pkgs/development/python-modules/setuptools/default.nix

@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Utilities to facilitate the installation of Python packages";
     homepage = http://pypi.python.org/pypi/setuptools;
-    licenses = [ "PSF" "ZPL" ];
+    license = [ "PSF" "ZPL" ];
     platforms = platforms.all;
   };    
 }

pkgs/development/tools/misc/autogen/default.nix

@@ -46,7 +46,7 @@ let version = "5.18"; in
         documentation of program options.
       '';
 
-      licenses = ["GPLv3+" "LGPLv3+" ];
+      license = ["GPLv3+" "LGPLv3+" ];
 
       homepage = http://www.gnu.org/software/autogen/;
 

pkgs/tools/compression/xz/default.nix

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
          bzip2.
       '';
 
-    licenses = [ "GPLv2+" "LGPLv2.1+" ];
+    license = [ "GPLv2+" "LGPLv2.1+" ];
     maintainers = with stdenv.lib.maintainers; [ sander ];
     platforms = stdenv.lib.platforms.all;
   };

pkgs/tools/networking/isync/default.nix

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://isync.sourceforge.net/;
     description = "Free IMAP and MailDir mailbox synchronizer";
-    licenses = [ "GPLv2+" ];
+    license = [ "GPLv2+" ];
 
     maintainers = [ stdenv.lib.maintainers.viric ];
     platforms = stdenv.lib.platforms.linux;

pkgs/tools/networking/maildrop/default.nix

@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.courier-mta.org/maildrop/;
     description = "Mail filter/mail delivery agent that is used by the Courier Mail Server";
-    licenses = [ "GPLv3" ];
+    license = [ "GPLv3" ];
   };
 }

pkgs/tools/networking/mailutils/default.nix

@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
       message handling system.
     '';
 
-    licenses = [ "LGPLv3+" /* libraries */  "GPLv3+" /* tools */ ];
+    license = [ "LGPLv3+" /* libraries */  "GPLv3+" /* tools */ ];
 
     maintainers = [ stdenv.lib.maintainers.ludo ];
 

pkgs/top-level/perl-packages.nix

@@ -4368,7 +4368,7 @@ let self = _self // overrides; _self = with self; {
         Sigma/Foveon and Sony.
       '';
 
-      licenses = [ "GPLv1+" /* or */ "Artistic" ];
+      license = [ "GPLv1+" /* or */ "Artistic" ];
 
       maintainers = [ ];
       platforms = stdenv.lib.platforms.unix;