treewide: fix assorted issues revealed by the meta checker

Turns out a couple of the licenses were wrong, as well as being strings.
This commit is contained in:
Dan Peebles 2017-04-28 23:02:37 -04:00
parent 76137a801d
commit 1a4ca220e1
4 changed files with 9 additions and 5 deletions

View File

@ -70,7 +70,7 @@ in stdenv.mkDerivation rec {
meta = {
homepage = http://xmlsoft.org/;
description = "An XML parsing library for C";
license = "bsd";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.eelco ];
};

View File

@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = http://xmlsoft.org/XSLT/;
description = "A C library and tools to do XSL transformations";
license = "bsd";
license = licenses.mit;
platforms = platforms.unix;
maintainers = [ maintainers.eelco ];
};

View File

@ -95,6 +95,6 @@ stdenv.mkDerivation rec {
/* Give binutils a lower priority than gcc-wrapper to prevent a
collision due to the ld/as wrappers/symlinks in the latter. */
priority = "10";
priority = 10;
};
}

View File

@ -205,14 +205,14 @@ let
'' + ((builtins.getAttr reason remediation) attrs));
metaTypes = with lib.types; {
metaTypes = with lib.types; rec {
# These keys are documented
description = str;
longDescription = str;
branch = str;
homepage = str;
downloadPage = str;
license = either (listOf lib.types.attrs) lib.types.attrs;
license = either (listOf lib.types.attrs) (either lib.types.attrs str);
maintainers = listOf str;
priority = int;
platforms = listOf str;
@ -223,6 +223,10 @@ let
version = str;
updateWalker = bool;
executables = listOf str;
outputsToInstall = listOf str;
position = str;
repositories = attrsOf str;
isBuildPythonPackage = platforms;
};
checkMetaAttr = k: v: