From 8488d133f37d6f6e2ab0b13e9513af28ddb8da6e Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 21 Apr 2015 18:05:19 +0200 Subject: [PATCH] meta.licenses -> license --- pkgs/applications/audio/gnaural/default.nix | 2 +- pkgs/applications/graphics/apitrace/default.nix | 2 +- pkgs/applications/misc/cool-retro-term/default.nix | 2 +- .../instant-messengers/pidgin-plugins/pidgin-latex/default.nix | 2 +- pkgs/data/documentation/zeal/default.nix | 2 +- pkgs/development/libraries/ffmpeg/generic.nix | 2 +- pkgs/development/libraries/hiredis/default.nix | 2 +- pkgs/development/libraries/qmltermwidget/default.nix | 2 +- pkgs/development/libraries/qpdf/default.nix | 2 +- pkgs/development/libraries/readosm/default.nix | 2 +- pkgs/development/libraries/spatialite-tools/default.nix | 2 +- pkgs/development/ocaml-modules/jsonm/default.nix | 2 +- pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix | 2 +- pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix | 2 +- pkgs/shells/mksh/default.nix | 2 +- pkgs/tools/misc/pipelight/default.nix | 2 +- pkgs/tools/networking/i2p/default.nix | 2 +- pkgs/tools/networking/i2pd/default.nix | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/audio/gnaural/default.nix b/pkgs/applications/audio/gnaural/default.nix index c97465905668..93abad7aa77f 100644 --- a/pkgs/applications/audio/gnaural/default.nix +++ b/pkgs/applications/audio/gnaural/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Auditory binaural-beat generator"; homepage = http://gnaural.sourceforge.net/; - licenses = licenses.gpl2; + license = licenses.gpl2; maintainers = [ maintainers.emery ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index fa16d9584835..af499c51f973 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = https://apitrace.github.io; description = "Tools to trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs"; - licenses = with licenses; mit; + license = with licenses; mit; platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix index d955e5b76777..5bb492718a02 100644 --- a/pkgs/applications/misc/cool-retro-term/default.nix +++ b/pkgs/applications/misc/cool-retro-term/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { eye-candy, customizable, and reasonably lightweight. ''; homepage = "https://github.com/Swordifish90/cool-retro-term"; - licenses = with stdenv.lib.licenses; [ gpl2 gpl3 ]; + license = with stdenv.lib.licenses; [ gpl2 gpl3 ]; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ skeidel ]; }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index c9b8a959bf97..586ce26e8c95 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://sourceforge.net/projects/pidgin-latex/; description = "LaTeX rendering plugin for Pidgin IM"; - licenses = licenses.gpl2; + license = licenses.gpl2; platforms = platforms.linux; maintainers = maintainers.abbradar; }; diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 5489d1ef1b1d..622171b33e35 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { app), available for Linux and Windows. ''; homepage = "http://zealdocs.org/"; - licenses = with stdenv.lib.licenses; [ gpl3 ]; + license = with stdenv.lib.licenses; [ gpl3 ]; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ skeidel ]; }; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 9cb8f86d01d3..d3a68508246b 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -513,7 +513,7 @@ stdenv.mkDerivation rec { No matter if they were designed by some standards committee, the community or a corporation. ''; - licenses = ( + license = ( if nonfreeLicensing then licenses.unfreeRedistributable else if version3Licensing then diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix index e8a91f5ef30e..6476fb663ef9 100644 --- a/pkgs/development/libraries/hiredis/default.nix +++ b/pkgs/development/libraries/hiredis/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/redis/hiredis; description = "Minimalistic C client for Redis >= 1.2"; - licenses = licenses.bsd3; + license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ wkennington ]; }; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 7fcedab199b2..d011114bfd20 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "This project is a QML port of qtermwidget"; homepage = "https://github.com/Swordifish90/qmltermwidget"; - licenses = with stdenv.lib.licenses; [ gpl2 ]; + license = with stdenv.lib.licenses; [ gpl2 ]; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ skeidel ]; }; diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 63ba58f23432..e9d506f58fe9 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://qpdf.sourceforge.net/; description = "A C++ library and set of programs that inspect and manipulate the structure of PDF files"; - licenses = licenses.artistic2; + license = licenses.artistic2; maintainers = maintainers.abbradar; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/development/libraries/readosm/default.nix index 3ca7cab6c387..eebba74f63a7 100644 --- a/pkgs/development/libraries/readosm/default.nix +++ b/pkgs/development/libraries/readosm/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "An open source library to extract valid data from within an Open Street Map input file"; homepage = https://www.gaia-gis.it/fossil/readosm; license = [ "GPLv2+" "LGPLv2+" "MPL1.1" ]; - licenses = with stdenv.lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ]; + license = with stdenv.lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ]; }; } diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix index 9ac8a7d56f43..94c3687e2d46 100644 --- a/pkgs/development/libraries/spatialite-tools/default.nix +++ b/pkgs/development/libraries/spatialite-tools/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { description = "A complete sqlite3-compatible CLI front-end for libspatialite"; homepage = https://www.gaia-gis.it/fossil/spatialite-tools; - licenses = with stdenv.lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ]; + license = with stdenv.lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ]; }; } diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/pkgs/development/ocaml-modules/jsonm/default.nix index 5445fd1e110d..e81c94d8b24b 100644 --- a/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/pkgs/development/ocaml-modules/jsonm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "An OCaml non-blocking streaming codec to decode and encode the JSON data format"; homepage = http://erratique.ch/software/jsonm; - licenses = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ vbgl ]; platforms = ocaml.meta.platforms; }; diff --git a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix index c8793e17abb7..e816f346e53b 100644 --- a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix @@ -17,7 +17,7 @@ goPackages.buildGoPackage rec { meta = with lib; { description = "Export Mesos metrics to Prometheus"; homepage = https://github.com/prometheus/mesos_exporter; - licenses = licenses.asl20; + license = licenses.asl20; maintainers = with maintainers; [ benley ]; platforms = platforms.unix; }; diff --git a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix index 231aa31802c8..da15952f0f37 100644 --- a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix +++ b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix @@ -20,7 +20,7 @@ goPackages.buildGoPackage rec { meta = with lib; { description = "Receives StatsD-style metrics and exports them to Prometheus"; homepage = https://github.com/prometheus/statsd_bridge; - licenses = licenses.asl20; + license = licenses.asl20; maintainers = with maintainers; [ benley ]; platforms = platforms.unix; }; diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index da797005be4f..ba510e8907a6 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { systems. ''; homepage = "https://www.mirbsd.org/mksh.htm"; - licenses = "custom"; + license = "custom"; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index b8182cff862b..aa0be62ed64c 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -89,7 +89,7 @@ in stdenv.mkDerivation rec { meta = { homepage = "http://pipelight.net/"; - licenses = with stdenv.lib.licenses; [ mpl11 gpl2 lgpl21 ]; + license = with stdenv.lib.licenses; [ mpl11 gpl2 lgpl21 ]; description = "A wrapper for using Windows plugins in Linux browsers"; maintainers = with stdenv.lib.maintainers; [skeidel]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index 0a26aff83dd1..9a20e009e58a 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://geti2p.net"; description = "Applications and router for I2P, anonymity over the Internet"; maintainers = [ stdenv.lib.maintainers.joelmo ]; - licenses = licenses.gpl2; + license = licenses.gpl2; # TODO: support other systems, just copy appropriate lib/wrapper.. to $out platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 984e91e255fd..f1b32ddb7e7b 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://track.privacysolutions.no/projects/i2pd"; description = "Minimal I2P router written in C++"; - licenses = licenses.gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ edwtjo ]; platforms = platforms.linux; };