treewide: checkMeta fixes for x86_64-linux

pkgs/applications/audio/google-play-music-desktop-player/default.nix

@@ -74,6 +74,6 @@ stdenv.mkDerivation {
     description = "A beautiful cross platform Desktop Player for Google Play Music";
     license = stdenv.lib.licenses.mit;
     platforms = [ "x86_64-linux" ];
-    maintainers = stdenv.lib.maintainers.SuprDewd;
+    maintainers = [ stdenv.lib.maintainers.SuprDewd ];
   };
 }

pkgs/applications/audio/soundscape-renderer/default.nix

@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     homepage = http://spatialaudio.net/ssr/;
     description = "The SoundScape Renderer (SSR) is a tool for real-time spatial audio reproduction";
     license = stdenv.lib.licenses.gpl3;
-    maintainer = stdenv.lib.maintainers.fridh;
+    maintainers = [ stdenv.lib.maintainers.fridh ];
   };
 
 }

pkgs/applications/misc/bb/default.nix

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     homepage    = http://aa-project.sourceforge.net/bb;
     description = "AA-lib demo";
     license     = licenses.gpl2;
-    maintainers = maintainers.rnhmjoj;
+    maintainers = [ maintainers.rnhmjoj ];
     platforms   = platforms.unix;
   };
 }

pkgs/applications/misc/j4-dmenu-desktop/default.nix

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     description = "A wrapper for dmenu that recognize .desktop files";
     homepage    = "https://github.com/enkore/j4-dmenu-desktop";
     license     = licenses.gpl3;
-    maintainer  = with maintainers; [ ericsagnes ];
-    platforms = with platforms; unix;
+    maintainers = with maintainers; [ ericsagnes ];
+    platforms   = with platforms; unix;
   };
 }

pkgs/applications/misc/metamorphose2/default.nix

@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     description = "a graphical mass renaming program for files and folders";
     homepage    = "https://github.com/metamorphose/metamorphose2";
     license     = with licenses; gpl3Plus;
-    maintainer  = with maintainers; [ ramkromberg ];
+    maintainers = with maintainers; [ ramkromberg ];
     platforms   = with platforms; linux;
   };
 }

pkgs/applications/misc/ola/default.nix

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A framework for controlling entertainment lighting equipment.";
     maintainers = [ maintainers.globin ];
-    licenses = with licenses; [ lgpl21 gpl2Plus ];
+    license = with licenses; [ lgpl21 gpl2Plus ];
     platforms = platforms.all;
   };
 }

pkgs/applications/misc/oneko/default.nix

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.daidouji.com/oneko/";
     license = licenses.publicDomain;
     maintainers = [ maintainers.xaverdh ];
-    meta.platforms = platforms.linux;
+    platforms = platforms.linux;
   };
 }
 

pkgs/applications/misc/ptask/default.nix

@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
     homepage = http://wpitchoune.net/ptask/;
     description = "GTK-based GUI for taskwarrior";
     license = licenses.gpl2;
-    maintainer = [ maintainers.spacefrogg ];
+    maintainers = [ maintainers.spacefrogg ];
   };
 }

pkgs/applications/misc/qmapshack/default.nix

@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     homepage = https://bitbucket.org/maproom/qmapshack/wiki/Home;
     description = "Plan your next outdoor trip";
     license = licenses.gpl3;
-    maintainter = with maintainers; [ dotlambda ];
+    maintainers = with maintainers; [ dotlambda ];
     platforms = with platforms; linux;
   };
 }

pkgs/applications/misc/qmetro/default.nix

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     description = "Worldwide transit maps viewer";
     license = licenses.gpl3;
 
-    maintainter = with maintainers; [ orivej ];
+    maintainers = with maintainers; [ orivej ];
     platforms = platforms.unix;
   };
 }

pkgs/applications/misc/st/xst.nix

@@ -26,7 +26,7 @@ in stdenv.mkDerivation {
     homepage = https://github.com/neeasade/xst;
     description = "Simple terminal fork that can load config from Xresources";
     license = licenses.mit;
-    maintainers = maintainers.vyp;
+    maintainers = [ maintainers.vyp ];
     platforms = platforms.linux;
   };
 }

pkgs/applications/misc/tilix/default.nix

@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Tiling terminal emulator following the Gnome Human Interface Guidelines.";
     homepage = https://gnunn1.github.io/tilix-web;
-    licence = licenses.mpl20;
-    maintainer = with maintainers; [ midchildan ];
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ midchildan ];
     platforms = platforms.linux;
   };
 }

pkgs/applications/misc/urlview/default.nix

@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Extract URLs from text";
     homepage = http://packages.qa.debian.org/u/urlview.html;
-    licencse = stdenv.lib.licenses.gpl2;
+    license = stdenv.lib.licenses.gpl2;
     platforms = with stdenv.lib.platforms; linux ++ darwin;
   };
 }

pkgs/applications/science/math/weka/default.nix

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.cs.waikato.ac.nz/ml/weka/;
     description = "Collection of machine learning algorithms for data mining tasks";
     license = stdenv.lib.licenses.gpl2Plus;
-    maintainer = [stdenv.lib.maintainers.mimadrid];
+    maintainers = [ stdenv.lib.maintainers.mimadrid ];
     platforms = stdenv.lib.platforms.unix;
   };
 }

pkgs/applications/science/programming/plm/default.nix

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Free cross-platform programming exerciser";
-    Homepage = http://webloria.loria.fr/~quinson/Teaching/PLM/;
+    homepage = http://webloria.loria.fr/~quinson/Teaching/PLM/;
     license = licenses.gpl3;
     maintainers = [ ];
     platforms = stdenv.lib.platforms.all;

pkgs/applications/taxes/aangifte-2006/default.nix

@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Elektronische aangifte IB 2006";
-    url = "http://www.belastingdienst.nl/download/1341.html";
+    homepage = "http://www.belastingdienst.nl/download/1341.html";
     license = stdenv.lib.licenses.unfree;
     platforms = stdenv.lib.platforms.linux;
     hydraPlatforms = [];

pkgs/applications/taxes/aangifte-2007/default.nix

@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Elektronische aangifte IB 2007";
-    url = "http://www.belastingdienst.nl/download/1341.html";
+    homepage = "http://www.belastingdienst.nl/download/1341.html";
     license = stdenv.lib.licenses.unfree;
     platforms = stdenv.lib.platforms.linux;
     hydraPlatforms = [];

pkgs/applications/taxes/aangifte-2008/default.nix

@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Elektronische aangifte IB 2008 (Dutch Tax Return Program)";
-    url = http://www.belastingdienst.nl/particulier/aangifte2008/aangifte_2008/aangifte_2008.html;
+    homepage = http://www.belastingdienst.nl/particulier/aangifte2008/aangifte_2008/aangifte_2008.html;
     license = stdenv.lib.licenses.unfree;
     platforms = stdenv.lib.platforms.linux;
     hydraPlatforms = [];

pkgs/applications/taxes/aangifte-2009/default.nix

@@ -32,7 +32,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Elektronische aangifte IB 2009 (Dutch Tax Return Program)";
-    url = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
+    homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
     license = stdenv.lib.licenses.unfree;
     platforms = stdenv.lib.platforms.linux;
     hydraPlatforms = [];

pkgs/applications/taxes/aangifte-2010/default.nix

@@ -32,7 +32,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Elektronische aangifte IB 2010 (Dutch Tax Return Program)";
-    url = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
+    homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
     license = stdenv.lib.licenses.unfree;
     platforms = stdenv.lib.platforms.linux;
     hydraPlatforms = [];

pkgs/applications/taxes/aangifte-2011/default.nix

@@ -32,7 +32,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Elektronische aangifte IB 2011 (Dutch Tax Return Program)";
-    url = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
+    homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
     license = stdenv.lib.licenses.unfree;
     platforms = stdenv.lib.platforms.linux;
     hydraPlatforms = [];

pkgs/applications/taxes/aangifte-2012/default.nix

@@ -33,7 +33,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Elektronische aangifte IB 2012 (Dutch Tax Return Program)";
-    url = http://www.belastingdienst.nl/particulier/aangifte2012/download/;
+    homepage = http://www.belastingdienst.nl/particulier/aangifte2012/download/;
     license = stdenv.lib.licenses.unfree;
     platforms = stdenv.lib.platforms.linux;
     hydraPlatforms = [];

pkgs/applications/taxes/aangifte-2013-wa/default.nix

@@ -33,7 +33,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Elektronische aangifte WA 2013 (Dutch Tax Return Program)";
-    url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux;
+    homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux;
     license = stdenv.lib.licenses.unfree;
     platforms = stdenv.lib.platforms.linux;
     hydraPlatforms = [];

pkgs/applications/taxes/aangifte-2013/default.nix

@@ -33,7 +33,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Elektronische aangifte IB 2013 (Dutch Tax Return Program)";
-    url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux;
+    homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux;
     license = stdenv.lib.licenses.unfree;
     platforms = stdenv.lib.platforms.linux;
     hydraPlatforms = [];

pkgs/applications/taxes/aangifte-2014-wa/default.nix

@@ -33,7 +33,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Elektronische aangifte WA 2014 (Dutch Tax Return Program)";
-    url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux;
+    homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux;
     license = stdenv.lib.licenses.unfree;
     platforms = stdenv.lib.platforms.linux;
     hydraPlatforms = [];

pkgs/applications/taxes/aangifte-2014/default.nix

@@ -33,7 +33,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Elektronische aangifte IB 2014 (Dutch Tax Return Program)";
-    url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux;
+    homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux;
     license = stdenv.lib.licenses.unfree;
     platforms = stdenv.lib.platforms.linux;
     hydraPlatforms = [];

pkgs/applications/video/kodi/plugins.nix

@@ -264,7 +264,7 @@ rec {
 
     meta = with stdenv.lib; {
       homepage = https://forum.kodi.tv/showthread.php?tid=187421;
-      descritpion = "A comic book reader";
+      description = "A comic book reader";
       maintainers = with maintainers; [ edwtjo ];
     };
   };

pkgs/applications/video/mythtv/default.nix

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     homepage = https://www.mythtv.org/;
     description = "Open Source DVR";
     license = licenses.gpl2;
-    meta.platforms = platforms.linux;
+    platforms = platforms.linux;
     maintainers = [ maintainers.titanous ];
   };
 }

pkgs/data/fonts/input-fonts/default.nix

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Fonts for Code, from Font Bureau";
-    longDescrition = ''
+    longDescription = ''
       Input is a font family designed for computer programming, data,
       and text composition. It was designed by David Jonathan Ross
       between 2012 and 2014 and published by The Font Bureau. It

pkgs/data/fonts/noto-fonts/tools.nix

@@ -27,6 +27,6 @@ pythonPackages.buildPythonPackage rec {
     description = "Noto fonts support tools and scripts plus web site generation";
     license = lib.licenses.asl20;
     homepage = https://github.com/googlei18n/nototools;
-    platform = lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }

pkgs/data/fonts/siji/default.nix

@@ -17,7 +17,7 @@ in fetchzip {
   meta = {
     homepage = https://github.com/stark/siji;
     description = "An iconic bitmap font based on Stlarch with additional glyphs";
-    liscense = stdenv.lib.licenses.gpl2;
+    license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.asymmetric ];
   };

pkgs/data/fonts/vista-fonts/default.nix

@@ -26,7 +26,7 @@ fetchzip {
   meta = {
     description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)";
     homepage = http://www.microsoft.com/typography/ClearTypeFonts.mspx;
-    binaryDistribution = false; # haven't read the EULA, but we probably can't redistribute these files, so...
+    license = stdenv.lib.licenses.unfree; # haven't read the EULA, but we probably can't redistribute these files, so...
 
     # Set a non-zero priority to allow easy overriding of the
     # fontconfig configuration files.

pkgs/development/compilers/jetbrains-jdk/default.nix

@@ -73,7 +73,7 @@ let drv = stdenv.mkDerivation rec {
      your own risk.
     '';
     homepage = "https://bintray.com/jetbrains/intellij-jdk/";
-    licenses = licenses.gpl2;
+    license = licenses.gpl2;
     maintainers = with maintainers; [ edwtjo ];
     platforms = with platforms; [ "x86_64-linux" ];
   };

pkgs/development/compilers/owl-lisp/default.nix

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    descripton  = "A functional lisp";
+    description = "A functional lisp";
     homepage    = https://github.com/aoh/owl-lisp;
     license     = licenses.mit;
     maintainers = with maintainers; [ peterhoeg ];

pkgs/development/libraries/dirac/default.nix

@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
     description = "A general-purpose video codec based on wavelets";
     platforms = platforms.linux;
     license = with licenses; [ mpl11 gpl2 lgpl21 ];
-    maintainer = maintainers.igsha;
+    maintainers = [ maintainers.igsha ];
   };
 }

pkgs/development/libraries/gtkd/default.nix

@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "D binding and OO wrapper for GTK+";
     homepage = https://gtkd.org;
-    licence = licenses.lgpl3Plus;
+    license = licenses.lgpl3Plus;
     platforms = platforms.linux ++ platforms.darwin;
   };
 }

pkgs/development/libraries/kdiagram/default.nix

@@ -13,7 +13,7 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules qttools ];
   propagatedBuildInputs = [ qtbase qtsvg ];
   meta = {
-    shortDescription = "Libraries for creating business diagrams";
+    description = "Libraries for creating business diagrams";
     license = lib.licenses.gpl2;
     platforms = qtbase.meta.platforms;
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/development/libraries/libcutl/default.nix

@@ -1,11 +1,13 @@
-{stdenv, fetchurl, xercesc }:
+{ stdenv, fetchurl, xercesc }:
+let
+    major = "1.9";
+    minor = "0";
+in
 with stdenv; with lib;
 mkDerivation rec {
-  name = "libcutl-${meta.major}.${meta.minor}";
+  name = "libcutl-${major}.${minor}";
 
   meta = {
-    major = "1.9";
-    minor = "0";
     description = "A collection of generic and independent components such as meta-programming tests, smart pointers, containers, compiler building blocks" ;
     platforms = platforms.all;
     maintainers = with maintainers; [ ];

pkgs/development/libraries/xcb-util-cursor/HEAD.nix

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     description = "XCB cursor library (libxcursor port)";
     homepage    = http://cgit.freedesktop.org/xcb/util-cursor;
     license     = licenses.mit;
-    maintainer  = with maintainers; [ lovek323 ];
+    maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.linux ++ platforms.darwin;
   };
 

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

@@ -279,14 +279,14 @@ rec {
     name = "ppx_sexp_message";
     hash = "0r0skyr1zf2jh48xrxbs45gzywynhlivkq24xwc0qq435fmc2jqv";
     propagatedBuildInputs = [ ppx_sexp_conv ppx_here ];
-    meta.declarations = "A ppx rewriter for easy construction of s-expressions";
+    meta.description = "A ppx rewriter for easy construction of s-expressions";
   };
 
   ppx_sexp_value = janePackage {
     name = "ppx_sexp_value";
     hash = "0hha5mmx700m8fy9g4znb8278l09chgwlpshny83vsmmzgq2jhah";
     propagatedBuildInputs = [ ppx_sexp_conv ppx_here ];
-    meta.declarations = "A ppx rewriter that simplifies building s-expressions from OCaml values";
+    meta.description = "A ppx rewriter that simplifies building s-expressions from OCaml values";
   };
 
   ppx_typerep_conv = janePackage {

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

@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "A package for acousticians";
-    maintainer = with maintainers; [ fridh ];
+    maintainers = with maintainers; [ fridh ];
     license = with licenses; [ bsd3 ];
     homepage = https://github.com/python-acoustics/python-acoustics;
   };

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

@@ -28,6 +28,6 @@ buildPythonPackage rec {
     description = "File support for asyncio";
     homepage = https://github.com/Tinche/aiofiles;
     license = with lib.licenses; [ asl20 ];
-    maintainer = with lib.maintainers; [ fridh ];
+    maintainers = with lib.maintainers; [ fridh ];
   };
-}
+}