diff options
author | Dan Peebles <pumpkin@me.com> | 2017-04-28 23:02:37 -0400 |
---|---|---|
committer | Dan Peebles <pumpkin@me.com> | 2017-04-28 23:07:42 -0400 |
commit | 1a4ca220e15480818b78041d46bf0ca438671d33 (patch) | |
tree | c67d61fcbbc296f4ca15f75d6c2a39b3a6144727 /pkgs | |
parent | 76137a801d96294e90a9d4d3132c7516d86cb567 (diff) | |
download | nixlib-1a4ca220e15480818b78041d46bf0ca438671d33.tar nixlib-1a4ca220e15480818b78041d46bf0ca438671d33.tar.gz nixlib-1a4ca220e15480818b78041d46bf0ca438671d33.tar.bz2 nixlib-1a4ca220e15480818b78041d46bf0ca438671d33.tar.lz nixlib-1a4ca220e15480818b78041d46bf0ca438671d33.tar.xz nixlib-1a4ca220e15480818b78041d46bf0ca438671d33.tar.zst nixlib-1a4ca220e15480818b78041d46bf0ca438671d33.zip |
treewide: fix assorted issues revealed by the meta checker
Turns out a couple of the licenses were wrong, as well as being strings.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/libxml2/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libxslt/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/misc/binutils/default.nix | 2 | ||||
-rw-r--r-- | pkgs/stdenv/generic/default.nix | 8 |
4 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index d44a8c973fdc..fb397ace7941 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -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 ]; }; diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 7798c806982b..4647eecf87d4 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -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 ]; }; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 7b71a8e95d90..b0819f6133b6 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -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; }; } diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 4bcd7b3260d0..177eeee93837 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -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: |