From 90b9719f4fc95e54400a66bffcc8044c568cfa4b Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Sat, 29 Apr 2017 04:24:34 +0000 Subject: [PATCH] treewide: fix the remaining issues with meta attributes --- pkgs/applications/kde/kdelibs/default.nix | 2 +- .../gnome-2/bindings/gnome-python/default.nix | 2 +- pkgs/development/libraries/ctpp2/default.nix | 2 +- .../libraries/libsamplerate/default.nix | 2 +- .../libraries/libtiger/default.nix | 1 - .../libraries/libytnef/default.nix | 2 +- .../libraries/physics/fastnlo/default.nix | 2 +- pkgs/development/libraries/speex/default.nix | 2 +- .../libraries/speexdsp/default.nix | 2 +- .../misc/avr-gcc-with-avr-libc/default.nix | 1 - .../python-modules/astroid/default.nix | 2 +- .../python-modules/pylint/default.nix | 2 +- .../linux/bridge-utils/default.nix | 2 +- pkgs/os-specific/linux/kbd/default.nix | 2 +- pkgs/os-specific/linux/lvm2/default.nix | 2 +- pkgs/servers/pulseaudio/default.nix | 2 +- pkgs/stdenv/generic/default.nix | 5 ++- pkgs/tools/inputmethods/anthy/default.nix | 2 +- .../package-management/gx/go/default.nix | 2 +- pkgs/tools/typesetting/tex/tetex/default.nix | 2 +- pkgs/top-level/python-packages.nix | 36 +++++++++---------- 21 files changed, 39 insertions(+), 38 deletions(-) diff --git a/pkgs/applications/kde/kdelibs/default.nix b/pkgs/applications/kde/kdelibs/default.nix index 8adcd4d1b472..cae1b9b7e7f7 100644 --- a/pkgs/applications/kde/kdelibs/default.nix +++ b/pkgs/applications/kde/kdelibs/default.nix @@ -43,7 +43,7 @@ kdeApp { meta = { platforms = lib.platforms.linux; homepage = "http://www.kde.org"; - licenses = with lib.licenses; [ gpl2 fdl12 lgpl21 ]; + license = with lib.licenses; [ gpl2 fdl12 lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; } diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix index d7861285cb1e..9e099a17d277 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { homepage = "http://pygtk.org/"; description = "Python wrapper for GNOME libraries"; platforms = platforms.linux; - licenses = licenses.lgpl2; + license = licenses.lgpl2; maintainers = with maintainers; [ qknight ]; }; } diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix index 905121286c81..bb1d4458f50c 100644 --- a/pkgs/development/libraries/ctpp2/default.nix +++ b/pkgs/development/libraries/ctpp2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A high performance templating engine"; homepage = http://ctpp.havoc.ru; - maintiainers = with stdenv.lib.maintainers; [ robbinch ]; + maintainers = with stdenv.lib.maintainers; [ robbinch ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index faeeb34d65dd..612dc72cdaf2 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { # you can choose one of the following licenses: # GPL or a commercial-use license (available at # http://www.mega-nerd.com/SRC/libsamplerate-cul.pdf) - licenses = with licenses; [ gpl3.shortName unfree ]; + license = with licenses; [ gpl3.shortName unfree ]; maintainers = with maintainers; [ lovek323 wkennington ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/libtiger/default.nix b/pkgs/development/libraries/libtiger/default.nix index 58e92f110185..deab30430359 100644 --- a/pkgs/development/libraries/libtiger/default.nix +++ b/pkgs/development/libraries/libtiger/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/p/libtiger/; - authors = [ "Vincent Penquerc'h" ]; description = "A rendering library for Kate streams using Pango and Cairo"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libytnef/default.nix b/pkgs/development/libraries/libytnef/default.nix index cbf675af4da5..8af7d5d8797c 100644 --- a/pkgs/development/libraries/libytnef/default.nix +++ b/pkgs/development/libraries/libytnef/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "Yeraze's TNEF Stream Reader - for winmail.dat files"; license = licenses.gpl2Plus; - platform = platforms.all; + platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix index 307bf1b27db3..e07583fccb5b 100644 --- a/pkgs/development/libraries/physics/fastnlo/default.nix +++ b/pkgs/development/libraries/physics/fastnlo/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - descritption = "A computer code to create and evaluate fast interpolation tables of pre-computed coefficients in perturbation theory for observables in hadron-induced processes"; + description = "A computer code to create and evaluate fast interpolation tables of pre-computed coefficients in perturbation theory for observables in hadron-induced processes"; license = stdenv.lib.licenses.gpl3; homepage = http://fastnlo.hepforge.org; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix index 199c0d007344..602359965f12 100644 --- a/pkgs/development/libraries/speex/default.nix +++ b/pkgs/development/libraries/speex/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - hompage = http://www.speex.org/; + homepage = http://www.speex.org/; description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index 9ec7d651ccb2..a96e808a97e4 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.isAarch64 "--disable-neon"; meta = with stdenv.lib; { - hompage = http://www.speex.org/; + homepage = http://www.speex.org/; description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix index 237c4e4027f1..1035757fb80e 100644 --- a/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix +++ b/pkgs/development/misc/avr-gcc-with-avr-libc/default.nix @@ -71,7 +71,6 @@ stdenv.mkDerivation { description = "AVR development environment including binutils, avr-gcc and avr-libc"; # I've tried compiling the packages separately.. too much hassle. This just works. Fine. license = ["GPL" "LGPL"]; # see single packages .. - homepage = []; # dito platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 76f58e695f28..a690399118d8 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -28,7 +28,7 @@ description = "A abstract syntax tree for Python with inference support"; homepage = http://bitbucket.org/logilab/astroid; license = licenses.lgpl2; - platform = platforms.all; + platforms = platforms.all; maintainers = with maintainers; [ nand0p ]; }; } diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 844d2e229547..67604c3f2537 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -35,7 +35,7 @@ meta = with stdenv.lib; { homepage = http://www.logilab.org/project/pylint; description = "A bug and style checker for Python"; - platform = platforms.all; + platforms = platforms.all; license = licenses.gpl1Plus; maintainers = with maintainers; [ nand0p ]; }; diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix index 2fdf728ef4e1..4d4a51b984a5 100644 --- a/pkgs/os-specific/linux/bridge-utils/default.nix +++ b/pkgs/os-specific/linux/bridge-utils/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "http://sourceforge.net/projects/bridge/"; - homepage = [ "http://www.linux-foundation.org/en/Net:Bridge/" "http://sourceforge.net/projects/bridge/" ]; + homepage = "http://www.linux-foundation.org/en/Net:Bridge/"; license = "GPL"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index a3f21b51b061..6e8893cc37d6 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { homepage = ftp://ftp.altlinux.org/pub/people/legion/kbd/; description = "Linux keyboard utilities and keyboard maps"; platforms = platforms.linux; - licenses = licenses.gpl2Plus; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 9645a2d16b52..eb4d1ab04238 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -60,7 +60,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; maintainers = with stdenv.lib.maintainers; [raskin]; inherit version; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 680c9dfcb601..ba514ccdbcbc 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation rec { meta = { description = "Sound server for POSIX and Win32 systems"; homepage = http://www.pulseaudio.org/; - licenses = lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ lovek323 wkennington ]; platforms = lib.platforms.unix; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 177eeee93837..abb08dfb98cd 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -18,7 +18,7 @@ let lib = import ../../../lib; in lib.makeOverridable ( let - shouldCheckMeta = config.checkMeta or false; + shouldCheckMeta = config.checkMeta or true; allowUnfree = config.allowUnfree or false || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1"; @@ -221,12 +221,15 @@ let # Weirder stuff that doesn't appear in the documentation? version = str; + tag = str; updateWalker = bool; executables = listOf str; outputsToInstall = listOf str; position = str; repositories = attrsOf str; isBuildPythonPackage = platforms; + schedulingPriority = str; + downloadURLRegexp = str; }; checkMetaAttr = k: v: diff --git a/pkgs/tools/inputmethods/anthy/default.nix b/pkgs/tools/inputmethods/anthy/default.nix index 4fbd0965c785..c11fae3888e4 100644 --- a/pkgs/tools/inputmethods/anthy/default.nix +++ b/pkgs/tools/inputmethods/anthy/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Hiragana text to Kana Kanji mixed text Japanese input method"; - homepace = http://sourceforge.jp/projects/anthy/; + homepage = http://sourceforge.jp/projects/anthy/; license = licenses.gpl2Plus; maintainers = with maintainers; [ ericsagnes ]; platforms = platforms.linux; diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix index 877d5c6540a0..aa5acfa22d58 100644 --- a/pkgs/tools/package-management/gx/go/default.nix +++ b/pkgs/tools/package-management/gx/go/default.nix @@ -29,6 +29,6 @@ buildGoPackage rec { description = "A tool for importing go packages into gx"; homepage = https://github.com/whyrusleeping/gx-go; license = licenses.mit; - maintainer = with maintainers; [ zimbatm ]; + maintainers = with maintainers; [ zimbatm ]; }; } diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix index 83bead83ea3e..313474745d10 100644 --- a/pkgs/tools/typesetting/tex/tetex/default.nix +++ b/pkgs/tools/typesetting/tex/tetex/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A full-featured (La)TeX distribution"; homepage = http://www.tug.org/tetex/; - matintainers = with maintainers; [ lovek323 ]; + maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; hydraPlatforms = []; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 389e11e1d25f..ec6483972683 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1176,7 +1176,7 @@ in { }; meta = with pkgs.stdenv.lib; { - descriptions = "Library for reading, writing and rewriting python AST"; + description = "Library for reading, writing and rewriting python AST"; homepage = https://github.com/berkerpeksag/astor; license = licenses.bsd3; maintainers = with maintainers; [ nixy ]; @@ -5214,7 +5214,7 @@ in { meta = { license = licenses.mit; - website = "https://pypi.python.org/pypi/pytest-cache/"; + homepage = "https://pypi.python.org/pypi/pytest-cache/"; description = "pytest plugin with mechanisms for caching across test runs"; }; }; @@ -5232,7 +5232,7 @@ in { meta = { license = licenses.mit; - website = https://pypi.python.org/pypi/pytest-catchlog/; + homepage = https://pypi.python.org/pypi/pytest-catchlog/; description = "py.test plugin to catch log messages. This is a fork of pytest-capturelog."; }; }; @@ -5308,7 +5308,7 @@ in { meta = { license = licenses.mit; - website = "https://pypi.python.org/pypi/pytest-flakes"; + homepage = "https://pypi.python.org/pypi/pytest-flakes"; description = "pytest plugin to check source code with pyflakes"; }; }; @@ -5354,7 +5354,7 @@ in { meta = { license = licenses.mit; - website = "https://pypi.python.org/pypi/pytest-pep8"; + homepage = "https://pypi.python.org/pypi/pytest-pep8"; description = "pytest plugin to check PEP8 requirements"; }; }; @@ -5419,7 +5419,7 @@ in { meta = { license = licenses.asl20; - website = "https://pypi.python.org/pypi/pytest-quickcheck"; + homepage = "https://pypi.python.org/pypi/pytest-quickcheck"; description = "pytest plugin to generate random data inspired by QuickCheck"; }; }; @@ -8164,7 +8164,7 @@ in { description = "Cross-platform Bluetooth API for Python"; maintainers = with maintainers; [ leenaars ]; license = licenses.gpl3; - platform = platforms.all; + platforms = platforms.all; }; }; @@ -8799,7 +8799,7 @@ in { meta = { description = "A Python-based build/distribution/deployment scripting tool"; homepage = http://github.com/paver/paver; - matinainers = with maintainers; [ lovek323 ]; + maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; }; @@ -9089,7 +9089,7 @@ in { description = "Call graph visualizations for Python applications"; maintainers = with maintainers; [ auntie ]; license = licenses.gpl2; - platform = platforms.all; + platforms = platforms.all; }; }; @@ -9225,7 +9225,7 @@ in { description = "Python port of libaxolotl-android"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl3; - platform = platforms.all; + platforms = platforms.all; }; }; @@ -9243,7 +9243,7 @@ in { description = "Curve25519 with ed25519 signatures"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl3; - platform = platforms.all; + platforms = platforms.all; }; }; @@ -9268,7 +9268,7 @@ in { description = "Postfix policy engine for Sender Policy Framework (SPF) checking"; maintainers = with maintainers; [ abbradar ]; license = licenses.asl20; - platform = platforms.all; + platforms = platforms.all; }; }; @@ -9473,7 +9473,7 @@ in { description = "Python API for Sendmail Milters (SPF)"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl2; - platform = platforms.all; + platforms = platforms.all; }; }; @@ -9674,7 +9674,7 @@ in { homepage = "http://sarge.readthedocs.org/"; description = "A wrapper for subprocess which provides command pipeline functionality"; license = licenses.bsd3; - platform = platforms.all; + platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; }; }; @@ -14590,7 +14590,7 @@ in { buildInputs = with self; [nose]; meta = { - decription = "The fastest markdown parser in pure Python"; + description = "The fastest markdown parser in pure Python"; homepage = https://github.com/lepture/mistune; license = licenses.bsd3; }; @@ -15565,7 +15565,7 @@ in { propagatedBuildInputs = with self ; [ aiodns pyasn1 pkgs.gnupg1 pyasn1-modules]; meta = { - meta = "Elegant Python library for XMPP"; + description = "Elegant Python library for XMPP"; license = licenses.mit; homepage = https://dev.louiz.org/projects/slixmpp; }; @@ -22821,7 +22821,7 @@ in { buildInputs = with self; [ appdirs ]; meta = with pkgs.stdenv.lib; { - descriptions = "A python Lex/Yacc that works with RPython"; + description = "A python Lex/Yacc that works with RPython"; homepage = https://github.com/alex/rply; license = licenses.bsd3; maintainers = with maintainers; [ nixy ]; @@ -25666,7 +25666,7 @@ in { meta = { description = "Quick Response code generation for Python"; - home = "https://pypi.python.org/pypi/qrcode"; + homepage = "https://pypi.python.org/pypi/qrcode"; license = licenses.bsd3; }; };