Skip to content

Commit

Permalink
treewide: fix the remaining issues with meta attributes
Browse files Browse the repository at this point in the history
  • Loading branch information
@copumpkin
copumpkin committed Apr 29, 2017
1 parent 1a4ca22 commit 90b9719
Show file tree
Hide file tree
Showing 21 changed files with 39 additions and 38 deletions.
2 changes: 1 addition & 1 deletion pkgs/applications/kde/kdelibs/default.nix
View file
Expand Up @@ -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 ];
};
}
2 changes: 1 addition & 1 deletion pkgs/desktops/gnome-2/bindings/gnome-python/default.nix
View file
Expand Up @@ -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 ];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/libraries/ctpp2/default.nix
View file
Expand Up @@ -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;
};
}
2 changes: 1 addition & 1 deletion pkgs/development/libraries/libsamplerate/default.nix
View file
Expand Up @@ -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;
};
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/libraries/libtiger/default.nix
View file
Expand Up @@ -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;
};
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/libraries/libytnef/default.nix
View file
Expand Up @@ -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 ];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/libraries/physics/fastnlo/default.nix
View file
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/libraries/speex/default.nix
View file
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/libraries/speexdsp/default.nix
View file
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/misc/avr-gcc-with-avr-libc/default.nix
View file
Expand Up @@ -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 ..

This comment has been minimized.

Sign in to view

Copy link
@8573

8573 Apr 29, 2017

Contributor

This license attribute isn't correct, is it?

This comment has been minimized.

Sign in to view

Copy link
@copumpkin

copumpkin Apr 29, 2017

Author Member

I don't know, I only checked a few of them. I decided to allow a list of strings in the type spec just to get us to some baseline standardization but I think we should iteratively make the type spec more restrictive until everything is good :)
homepage = []; # dito
platforms = platforms.linux;
};
}
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/astroid/default.nix
View file
Expand Up @@ -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 ];
};
}
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/pylint/default.nix
View file
Expand Up @@ -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 ];
};
Expand Down
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/bridge-utils/default.nix
View file
Expand Up @@ -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;
};
Expand Down
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/kbd/default.nix
View file
Expand Up @@ -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;
};
}
2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/lvm2/default.nix
View file
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/servers/pulseaudio/default.nix
View file
Expand Up @@ -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;

Expand Down
5 changes: 4 additions & 1 deletion pkgs/stdenv/generic/default.nix
View file
Expand Up @@ -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";

Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion pkgs/tools/inputmethods/anthy/default.nix
View file
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/tools/package-management/gx/go/default.nix
View file
Expand Up @@ -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 ];
};
}
2 changes: 1 addition & 1 deletion pkgs/tools/typesetting/tex/tetex/default.nix
View file
Expand Up @@ -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 = [];
};
Expand Down
36 changes: 18 additions & 18 deletions pkgs/top-level/python-packages.nix
View file
Expand Up @@ -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 ];
Expand Down Expand Up @@ -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";
};
};
Expand All @@ -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.";
};
};
Expand Down Expand Up @@ -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";
};
};
Expand Down Expand Up @@ -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";
};
};
Expand Down Expand Up @@ -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";
};
};
Expand Down Expand Up @@ -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;
};
};

Expand Down Expand Up @@ -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;
};
};
Expand Down Expand Up @@ -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;
};
};

Expand Down Expand Up @@ -9225,7 +9225,7 @@ in {
description = "Python port of libaxolotl-android";
maintainers = with maintainers; [ abbradar ];
license = licenses.gpl3;
platform = platforms.all;
platforms = platforms.all;
};
};

Expand All @@ -9243,7 +9243,7 @@ in {
description = "Curve25519 with ed25519 signatures";
maintainers = with maintainers; [ abbradar ];
license = licenses.gpl3;
platform = platforms.all;
platforms = platforms.all;
};
};

Expand 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;
};
};

Expand Down Expand Up @@ -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;
};
};

Expand Down Expand Up @@ -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 ];
};
};
Expand Down Expand Up @@ -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;
};
Expand Down Expand Up @@ -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;
};
Expand Down Expand Up @@ -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 ];
Expand Down Expand Up @@ -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;
};
};
Expand Down

0 comments on commit 90b9719

Please sign in to comment.