From 6f5d989478bf3d05648ec469a110a56d4fc7395d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 5 Dec 2017 23:20:11 +0100 Subject: [PATCH] treewide: checkMeta fixes for x86_64-linux --- .../google-play-music-desktop-player/default.nix | 2 +- .../audio/soundscape-renderer/default.nix | 2 +- pkgs/applications/misc/bb/default.nix | 2 +- .../applications/misc/j4-dmenu-desktop/default.nix | 4 ++-- pkgs/applications/misc/metamorphose2/default.nix | 2 +- pkgs/applications/misc/ola/default.nix | 2 +- pkgs/applications/misc/oneko/default.nix | 2 +- pkgs/applications/misc/ptask/default.nix | 2 +- pkgs/applications/misc/qmapshack/default.nix | 2 +- pkgs/applications/misc/qmetro/default.nix | 2 +- pkgs/applications/misc/st/xst.nix | 2 +- pkgs/applications/misc/tilix/default.nix | 4 ++-- pkgs/applications/misc/urlview/default.nix | 2 +- pkgs/applications/science/math/weka/default.nix | 2 +- .../science/programming/plm/default.nix | 2 +- pkgs/applications/taxes/aangifte-2006/default.nix | 2 +- pkgs/applications/taxes/aangifte-2007/default.nix | 2 +- pkgs/applications/taxes/aangifte-2008/default.nix | 2 +- pkgs/applications/taxes/aangifte-2009/default.nix | 2 +- pkgs/applications/taxes/aangifte-2010/default.nix | 2 +- pkgs/applications/taxes/aangifte-2011/default.nix | 2 +- pkgs/applications/taxes/aangifte-2012/default.nix | 2 +- .../taxes/aangifte-2013-wa/default.nix | 2 +- pkgs/applications/taxes/aangifte-2013/default.nix | 2 +- .../taxes/aangifte-2014-wa/default.nix | 2 +- pkgs/applications/taxes/aangifte-2014/default.nix | 2 +- pkgs/applications/video/kodi/plugins.nix | 2 +- pkgs/applications/video/mythtv/default.nix | 2 +- pkgs/data/fonts/input-fonts/default.nix | 2 +- pkgs/data/fonts/noto-fonts/tools.nix | 2 +- pkgs/data/fonts/siji/default.nix | 2 +- pkgs/data/fonts/vista-fonts/default.nix | 2 +- .../compilers/jetbrains-jdk/default.nix | 2 +- pkgs/development/compilers/owl-lisp/default.nix | 2 +- pkgs/development/libraries/dirac/default.nix | 2 +- pkgs/development/libraries/gtkd/default.nix | 2 +- pkgs/development/libraries/kdiagram/default.nix | 2 +- pkgs/development/libraries/libcutl/default.nix | 14 ++++++++------ .../development/libraries/xcb-util-cursor/HEAD.nix | 2 +- .../ocaml-modules/janestreet/default.nix | 4 ++-- .../python-modules/acoustics/default.nix | 2 +- .../python-modules/aiofiles/default.nix | 4 ++-- .../python-modules/bibtexparser/default.nix | 2 +- .../python-modules/configargparse/default.nix | 2 +- .../python-modules/django-extensions/default.nix | 2 +- .../python-modules/django_guardian/default.nix | 2 +- pkgs/development/python-modules/flit/default.nix | 4 ++-- .../python-modules/graph-tool/2.x.x.nix | 2 +- pkgs/development/python-modules/jug/default.nix | 2 +- pkgs/development/python-modules/pydot/default.nix | 4 ++-- .../python-modules/pytest-datafiles/default.nix | 4 ++-- pkgs/development/python-modules/reikna/default.nix | 4 ++-- .../python-modules/requests_download/default.nix | 4 ++-- .../python-modules/requestsexceptions/default.nix | 2 +- .../python-modules/secretstorage/default.nix | 2 +- pkgs/development/python-modules/twine/default.nix | 4 ++-- .../python-modules/uncertainties/default.nix | 2 +- .../python-modules/vcversioner/default.nix | 2 +- pkgs/development/tools/ammonite/default.nix | 2 +- .../tools/continuous-integration/drone/default.nix | 2 +- pkgs/development/tools/flyway/default.nix | 2 +- pkgs/development/tools/git-series/default.nix | 2 +- pkgs/development/tools/imatix_gsl/default.nix | 2 +- pkgs/development/tools/leaps/default.nix | 2 +- pkgs/development/tools/misc/msitools/default.nix | 2 +- pkgs/development/tools/nailgun/default.nix | 2 +- pkgs/development/tools/rhc/default.nix | 2 +- pkgs/development/tools/rust/rustup/default.nix | 2 +- pkgs/development/tools/vcstool/default.nix | 2 +- pkgs/games/commandergenius/default.nix | 2 +- pkgs/games/gemrb/default.nix | 2 +- pkgs/games/lincity/ng.nix | 2 +- pkgs/games/residualvm/default.nix | 2 +- pkgs/misc/emulators/cdemu/vhba.nix | 2 +- pkgs/misc/screensavers/i3lock-pixeled/default.nix | 2 +- pkgs/misc/themes/gnome-breeze/default.nix | 3 ++- pkgs/misc/vim-plugins/default.nix | 6 +++--- pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim | 2 +- pkgs/os-specific/darwin/duti/default.nix | 2 +- pkgs/os-specific/linux/hdapsd/default.nix | 2 +- pkgs/os-specific/linux/libwebcam/default.nix | 4 ++-- pkgs/os-specific/linux/paxtest/default.nix | 2 +- pkgs/os-specific/linux/regionset/default.nix | 2 +- pkgs/servers/http/hiawatha/default.nix | 2 +- pkgs/servers/mail/postgrey/default.nix | 2 +- pkgs/servers/monitoring/plugins/esxi.nix | 2 +- pkgs/servers/monitoring/plugins/labs_consol_de.nix | 6 +++--- pkgs/servers/monitoring/plugins/uptime.nix | 2 +- pkgs/servers/nosql/riak-cs/2.1.1.nix | 2 +- pkgs/shells/zsh-deer/default.nix | 2 +- pkgs/tools/X11/setroot/default.nix | 2 +- pkgs/tools/X11/xpointerbarrier/default.nix | 2 +- pkgs/tools/cd-dvd/lsdvd/default.nix | 2 +- pkgs/tools/filesystems/afpfs-ng/default.nix | 2 +- pkgs/tools/filesystems/nixpart/0.4/dmraid.nix | 2 +- pkgs/tools/filesystems/nixpart/0.4/lvm2.nix | 2 +- pkgs/tools/graphics/svgcleaner/default.nix | 2 +- .../inputmethods/interception-tools/default.nix | 2 +- pkgs/tools/inputmethods/keyfuzz/default.nix | 2 +- pkgs/tools/misc/ddcutil/default.nix | 2 +- pkgs/tools/misc/exa/default.nix | 2 +- pkgs/tools/misc/geteltorito/default.nix | 2 +- pkgs/tools/misc/gosu/default.nix | 2 +- pkgs/tools/misc/homesick/default.nix | 2 +- pkgs/tools/misc/hostsblock/default.nix | 2 +- pkgs/tools/misc/routino/default.nix | 2 +- pkgs/tools/misc/xdxf2slob/default.nix | 2 +- pkgs/tools/networking/burpsuite/default.nix | 3 ++- pkgs/tools/networking/ocproxy/default.nix | 2 +- pkgs/tools/networking/pixiewps/default.nix | 2 +- pkgs/tools/networking/ua/default.nix | 2 +- pkgs/tools/security/haka/default.nix | 2 +- pkgs/tools/system/s-tui/default.nix | 2 +- pkgs/tools/text/ansifilter/default.nix | 2 +- pkgs/tools/text/odt2txt/default.nix | 2 +- pkgs/top-level/python-packages.nix | 4 ++-- 116 files changed, 141 insertions(+), 137 deletions(-) diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix index 9d9af6311832..83df4b33940c 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/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 ]; }; } diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix index 7daae31a468b..44c3bd70d3dc 100644 --- a/pkgs/applications/audio/soundscape-renderer/default.nix +++ b/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 ]; }; } diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix index 71196e919915..3d04b53dcde7 100644 --- a/pkgs/applications/misc/bb/default.nix +++ b/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; }; } diff --git a/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/pkgs/applications/misc/j4-dmenu-desktop/default.nix index 9896fd15b85c..6b4762c0de47 100644 --- a/pkgs/applications/misc/j4-dmenu-desktop/default.nix +++ b/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; }; } diff --git a/pkgs/applications/misc/metamorphose2/default.nix b/pkgs/applications/misc/metamorphose2/default.nix index 8f18f166d4a3..602d4a032efd 100644 --- a/pkgs/applications/misc/metamorphose2/default.nix +++ b/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; }; } diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index 9db6042e60f6..499653b14359 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/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; }; } diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix index a3770715532f..4655b059b339 100644 --- a/pkgs/applications/misc/oneko/default.nix +++ b/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; }; } diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/applications/misc/ptask/default.nix index abb1fb596fac..af74ea570ab3 100644 --- a/pkgs/applications/misc/ptask/default.nix +++ b/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 ]; }; } diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix index 7330dfa4f199..c67dcea40b9b 100644 --- a/pkgs/applications/misc/qmapshack/default.nix +++ b/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; }; } diff --git a/pkgs/applications/misc/qmetro/default.nix b/pkgs/applications/misc/qmetro/default.nix index 932d8156a79a..49993f2f7ea7 100644 --- a/pkgs/applications/misc/qmetro/default.nix +++ b/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; }; } diff --git a/pkgs/applications/misc/st/xst.nix b/pkgs/applications/misc/st/xst.nix index 877990861fd7..b63a41bb9156 100644 --- a/pkgs/applications/misc/st/xst.nix +++ b/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; }; } diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index c7ee4fb1c4cd..f83ca1b25fef 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/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; }; } diff --git a/pkgs/applications/misc/urlview/default.nix b/pkgs/applications/misc/urlview/default.nix index 0a651906cd8f..daf93e8c4698 100644 --- a/pkgs/applications/misc/urlview/default.nix +++ b/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; }; } diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index 18cb26890634..7af0df5360d5 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/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; }; } diff --git a/pkgs/applications/science/programming/plm/default.nix b/pkgs/applications/science/programming/plm/default.nix index eb157e8b99f5..f46f7afb659c 100644 --- a/pkgs/applications/science/programming/plm/default.nix +++ b/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; diff --git a/pkgs/applications/taxes/aangifte-2006/default.nix b/pkgs/applications/taxes/aangifte-2006/default.nix index 72d6999fa1d7..5883e51f712e 100644 --- a/pkgs/applications/taxes/aangifte-2006/default.nix +++ b/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 = []; diff --git a/pkgs/applications/taxes/aangifte-2007/default.nix b/pkgs/applications/taxes/aangifte-2007/default.nix index 15c826feb6e7..43fb26d811a3 100644 --- a/pkgs/applications/taxes/aangifte-2007/default.nix +++ b/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 = []; diff --git a/pkgs/applications/taxes/aangifte-2008/default.nix b/pkgs/applications/taxes/aangifte-2008/default.nix index 905471cb76b8..b9fad2fa10bd 100644 --- a/pkgs/applications/taxes/aangifte-2008/default.nix +++ b/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 = []; diff --git a/pkgs/applications/taxes/aangifte-2009/default.nix b/pkgs/applications/taxes/aangifte-2009/default.nix index c944fc3d68b3..d4230d426ece 100644 --- a/pkgs/applications/taxes/aangifte-2009/default.nix +++ b/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 = []; diff --git a/pkgs/applications/taxes/aangifte-2010/default.nix b/pkgs/applications/taxes/aangifte-2010/default.nix index b5a85415c376..602368d2017b 100644 --- a/pkgs/applications/taxes/aangifte-2010/default.nix +++ b/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 = []; diff --git a/pkgs/applications/taxes/aangifte-2011/default.nix b/pkgs/applications/taxes/aangifte-2011/default.nix index a38bc4254bbe..80c772705142 100644 --- a/pkgs/applications/taxes/aangifte-2011/default.nix +++ b/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 = []; diff --git a/pkgs/applications/taxes/aangifte-2012/default.nix b/pkgs/applications/taxes/aangifte-2012/default.nix index 2e51ef9ed4cf..8066c86742c1 100644 --- a/pkgs/applications/taxes/aangifte-2012/default.nix +++ b/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 = []; diff --git a/pkgs/applications/taxes/aangifte-2013-wa/default.nix b/pkgs/applications/taxes/aangifte-2013-wa/default.nix index 5ee0edb4b5e5..6f8e6d6429d3 100644 --- a/pkgs/applications/taxes/aangifte-2013-wa/default.nix +++ b/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 = []; diff --git a/pkgs/applications/taxes/aangifte-2013/default.nix b/pkgs/applications/taxes/aangifte-2013/default.nix index 3cf85961a9bb..d75b60c83673 100644 --- a/pkgs/applications/taxes/aangifte-2013/default.nix +++ b/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 = []; diff --git a/pkgs/applications/taxes/aangifte-2014-wa/default.nix b/pkgs/applications/taxes/aangifte-2014-wa/default.nix index 78bb8214257f..38124677f9a5 100644 --- a/pkgs/applications/taxes/aangifte-2014-wa/default.nix +++ b/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 = []; diff --git a/pkgs/applications/taxes/aangifte-2014/default.nix b/pkgs/applications/taxes/aangifte-2014/default.nix index 0151cca52b2c..33b6f8853aa2 100644 --- a/pkgs/applications/taxes/aangifte-2014/default.nix +++ b/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 = []; diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 52c39e837a12..6bcba1e927f9 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/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 ]; }; }; diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 71bb0405111c..167c5bdba40a 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/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 ]; }; } diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix index 5217b175ed20..94c580c30df0 100644 --- a/pkgs/data/fonts/input-fonts/default.nix +++ b/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 diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index f1546a17f58a..b5fc13daefa0 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/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; }; } diff --git a/pkgs/data/fonts/siji/default.nix b/pkgs/data/fonts/siji/default.nix index b695143fa592..99f0d913b857 100644 --- a/pkgs/data/fonts/siji/default.nix +++ b/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 ]; }; diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix index f84d067eed83..65fa3fb81ab5 100644 --- a/pkgs/data/fonts/vista-fonts/default.nix +++ b/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. diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index aa3f49ca4d9f..383283309ddf 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/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" ]; }; diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix index b01914afc295..4e2f8b2af5b4 100644 --- a/pkgs/development/compilers/owl-lisp/default.nix +++ b/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 ]; diff --git a/pkgs/development/libraries/dirac/default.nix b/pkgs/development/libraries/dirac/default.nix index 7cb7187a3ceb..5b05d64f0727 100644 --- a/pkgs/development/libraries/dirac/default.nix +++ b/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 ]; }; } diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index ffbab3fce421..5a4cf75048f7 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/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; }; } diff --git a/pkgs/development/libraries/kdiagram/default.nix b/pkgs/development/libraries/kdiagram/default.nix index 853f02f566a0..50f3e6a6c025 100644 --- a/pkgs/development/libraries/kdiagram/default.nix +++ b/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 ]; diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix index 526890ed5637..7b4d39f955aa 100644 --- a/pkgs/development/libraries/libcutl/default.nix +++ b/pkgs/development/libraries/libcutl/default.nix @@ -1,11 +1,13 @@ -{stdenv, fetchurl, xercesc }: -with stdenv; with lib; -mkDerivation rec { - name = "libcutl-${meta.major}.${meta.minor}"; - - meta = { +{ stdenv, fetchurl, xercesc }: +let major = "1.9"; minor = "0"; +in +with stdenv; with lib; +mkDerivation rec { + name = "libcutl-${major}.${minor}"; + + meta = { 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; [ ]; diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index 81ac75489baf..4ccdcb19f81f 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/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; }; diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index 938a84454be1..a6ebb0079e83 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/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 { diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix index d1cb1180358f..9d7b1148146c 100644 --- a/pkgs/development/python-modules/acoustics/default.nix +++ b/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; }; diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix index 9139c62618a6..d0808a1cc310 100644 --- a/pkgs/development/python-modules/aiofiles/default.nix +++ b/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 ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/bibtexparser/default.nix b/pkgs/development/python-modules/bibtexparser/default.nix index 0f624a145e01..74b1062cea44 100644 --- a/pkgs/development/python-modules/bibtexparser/default.nix +++ b/pkgs/development/python-modules/bibtexparser/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { description = "Bibtex parser for python 2.7 and 3.3 and newer"; homepage = https://github.com/sciunto-org/python-bibtexparser; license = with lib.licenses; [ gpl3 bsd3 ]; - maintainer = with lib.maintainers; [ fridh ]; + maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index 9d84400667a9..9540b0599315 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -16,6 +16,6 @@ buildPythonPackage rec { description = "A drop-in replacement for argparse"; homepage = https://github.com/zorro3/ConfigArgParse; license = licenses.mit; - maintainer = [ maintainers.willibutz ]; + maintainers = [ maintainers.willibutz ]; }; } diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 13f35d110c7a..9d1161fca3b6 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A collection of custom extensions for the Django Framework"; homepage = https://github.com/django-extensions/django-extensions; - licenses = [ licenses.mit ]; + license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix index e83076674e8a..a92a7038cd31 100644 --- a/pkgs/development/python-modules/django_guardian/default.nix +++ b/pkgs/development/python-modules/django_guardian/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Per object permissions for Django"; homepage = https://github.com/django-guardian/django-guardian; - licenses = [ licenses.mit licenses.bsd2 ]; + license = [ licenses.mit licenses.bsd2 ]; }; } diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 2154feeebb7c..298da4a85bf9 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "A simple packaging tool for simple packages"; homepage = https://github.com/takluyver/flit; license = lib.licenses.bsd3; - maintainer = lib.maintainers.fridh; + maintainers = [ lib.maintainers.fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index 36181bfb3f95..99fe4b73cb98 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { homepage = http://graph-tool.skewed.de/; license = licenses.gpl3; platforms = platforms.all; - maintainer = [ stdenv.lib.maintainers.joelmo ]; + maintainers = [ stdenv.lib.maintainers.joelmo ]; }; src = fetchurl { diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix index b1053bbdaab1..7a6104aacf35 100644 --- a/pkgs/development/python-modules/jug/default.nix +++ b/pkgs/development/python-modules/jug/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Task-Based Parallelization Framework"; license = licenses.mit; - url = https://jug.readthedocs.io/; + homepage = https://jug.readthedocs.io/; maintainers = with maintainers; [ luispedro ]; }; } diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix index 38123acd32ec..be0b4eabfa8a 100644 --- a/pkgs/development/python-modules/pydot/default.nix +++ b/pkgs/development/python-modules/pydot/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { meta = { homepage = https://github.com/erocarrera/pydot; description = "Allows to easily create both directed and non directed graphs from Python"; - licenses = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/pytest-datafiles/default.nix b/pkgs/development/python-modules/pytest-datafiles/default.nix index 6df1792f884b..c31cd2ab6f63 100644 --- a/pkgs/development/python-modules/pytest-datafiles/default.nix +++ b/pkgs/development/python-modules/pytest-datafiles/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { license = licenses.mit; - website = https://pypi.python.org/pypi/pytest-catchlog/; + homepage = https://pypi.python.org/pypi/pytest-catchlog/; description = "py.test plugin to create a 'tmpdir' containing predefined files/directories."; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index fa91184f1b7a..7899f86a8cb8 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -38,8 +38,8 @@ buildPythonPackage rec { description = "GPGPU algorithms for PyCUDA and PyOpenCL"; homepage = https://github.com/fjarri/reikna; license = stdenv.lib.licenses.mit; - maintainer = stdenv.lib.maintainers.fridh; + maintainers = [ stdenv.lib.maintainers.fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/requests_download/default.nix b/pkgs/development/python-modules/requests_download/default.nix index 4e2646eb6ab2..91ab82a7a30e 100644 --- a/pkgs/development/python-modules/requests_download/default.nix +++ b/pkgs/development/python-modules/requests_download/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Download files using requests and save them to a target path"; homepage = https://www.github.com/takluyver/requests_download; license = lib.licenses.mit; - maintainer = lib.maintainers.fridh; + maintainers = [ lib.maintainers.fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/requestsexceptions/default.nix b/pkgs/development/python-modules/requestsexceptions/default.nix index 35d723836c95..0321f9abec2c 100644 --- a/pkgs/development/python-modules/requestsexceptions/default.nix +++ b/pkgs/development/python-modules/requestsexceptions/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { homepage = "https://pypi.python.org/pypi/requestsexceptions"; license = licenses.asl20; maintainers = with maintainers; [ makefu ]; - patforms = platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/development/python-modules/secretstorage/default.nix b/pkgs/development/python-modules/secretstorage/default.nix index e6d96f7bcf21..9b64ce811ef7 100644 --- a/pkgs/development/python-modules/secretstorage/default.nix +++ b/pkgs/development/python-modules/secretstorage/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { homepage = "https://github.com/mitya57/secretstorage"; description = "Python bindings to FreeDesktop.org Secret Service API"; license = licenses.bsdOriginal; - maintainer = with maintainers; [ teto ]; + maintainers = with maintainers; [ teto ]; }; } diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index a3f0df8ca2ce..63f8c3b90554 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Collection of utilities for interacting with PyPI"; homepage = https://github.com/pypa/twine; license = lib.licenses.asl20; - maintainer = with lib.maintainers; [ fridh ]; + maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index 5151ee638482..e60ed958223b 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { homepage = http://pythonhosted.org/uncertainties/; description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)"; - maintainer = with maintainers; [ rnhmjoj ]; + maintainers = with maintainers; [ rnhmjoj ]; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/vcversioner/default.nix b/pkgs/development/python-modules/vcversioner/default.nix index 1b9819c035db..4274abf3b329 100644 --- a/pkgs/development/python-modules/vcversioner/default.nix +++ b/pkgs/development/python-modules/vcversioner/default.nix @@ -13,6 +13,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "take version numbers from version control"; homepage = https://github.com/habnabit/vcversioner; - licenses = licenses.isc; + license = licenses.isc; }; } diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index f0a9837ce481..1393229333d3 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = http://www.lihaoyi.com/Ammonite/; license = lib.licenses.mit; platforms = lib.platforms.all; - maintainer = [ lib.maintainers.nequissimus ]; + maintainers = [ lib.maintainers.nequissimus ]; }; } diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index ed6c7f4fefb6..845e3f8a1dc4 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -61,7 +61,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - maintainer = with maintainers; [ avnik ]; + maintainers = with maintainers; [ avnik ]; license = licenses.asl20; description = "Continuous Integration platform built on container technology"; }; diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 6233b9c6bdb4..0ef6e85297c1 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -24,6 +24,6 @@ homepage = "https://flywaydb.org/"; license = licenses.asl20; platforms = platforms.linux; - maintainers = maintainers.cmcdragonkai; + maintainers = [ maintainers.cmcdragonkai ]; }; } diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index 7d94863ea1cb..fdb6616e5fd0 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -43,6 +43,6 @@ buildRustPackage rec { homepage = https://github.com/git-series/git-series; license = licenses.mit; - maintainer = [ maintainers.vmandela ]; + maintainers = [ maintainers.vmandela ]; }; } diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix index 629ddf69c4ed..a35af00f4492 100644 --- a/pkgs/development/tools/imatix_gsl/default.nix +++ b/pkgs/development/tools/imatix_gsl/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/imatix/gsl/; description = "A universal code generator"; platforms = platforms.unix; - maintainer = [ maintainers.moosingin3space ]; + maintainers = [ maintainers.moosingin3space ]; }; } diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index 261d16367d40..8032b256905b 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/pkgs/development/tools/leaps/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { homepage = https://github.com/jeffail/leaps/; license = "MIT"; maintainers = with stdenv.lib.maintainers; [ qknight ]; - meta.platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index cace3e7f0a94..acfc8c54f641 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { description = "Set of programs to inspect and build Windows Installer (.MSI) files"; homepage = https://wiki.gnome.org/msitools; license = [licenses.gpl2 licenses.lgpl21]; - maintainer = [maintainers.vcunat]; + maintainers = [maintainers.vcunat]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix index aef851e64765..dea1ab2a4459 100644 --- a/pkgs/development/tools/nailgun/default.nix +++ b/pkgs/development/tools/nailgun/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = http://martiansoftware.com/nailgun/; license = licenses.apsl20; platforms = platforms.linux; - maintainer = with maintainers; [ volth ]; + maintainers = with maintainers; [ volth ]; }; } diff --git a/pkgs/development/tools/rhc/default.nix b/pkgs/development/tools/rhc/default.nix index da8a8e2e77db..634ca28aaf13 100644 --- a/pkgs/development/tools/rhc/default.nix +++ b/pkgs/development/tools/rhc/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/openshift/rhc; description = "OpenShift client tools"; license = licenses.asl20; - maintaners = maintainers.szczyp; + maintainers = [ maintainers.szczyp ]; }; } diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index b7065cc5d7da..6a2d5758f1fb 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -52,6 +52,6 @@ rustPlatform.buildRustPackage rec { description = "The Rust toolchain installer"; homepage = https://www.rustup.rs/; license = licenses.mit; - maintainer = [ maintainers.mic92 ]; + maintainers = [ maintainers.mic92 ]; }; } diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix index fae0ca88124f..51e066f3d390 100644 --- a/pkgs/development/tools/vcstool/default.nix +++ b/pkgs/development/tools/vcstool/default.nix @@ -23,6 +23,6 @@ buildPythonApplication rec { description = "Provides a command line tool to invoke vcs commands on multiple repositories"; homepage = https://github.com/dirk-thomas/vcstool; license = licenses.asl20; - maintainer = with maintainers; [ sivteck ]; + maintainers = with maintainers; [ sivteck ]; }; } diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix index 9baa38777068..b2a0b2884254 100644 --- a/pkgs/games/commandergenius/default.nix +++ b/pkgs/games/commandergenius/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Modern Interpreter for the Commander Keen Games"; - longdescription = '' + longDescription = '' Commander Genius is an open-source clone of Commander Keen which allows you to play the games, and some of the mods diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index abe1c2c55991..0e9025259224 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; homepage = http://gemrb.org/; license = licenses.gpl2; - maintainer = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; }; } diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix index 4ca2cd271cdb..28fd6fe6e501 100644 --- a/pkgs/games/lincity/ng.nix +++ b/pkgs/games/lincity/ng.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = { - documentation = ''City building game''; + description = ''City building game''; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [stdenv.lib.maintainers.raskin]; diff --git a/pkgs/games/residualvm/default.nix b/pkgs/games/residualvm/default.nix index e96cf5e59322..d916ff0d3444 100644 --- a/pkgs/games/residualvm/default.nix +++ b/pkgs/games/residualvm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Interpreter for LucasArts' Lua-based 3D adventure games"; homepage = http://residualvm.org/; repositories.git = https://github.com/residualvm/residualvm.git; - licencse = licenses.gpl2; + license = licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index d03b18f12d63..56f63e747342 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "Provides a Virtual (SCSI) HBA"; homepage = http://cdemu.sourceforge.net/about/vhba/; platforms = platforms.linux; - licenses = licenses.gpl2Plus; + license = licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ bendlas ]; }; } diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/misc/screensavers/i3lock-pixeled/default.nix index 67cb0a4ca6d2..7cb3e68dec86 100644 --- a/pkgs/misc/screensavers/i3lock-pixeled/default.nix +++ b/pkgs/misc/screensavers/i3lock-pixeled/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "Simple i3lock helper which pixels a screenshot by scaling it down and up to get a pixeled version of the screen when the lock is active."; homepage = https://github.com/Ma27/i3lock-pixeled; license = licenses.mit; - platform = platforms.linux; + platforms = platforms.linux; maintainers = with maintainers; [ ma27 ]; }; } diff --git a/pkgs/misc/themes/gnome-breeze/default.nix b/pkgs/misc/themes/gnome-breeze/default.nix index 73e9ea604d77..cc1769b48df2 100644 --- a/pkgs/misc/themes/gnome-breeze/default.nix +++ b/pkgs/misc/themes/gnome-breeze/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation { cp -r Breeze* $out/share/themes ''; + preferLocalBuild = true; + meta = { description = "A GTK theme built to match KDE's breeze theme"; homepage = https://github.com/dirruk1/gnome-breeze; @@ -19,6 +21,5 @@ stdenv.mkDerivation { maintainers = with stdenv.lib.maintainers; [ bennofs ]; platforms = stdenv.lib.platforms.all; hydraPlatforms = []; - preferLocalBuild = true; }; } diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index dcaa1e55ee62..6baf7d764b31 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -290,7 +290,7 @@ rec { buildInputs = [ unzip ]; dependencies = []; meta = { - url = "http://www.vim.org/scripts/script.php?script_id=1234"; + homepage = "http://www.vim.org/scripts/script.php?script_id=1234"; }; sourceRoot = "."; @@ -2077,7 +2077,7 @@ rec { buildInputs = [ unzip ]; dependencies = []; meta = { - url = "http://www.vim.org/scripts/script.php?script_id=39"; + homepage = "http://www.vim.org/scripts/script.php?script_id=39"; }; unpackPhase = '' @@ -2198,7 +2198,7 @@ rec { buildInputs = [ unzip ]; dependencies = []; meta = { - url = "http://www.vim.org/scripts/script.php?script_id=273"; + homepage = "http://www.vim.org/scripts/script.php?script_id=273"; }; setSourceRoot = '' diff --git a/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim b/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim index 89a96133fba5..0ddbeaae6be1 100644 --- a/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim +++ b/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim @@ -109,7 +109,7 @@ fun! nix#NixDerivation(opts, name, repository) abort \ ' buildInputs = [ unzip ];', \ ' dependencies = ['.join(map(copy(dependencies), "'\"'.nix#ToNixAttrName(v:val).'\"'")).'];', \ ' meta = {', - \ ' url = "http://www.vim.org/scripts/script.php?script_id='.a:repository.vim_script_nr.'";', + \ ' homepage = "http://www.vim.org/scripts/script.php?script_id='.a:repository.vim_script_nr.'";', \ ' };', \ addon_info == {} ? '' : (' addon_info = '.nix#ToNix(string(addon_info), [], "").';'), \ additional_nix_code, diff --git a/pkgs/os-specific/darwin/duti/default.nix b/pkgs/os-specific/darwin/duti/default.nix index 10eac5d47191..a9051fd1279f 100644 --- a/pkgs/os-specific/darwin/duti/default.nix +++ b/pkgs/os-specific/darwin/duti/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; maintainers = with maintainers; [matthewbauer]; platforms = platforms.darwin; - licenses = licenses.publicDomain; + license = licenses.publicDomain; homepage = "http://duti.org/"; }; } diff --git a/pkgs/os-specific/linux/hdapsd/default.nix b/pkgs/os-specific/linux/hdapsd/default.nix index 61c0c7b495df..53924a782df7 100644 --- a/pkgs/os-specific/linux/hdapsd/default.nix +++ b/pkgs/os-specific/linux/hdapsd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Hard Drive Active Protection System Daemon"; - hompage = "http://hdaps.sf.net/"; + homepage = "http://hdaps.sf.net/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.ehmry ]; diff --git a/pkgs/os-specific/linux/libwebcam/default.nix b/pkgs/os-specific/linux/libwebcam/default.nix index aadecfdc8b5e..879e85a0c945 100644 --- a/pkgs/os-specific/linux/libwebcam/default.nix +++ b/pkgs/os-specific/linux/libwebcam/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The webcam-tools package"; platforms = platforms.linux; - licenses = with licenses; [ lgpl3 ]; + license = licenses.lgpl3; maintainers = with maintainers; [ jraygauthier ]; }; -} \ No newline at end of file +} diff --git a/pkgs/os-specific/linux/paxtest/default.nix b/pkgs/os-specific/linux/paxtest/default.nix index 4611a3c09b77..c1500e51ac37 100644 --- a/pkgs/os-specific/linux/paxtest/default.nix +++ b/pkgs/os-specific/linux/paxtest/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { description = "Test various memory protection measures"; license = licenses.gpl2; platforms = platforms.linux; - maintainer = with maintainers; [ copumpkin joachifm ]; + maintainers = with maintainers; [ copumpkin joachifm ]; }; } diff --git a/pkgs/os-specific/linux/regionset/default.nix b/pkgs/os-specific/linux/regionset/default.nix index ba35d9f73ffc..ee7325edbe70 100644 --- a/pkgs/os-specific/linux/regionset/default.nix +++ b/pkgs/os-specific/linux/regionset/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit version; homepage = http://linvdr.org/projects/regionset/; - descriptions = "Tool for changing the region code setting of DVD players"; + description = "Tool for changing the region code setting of DVD players"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index aa6f0e1f9108..2267c07e6f98 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { description = "An advanced and secure webserver"; license = licenses.gpl2; homepage = https://www.hiawatha-webserver.org; - maintainer = [ maintainers.ndowens ]; + maintainers = [ maintainers.ndowens ]; }; } diff --git a/pkgs/servers/mail/postgrey/default.nix b/pkgs/servers/mail/postgrey/default.nix index 95f460e917b5..b221bfa0dd4c 100644 --- a/pkgs/servers/mail/postgrey/default.nix +++ b/pkgs/servers/mail/postgrey/default.nix @@ -19,7 +19,7 @@ in runCommand name { description = "A postfix policy server to provide greylisting"; homepage = https://postgrey.schweikert.ch/; platforms = postfix.meta.platforms; - licenses = licenses.gpl2; + license = licenses.gpl2; }; } '' mkdir -p $out/bin diff --git a/pkgs/servers/monitoring/plugins/esxi.nix b/pkgs/servers/monitoring/plugins/esxi.nix index 312caab954bb..e458e130ba49 100644 --- a/pkgs/servers/monitoring/plugins/esxi.nix +++ b/pkgs/servers/monitoring/plugins/esxi.nix @@ -32,6 +32,6 @@ in python2Packages.buildPythonApplication rec { meta = with stdenv.lib; { homepage = https://www.claudiokuenzler.com/nagios-plugins/; license = licenses.gpl2; - maintainer = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg ]; }; } diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix index 441d9595bbd1..9f33835c8851 100644 --- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix +++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix @@ -46,9 +46,9 @@ let ''; meta = with stdenv.lib; { - homepage = https://labs.consol.de/; - license = licenses.gpl2; - maintainer = with maintainers; [ peterhoeg ]; + homepage = https://labs.consol.de/; + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; inherit description; }; }; diff --git a/pkgs/servers/monitoring/plugins/uptime.nix b/pkgs/servers/monitoring/plugins/uptime.nix index 2f26bc26ba44..9f03c9ea96f6 100644 --- a/pkgs/servers/monitoring/plugins/uptime.nix +++ b/pkgs/servers/monitoring/plugins/uptime.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "Uptime check plugin for Sensu/Nagios/others"; homepage = https://github.com/madrisan/nagios-plugins-uptime; license = licenses.gpl3; - maintainer = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg ]; }; } diff --git a/pkgs/servers/nosql/riak-cs/2.1.1.nix b/pkgs/servers/nosql/riak-cs/2.1.1.nix index a0df98faf360..4d0bb6c687db 100644 --- a/pkgs/servers/nosql/riak-cs/2.1.1.nix +++ b/pkgs/servers/nosql/riak-cs/2.1.1.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { description = "Dynamo inspired NoSQL DB by Basho with S3 compatibility"; platforms = [ "x86_64-linux" "x86_64-darwin" ]; license = licenses.asl20; - maintainer = with maintainers; [ mdaiter ]; + maintainers = with maintainers; [ mdaiter ]; }; } diff --git a/pkgs/shells/zsh-deer/default.nix b/pkgs/shells/zsh-deer/default.nix index 3fa941c08c39..735d6a2b7619 100644 --- a/pkgs/shells/zsh-deer/default.nix +++ b/pkgs/shells/zsh-deer/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation { description = "Ranger-like file navigation for zsh"; homepage = "https://github.com/Vifon/deer"; license = licenses.gpl3Plus; - maintainers = maintainers.vyp; + maintainers = [ maintainers.vyp ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix index 2245f03ec7fe..669da86621fd 100644 --- a/pkgs/tools/X11/setroot/default.nix +++ b/pkgs/tools/X11/setroot/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Simple X background setter inspired by imlibsetroot and feh"; homepage = https://github.com/ttzhou/setroot; license = licenses.gpl3Plus; - maintainers = maintainers.vyp; + maintainers = [ maintainers.vyp ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/X11/xpointerbarrier/default.nix b/pkgs/tools/X11/xpointerbarrier/default.nix index 5eb1faafe2ef..93bbe1ce0bc5 100644 --- a/pkgs/tools/X11/xpointerbarrier/default.nix +++ b/pkgs/tools/X11/xpointerbarrier/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/vain/xpointerbarrier; description = "Create X11 pointer barriers around your working area"; license = stdenv.lib.licenses.mit; - maintainers = stdenv.lib.maintainers.xzfc; + maintainers = [ stdenv.lib.maintainers.xzfc ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix index 7d0fc5969bf2..6a3f92a57c2d 100644 --- a/pkgs/tools/cd-dvd/lsdvd/default.nix +++ b/pkgs/tools/cd-dvd/lsdvd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { homepage = https://sourceforge.net/projects/lsdvd/; - shortDescription = "Display information about audio, video, and subtitle tracks on a DVD"; + description = "Display information about audio, video, and subtitle tracks on a DVD"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/afpfs-ng/default.nix b/pkgs/tools/filesystems/afpfs-ng/default.nix index bfa45c9930e4..74ba47ceee1a 100644 --- a/pkgs/tools/filesystems/afpfs-ng/default.nix +++ b/pkgs/tools/filesystems/afpfs-ng/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "A client implementation of the Apple Filing Protocol"; license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj ]; - platform = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix index 35efa8533ab1..defdf6702ea7 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Old-style RAID configuration utility"; - longDescritipn = '' + longDescription = '' Old RAID configuration utility (still under development, though). It is fully compatible with modern kernels and mdadm recognizes its volumes. May be needed for rescuing an older system or nuking diff --git a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix index df14d7efda4e..1ddcbb2376c5 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { meta = { homepage = http://sourceware.org/lvm2/; - descriptions = "Tools to support Logical Volume Management (LVM) on Linux"; + description = "Tools to support Logical Volume Management (LVM) on Linux"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix index 4c7c5f1c3858..7beb3767b26b 100644 --- a/pkgs/tools/graphics/svgcleaner/default.nix +++ b/pkgs/tools/graphics/svgcleaner/default.nix @@ -20,6 +20,6 @@ buildRustPackage rec { homepage = "https://github.com/RazrFalcon/svgcleaner"; license = licenses.gpl2; platforms = platforms.all; - maintainer = [ maintainers.mehandes ]; + maintainers = [ maintainers.mehandes ]; }; } diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index ba54d4954c58..77ac02649ad3 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation { description = "A minimal composable infrastructure on top of libudev and libevdev"; homepage = "https://gitlab.com/interception/linux/tools"; license = stdenv.lib.licenses.gpl3; - maintainers = stdenv.lib.maintainers.vyp; + maintainers = [ stdenv.lib.maintainers.vyp ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/inputmethods/keyfuzz/default.nix b/pkgs/tools/inputmethods/keyfuzz/default.nix index f04afd639b7d..b930da02acc9 100644 --- a/pkgs/tools/inputmethods/keyfuzz/default.nix +++ b/pkgs/tools/inputmethods/keyfuzz/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Manipulate the scancode/keycode translation tables of keyboard drivers."; - homepace = http://0pointer.de/lennart/projects/keyfuzz/; + homepage = http://0pointer.de/lennart/projects/keyfuzz/; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ mboes ]; diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index 53755c8a19d2..3a243f9fdef0 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://www.ddcutil.com/; description = "Query and change Linux monitor settings using DDC/CI and USB"; license = licenses.gpl2; - maintainer = with maintainers; [ rnhmjoj ]; + maintainers = with maintainers; [ rnhmjoj ]; }; } diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index cb77edf0d29a..503f0df331cf 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -33,6 +33,6 @@ buildRustPackage rec { ''; homepage = https://the.exa.website; license = licenses.mit; - maintainer = [ maintainers.ehegnes ]; + maintainers = [ maintainers.ehegnes ]; }; } diff --git a/pkgs/tools/misc/geteltorito/default.nix b/pkgs/tools/misc/geteltorito/default.nix index 3af8eda1d1b4..7336665594a7 100644 --- a/pkgs/tools/misc/geteltorito/default.nix +++ b/pkgs/tools/misc/geteltorito/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extract the initial/default boot image from a CD image if existent"; homepage = https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/; - maintainer = [ maintainers.profpatsch ]; + maintainers = [ maintainers.profpatsch ]; license = licenses.gpl2; }; diff --git a/pkgs/tools/misc/gosu/default.nix b/pkgs/tools/misc/gosu/default.nix index 81606e1ca7f8..1c1fb05050f1 100644 --- a/pkgs/tools/misc/gosu/default.nix +++ b/pkgs/tools/misc/gosu/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = { description= "Tool that avoids TTY and signal-forwarding behavior of sudo and su"; homepage = "https://github.com/tianon/gosu"; - licence = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/homesick/default.nix b/pkgs/tools/misc/homesick/default.nix index 81e417ee5abd..0997b2268029 100644 --- a/pkgs/tools/misc/homesick/default.nix +++ b/pkgs/tools/misc/homesick/default.nix @@ -12,7 +12,7 @@ bundlerEnv { meta = with lib; { description = "Your home directory is your castle. Don't leave your dotfiles behind"; - long_description = + longDescription = '' Homesick is sorta like rip, but for dotfiles. It uses git to clone a repository containing dotfiles, and saves them in ~/.homesick. It then allows you to symlink all the dotfiles into diff --git a/pkgs/tools/misc/hostsblock/default.nix b/pkgs/tools/misc/hostsblock/default.nix index b6b2bc9a25cb..a0fcc6074dc0 100644 --- a/pkgs/tools/misc/hostsblock/default.nix +++ b/pkgs/tools/misc/hostsblock/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An ad- and malware-blocking script for Linux"; - website = http://gaenserich.github.io/hostsblock/; + homepage = http://gaenserich.github.io/hostsblock/; license = licenses.gpl3; maintainers = [ maintainers.nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix index e3e174e0204a..ed97601e5191 100644 --- a/pkgs/tools/misc/routino/default.nix +++ b/pkgs/tools/misc/routino/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = http://www.routino.org/; description = "OpenStreetMap Routing Software"; license = licenses.agpl3; - maintainter = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda ]; platforms = with platforms; linux; }; } diff --git a/pkgs/tools/misc/xdxf2slob/default.nix b/pkgs/tools/misc/xdxf2slob/default.nix index b5c3f9371459..444b14c5a63f 100644 --- a/pkgs/tools/misc/xdxf2slob/default.nix +++ b/pkgs/tools/misc/xdxf2slob/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { description = "Tool to convert XDXF dictionary files to slob format"; homepage = https://github.com/itkach/xdxf2slob/; license = licenses.gpl3; - maintainer = [ maintainers.rycee ]; + maintainers = [ maintainers.rycee ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index 9d2f83098b89..194758905ff2 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -19,6 +19,8 @@ in stdenv.mkDerivation { chmod +x $out/bin/burpsuite ''; + preferLocalBuild = true; + meta = { description = "An integrated platform for performing security testing of web applications"; longDescription = '' @@ -30,7 +32,6 @@ in stdenv.mkDerivation { homepage = https://portswigger.net/burp/; downloadPage = "https://portswigger.net/burp/freedownload"; license = [ stdenv.lib.licenses.unfree ]; - preferLocalBuild = true; platforms = jre.meta.platforms; hydraPlatforms = []; maintainers = [ stdenv.lib.maintainers.bennofs ]; diff --git a/pkgs/tools/networking/ocproxy/default.nix b/pkgs/tools/networking/ocproxy/default.nix index f2d4d979ceeb..c93e94e2f287 100644 --- a/pkgs/tools/networking/ocproxy/default.nix +++ b/pkgs/tools/networking/ocproxy/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OpenConnect proxy"; - longdescription = '' + longDescription = '' ocproxy is a user-level SOCKS and port forwarding proxy for OpenConnect based on lwIP. ''; diff --git a/pkgs/tools/networking/pixiewps/default.nix b/pkgs/tools/networking/pixiewps/default.nix index d9b44cc23116..b082a981ae74 100644 --- a/pkgs/tools/networking/pixiewps/default.nix +++ b/pkgs/tools/networking/pixiewps/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "An offline WPS bruteforce utility"; homepage = https://github.com/wiire/pixiewps; license = stdenv.lib.licenses.gpl3; - maintainer = stdenv.lib.maintainers.nico202; + maintainers = [ stdenv.lib.maintainers.nico202 ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix index 56025dd88c60..5fe69ede1a7d 100644 --- a/pkgs/tools/networking/ua/default.nix +++ b/pkgs/tools/networking/ua/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { meta = { homepage = https://github.com/sloonz/ua; license = stdenv.lib.licenses.isc; - shortDescription = "Universal Aggregator"; + description = "Universal Aggregator"; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ ttuegel ]; }; diff --git a/pkgs/tools/security/haka/default.nix b/pkgs/tools/security/haka/default.nix index f9c7f4eaf1c7..2b1708c9243c 100644 --- a/pkgs/tools/security/haka/default.nix +++ b/pkgs/tools/security/haka/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "A collection of tools that allows capturing TCP/IP packets and filtering them based on Lua policy files"; homepage = http://www.haka-security.org/; license = stdenv.lib.licenses.mpl20; - maintaineres = [ stdenv.lib.maintainers.tvestelind ]; + maintainers = [ stdenv.lib.maintainers.tvestelind ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix index 6d6a3461f771..b5d4317eac2d 100644 --- a/pkgs/tools/system/s-tui/default.nix +++ b/pkgs/tools/system/s-tui/default.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonPackage rec { meta = with stdenv.lib; { homepage = https://amanusk.github.io/s-tui/; - descrption = "Stress-Terminal UI monitoring tool"; + description = "Stress-Terminal UI monitoring tool"; license = licenses.gpl2; maintainers = with maintainers; [ infinisil ]; }; diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix index 921dbc22d415..a2b6e3e6c3bb 100644 --- a/pkgs/tools/text/ansifilter/default.nix +++ b/pkgs/tools/text/ansifilter/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl1; - maintainers = maintainers.Adjective-Object; + maintainers = [ maintainers.Adjective-Object ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/tools/text/odt2txt/default.nix index 42f80f29073f..187a6526dc3c 100644 --- a/pkgs/tools/text/odt2txt/default.nix +++ b/pkgs/tools/text/odt2txt/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Simple .odt to .txt converter"; homepage = http://stosberg.net/odt2txt; platforms = stdenv.lib.platforms.all; - lincense = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl2; maintainers = [ ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 01d7c152c8e1..2967ebf61877 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1108,7 +1108,7 @@ in { buildInputs = [ pkgs.lzma ]; meta = { - describe = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files"; + description = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files"; homepage = https://github.com/peterjc/backports.lzma; license = licenses.bsd3; }; @@ -18309,7 +18309,7 @@ in { meta = { description = "Library to implement a well-behaved Unix daemon process"; homepage = https://alioth.debian.org/projects/python-daemon/; - licenses = [ licenses.gpl3Plus licenses.asl20 ]; + license = [ licenses.gpl3Plus licenses.asl20 ]; }; };