From e07ce3314d4cea1d520d61ef939c17d794545c93 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 24 Jan 2014 16:27:36 +0100 Subject: [PATCH] Fix some "meta.licenses" attributes --- pkgs/applications/networking/browsers/icecat-3/default.nix | 2 +- .../networking/browsers/mozilla-plugins/fribid/default.nix | 2 +- .../browsers/mozilla-plugins/mplayerplug-in/default.nix | 2 +- pkgs/development/compilers/ocaml/3.11.2.nix | 2 +- pkgs/development/compilers/ocaml/3.12.1.nix | 2 +- pkgs/development/compilers/ocaml/4.00.1.nix | 2 +- pkgs/development/compilers/ocaml/4.01.0.nix | 2 +- pkgs/development/compilers/ocaml/ber-metaocaml-003.nix | 2 +- pkgs/development/libraries/cairo/default.nix | 2 +- pkgs/development/libraries/cairomm/default.nix | 2 +- pkgs/development/libraries/java/rhino/default.nix | 2 +- pkgs/development/libraries/sbc/default.nix | 2 +- pkgs/development/libraries/zziplib/default.nix | 2 +- pkgs/development/ocaml-modules/menhir/default.nix | 2 +- pkgs/development/python-modules/setuptools/default.nix | 2 +- pkgs/development/tools/misc/autogen/default.nix | 2 +- pkgs/tools/compression/xz/default.nix | 2 +- pkgs/tools/networking/isync/default.nix | 2 +- pkgs/tools/networking/maildrop/default.nix | 2 +- pkgs/tools/networking/mailutils/default.nix | 2 +- pkgs/top-level/perl-packages.nix | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix index 84269a290e9a..ef2c69422b62 100644 --- a/pkgs/applications/networking/browsers/icecat-3/default.nix +++ b/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; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix index 66bd28424c0e..8cda5ad5762f 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix +++ b/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; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix index 6ee1735f76c7..5b6b2176d47e 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix +++ b/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+" ]; }; } diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix index 9c0b3d1d1921..cffd7c3f54a4 100644 --- a/pkgs/development/compilers/ocaml/3.11.2.nix +++ b/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 = diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index c719abc4abc7..f916f5a79233 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/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 = diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index d7c14e031b35..8662db70c26c 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/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 = diff --git a/pkgs/development/compilers/ocaml/4.01.0.nix b/pkgs/development/compilers/ocaml/4.01.0.nix index c11bb7536be1..79a7c8cd61f6 100644 --- a/pkgs/development/compilers/ocaml/4.01.0.nix +++ b/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 = diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix index df3e9e73af59..9c5fa3764bad 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix +++ b/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"; }; } diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 68ba7d1a9b26..6c73b17e6f4e 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/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; }; diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index e47645737b16..f21abedc1f52 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = http://cairographics.org/; - licenses = [ "LGPLv2+" "MPLv1" ]; + license = [ "LGPLv2+" "MPLv1" ]; }; } diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index ec19e381281d..42bdba7567c5 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/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+" ]; }; } diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix index 414f2a13dea1..06411c1f22a8 100644 --- a/pkgs/development/libraries/sbc/default.nix +++ b/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; }; } diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 69e53d4e8f64..055a491f4601 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/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/; diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index 249ddc1cf568..d5db6e9c7e0c 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/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 diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 8ddf0e9329f6..e0c3e7837b4c 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/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; }; } diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 308183cb6fc0..a26c1fdd1995 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/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/; diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 6d59bd927cff..b644f46dff86 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/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; }; diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 9587dfee613b..30ee63f257a4 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/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; diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix index b91282c9a2b4..991d75c66ae4 100644 --- a/pkgs/tools/networking/maildrop/default.nix +++ b/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" ]; }; } diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 3a84516cd370..8ebe7df35e76 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/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 ]; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ef2372b50125..6211b91053f5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/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;