Use common licence attributes from lib/licenses.nix

Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.

pkgs/development/compilers/haxe/default.nix

@@ -32,11 +32,11 @@ stdenv.mkDerivation {
 
   dontStrip = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++";
     homepage = http://haxe.org;
-    license = ["GPLv2" "BSD2" /*?*/ ];  # -> docs/license.txt
-    maintainers = [stdenv.lib.maintainers.marcweber];
-    platforms = stdenv.lib.platforms.linux;
+    license = with licenses; [ gpl2 bsd2 /*?*/ ];  # -> docs/license.txt
+    maintainers = [ maintainers.marcweber ];
+    platforms = platforms.linux;
   };
 }

pkgs/development/compilers/ocaml/3.11.2.nix

@@ -41,9 +41,12 @@ stdenv.mkDerivation rec {
     ln -sv $out/lib/ocaml/caml $out/include/caml
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://caml.inria.fr/ocaml;
-    license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
+    license = with licenses; [
+      qpl /* compiler */
+      lgpl2 /* library */
+    ];
     description = "Most popular variant of the Caml language";
 
     longDescription =
@@ -65,7 +68,7 @@ stdenv.mkDerivation rec {
          documentation generator (ocamldoc).
        '';
 
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = with platforms; linux ++ darwin;
   };
 
 }

pkgs/development/compilers/ocaml/3.12.1.nix

@@ -34,10 +34,13 @@ stdenv.mkDerivation rec {
     nativeCompilers = useNativeCompilers;
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://caml.inria.fr/ocaml;
     branch = "3.12";
-    license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
+    license = with licenses; [
+      qpl /* compiler */
+      lgpl2 /* library */
+    ];
     description = "Most popular variant of the Caml language";
 
     longDescription =
@@ -59,7 +62,7 @@ stdenv.mkDerivation rec {
         and a documentation generator (ocamldoc).
       '';
 
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = with platforms; linux ++ darwin;
   };
 
 }

pkgs/development/compilers/ocaml/4.00.1.nix

@@ -33,10 +33,13 @@ stdenv.mkDerivation rec {
     nativeCompilers = useNativeCompilers;
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://caml.inria.fr/ocaml;
     branch = "4.00";
-    license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
+    license = with licenses; [
+      qpl /* compiler */
+      lgpl2 /* library */
+    ];
     description = "Most popular variant of the Caml language";
 
     longDescription =
@@ -58,7 +61,7 @@ stdenv.mkDerivation rec {
         and a documentation generator (ocamldoc).
       '';
 
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = with platforms; linux ++ darwin;
   };
 
 }

pkgs/development/compilers/ocaml/4.01.0.nix

@@ -48,10 +48,13 @@ stdenv.mkDerivation rec {
     nativeCompilers = useNativeCompilers;
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://caml.inria.fr/ocaml;
     branch = "4.01";
-    license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
+    license = with licenses; [
+      qpl /* compiler */
+      lgpl2 /* library */
+    ];
     description = "Most popular variant of the Caml language";
 
     longDescription =
@@ -73,7 +76,7 @@ stdenv.mkDerivation rec {
         and a documentation generator (ocamldoc).
       '';
 
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = with platforms; linux ++ darwin;
   };
 
 }

pkgs/development/compilers/ocaml/4.02.1.nix

@@ -44,10 +44,13 @@ stdenv.mkDerivation rec {
     nativeCompilers = useNativeCompilers;
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://caml.inria.fr/ocaml;
     branch = "4.02";
-    license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
+    license = with licenses; [
+      qpl /* compiler */
+      lgpl2 /* library */
+    ];
     description = "Most popular variant of the Caml language";
 
     longDescription =
@@ -69,7 +72,7 @@ stdenv.mkDerivation rec {
         and a documentation generator (ocamldoc).
       '';
 
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = with platforms; linux ++ darwin;
   };
 
 }

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

@@ -55,9 +55,16 @@ stdenv.mkDerivation rec {
     cd ..
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://okmij.org/ftp/ML/index.html#ber-metaocaml";
-    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";
+    license = with licenses; [
+      qpl /* compiler */
+      lgpl2 /* library */
+    ];
+    description = "Conservative extension of OCaml";
+    longDescription = ''
+      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/haskell-modules/hackage-packages.nix

@@ -4726,7 +4726,7 @@ self: {
        sha256 = "1kf638h5gsc8fklhaw2jiad1r0ssgj8zkfmzywp85lrx5z529gky";
        buildDepends = [ base haskell98 ];
        description = "A finite map implementation, derived from the paper: Efficient sets: a balancing act, S. Adams, Journal of functional programming 3(4) Oct 1993, pp553-562";
-       license = "BSD4";
+       license = stdenv.lib.licenses.bsdOriginal;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -21072,7 +21072,7 @@ self: {
          glib Glob gtk gtksourceview2 hint mtl process syb
        ];
        description = "A GTK-based abstract syntax tree viewer for custom languages and parsers";
-       license = "BSD4";
+       license = stdenv.lib.licenses.bsdOriginal;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -21084,7 +21084,7 @@ self: {
        sha256 = "1rqqlngmcdd7i1gww95lyim971w8xv0hjg20h0j8av4y29pjxfyn";
        buildDepends = [ base containers syb ];
        description = "Interfacing between hint and astview";
-       license = "BSD4";
+       license = stdenv.lib.licenses.bsdOriginal;
      }) {};
 
   "async" = callPackage

pkgs/development/interpreters/ruby/ruby-1.9.3.nix

@@ -101,12 +101,12 @@ stdenv.mkDerivation rec {
     sed -i "s|'--with-baseruby=${baseruby}/bin/ruby'||" $rbConfig
   '';
 
-  meta = {
-    license     = "Ruby";
+  meta = with stdenv.lib; {
+    license     = with licenses; [ ruby ];
     homepage    = "http://www.ruby-lang.org/en/";
     description = "The Ruby language";
-    maintainers = with stdenv.lib.maintainers; [ lovek323 ];
-    platforms   = stdenv.lib.platforms.all;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.all;
   };
 
   passthru = rec {

pkgs/development/libraries/boost-process/default.nix

@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = "http://www.highscore.de/boost/process0.5/";
     description = "Library to manage system processes";
-    license = "boost-license";
+    license = with licenses; boost;
     platforms = platforms.unix;
     maintainers = with maintainers; [ abbradar ];
   };

pkgs/development/libraries/cairo/default.nix

@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     '' + glib.flattenInclude
     );
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A 2D graphics library with support for multiple output devices";
 
     longDescription = ''
@@ -77,8 +77,8 @@ stdenv.mkDerivation rec {
 
     homepage = http://cairographics.org/;
 
-    license = [ "LGPLv2+" "MPLv1" ];
+    license = with licenses; [ lgpl2Plus mpl10 ];
 
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
   };
 }

pkgs/development/libraries/cairomm/default.nix

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ cairo x11 fontconfig freetype libsigcxx ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A 2D graphics library with support for multiple output devices";
 
     longDescription = ''
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
 
     homepage = http://cairographics.org/;
 
-    license = [ "LGPLv2+" "MPLv1" ];
+    license = with licenses; [ lgpl2Plus mpl10 ];
   };
 }

pkgs/development/libraries/hwloc/default.nix

@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   # <http://hydra.bordeaux.inria.fr/build/51474/nixlog/1/raw>.
   doCheck = !stdenv.isCygwin;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Portable abstraction of hierarchical architectures for high-performance computing";
 
     longDescription = ''
@@ -63,11 +63,11 @@ stdenv.mkDerivation rec {
     '';
 
     # http://www.open-mpi.org/projects/hwloc/license.php
-    license = "revised-BSD";
+    license = with licenses; bsd3;
 
     homepage = http://www.open-mpi.org/projects/hwloc/;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
   };
 }

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

@@ -41,7 +41,7 @@ stdenv.mkDerivation {
       cp -v *.jar "$out/share/java"
     '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "An implementation of JavaScript written in Java";
 
     longDescription =
@@ -52,6 +52,6 @@ stdenv.mkDerivation {
 
     homepage = http://www.mozilla.org/rhino/;
 
-    license = [ "MPLv1.1" /* or */ "GPLv2+" ];
+    license = with licenses; [ mpl11 /* or */ gpl2Plus ];
   };
 }

pkgs/development/libraries/libpseudo/default.nix

@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
     mkdir -p $out/lib
   '';
 
-  buildInputs = [pkgconfig glib ncurses];
+  buildInputs = [ pkgconfig glib ncurses ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://libpseudo.sourceforge.net/;
     description = "Simple, thread-safe messaging between threads";
-    license="GPLv2+";
+    license = with licenses; gpl2Plus;
   };
 }

pkgs/development/libraries/libviper/default.nix

@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [pkgconfig glib ncurses gpm];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://libviper.sourceforge.net/;
     description = "Simple window creation and management facilities for the console";
-    license="GPLv2+";
+    license = with licenses; gpl2Plus;
   };
 }

pkgs/development/libraries/libvterm/default.nix

@@ -17,12 +17,12 @@ stdenv.mkDerivation rec {
     mkdir -p $out/lib
   '';
 
-  buildInputs = [pkgconfig glib ncurses];
+  buildInputs = [ pkgconfig glib ncurses ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://libvterm.sourceforge.net/;
     description = "Terminal emulator library to mimic both vt100 and rxvt";
-    license = "GPLv2+";
-    platforms = stdenv.lib.platforms.linux;
+    license = with licenses; gpl2Plus;
+    platforms = platforms.linux;
   };
 }

pkgs/development/libraries/pkcs11helper/default.nix

@@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
   
   buildInputs = [ pkgconfig openssl autoconf automake libtool ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://www.opensc-project.org/opensc/wiki/pkcs11-helper;
-    license = [ "BSD" "GPLv2" ];
+    license = with licenses; [ "BSD" gpl2 ];
     description = "Library that simplifies the interaction with PKCS#11 providers";
   };
 }

pkgs/development/libraries/quesoglc/default.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
   buildInputs = [ mesa glew freetype fontconfig fribidi libX11 ];
   # FIXME: Configure fails to use system glew.
-  meta = {
+  meta = with stdenv.lib; {
     description = "A free implementation of the OpenGL Character Renderer";
     longDescription = ''
       QuesoGLC is a free (as in free speech) implementation of the OpenGL
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
       platform that supports both FreeType and the OpenGL API.
     '';
     homepage = http://quesoglc.sourceforge.net/;
-    license = [ "LGPLv2.1+" ];
-    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = with licenses; [ lgpl21Plus ];
+    maintainers = with maintainers; [ astsmtl ];
+    platforms = with platforms; linux;
   };
 }

pkgs/development/libraries/rabbitmq-java-client/default.nix

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "RabbitMQ Java client library which allows Java code to interface to AMQP servers";
     homepage = http://www.rabbitmq.com/java-client.html;
-    license = [ "MPLv1.1" "GPLv2" ];
+    license = with licenses; [ mpl11 gpl2 ];
     platforms = platforms.linux;
   };
 }

pkgs/development/libraries/science/math/liblapack/3.5.0.nix

@@ -37,13 +37,13 @@ stdenv.mkDerivation rec {
     blas = atlas;
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     inherit version;
     description = "Linear Algebra PACKage";
     homepage = "http://www.netlib.org/lapack/";
-    license = "revised-BSD";
+    license = with licenses; bsd3;
 
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = platforms.all;
+    maintainers = [ maintainers.simons ];
   };
 }

pkgs/development/libraries/science/math/liblapack/default.nix

@@ -37,13 +37,13 @@ stdenv.mkDerivation rec {
     blas = atlas;
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     inherit version;
     description = "Linear Algebra PACKage";
     homepage = "http://www.netlib.org/lapack/";
-    license = "revised-BSD";
+    license = with licenses; bsd3;
 
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = platforms.all;
+    maintainers = [ maintainers.simons ];
   };
 }

pkgs/development/libraries/zziplib/default.nix

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Library to extract data from files archived in a zip file";
 
     longDescription = ''
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       zip/unzip tools.
     '';
 
-    license = [ "LGPLv2+" "MPLv1.1" ];
+    license = with licenses; [ lgpl2Plus mpl11 ];
 
     homepage = http://zziplib.sourceforge.net/;
 

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

@@ -32,7 +32,7 @@ stdenv.mkDerivation {
     export PREFIX=$out
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://pauillac.inria.fr/~fpottier/menhir/;
     description = "A LR(1) parser generator for OCaml";
     longDescription = ''
@@ -41,10 +41,11 @@ stdenv.mkDerivation {
       to OCaml code.  Menhir was designed and implemented by François Pottier
       and Yann Régis-Gianas.
     '';
-    license = [ "QPL" /* generator */ "LGPLv2" /* library */ ];
-    platforms = ocaml.meta.platforms;
-    maintainers = [
-      stdenv.lib.maintainers.z77z
+    license = with licenses; [
+      qpl /* generator */
+      lgpl2 /* library */
     ];
+    platforms = ocaml.meta.platforms;
+    maintainers = with maintainers; [ z77z ];
   };
 }

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

@@ -39,10 +39,10 @@ in buildPythonPackage rec {
   # Tests are in <nixos/tests/blivet.nix>.
   doCheck = false;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://fedoraproject.org/wiki/Blivet";
     description = "Module for management of a system's storage configuration";
-    license = [ "GPLv2+" "LGPLv2.1+" ];
-    platforms = stdenv.lib.platforms.linux;
+    license = with licenses; [ gpl2Plus lgpl21Plus ];
+    platforms = platforms.linux;
   };
 }

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

@@ -24,7 +24,7 @@ let version = "5.18"; in
 
     #doCheck = true; # 2 tests fail because of missing /dev/tty
 
-    meta = {
+    meta = with stdenv.lib; {
       description = "Automated text and program generation tool";
 
       longDescription = ''
@@ -46,7 +46,7 @@ let version = "5.18"; in
         documentation of program options.
       '';
 
-      license = ["GPLv3+" "LGPLv3+" ];
+      license = with licenses; [ gpl3Plus lgpl3Plus ];
 
       homepage = http://www.gnu.org/software/autogen/;
 

pkgs/development/tools/sauce-connect/default.nix

@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A secure tunneling app for executing tests securely when testing behind firewalls";
-    license = "unfree";
+    license = with licenses; unfree;
     homepage = https://docs.saucelabs.com/reference/sauce-connect/;
     maintainers = with maintainers; [offline];
     platforms = with platforms; platforms.linux;