summary refs log tree commit diff
path: root/pkgs/stdenv/generic
diff options
context:
space:
mode:
authorDan Peebles <pumpkin@me.com>2017-04-28 23:02:37 -0400
committerDan Peebles <pumpkin@me.com>2017-04-28 23:07:42 -0400
commit1a4ca220e15480818b78041d46bf0ca438671d33 (patch)
treec67d61fcbbc296f4ca15f75d6c2a39b3a6144727 /pkgs/stdenv/generic
parent76137a801d96294e90a9d4d3132c7516d86cb567 (diff)
downloadnixlib-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/stdenv/generic')
-rw-r--r--pkgs/stdenv/generic/default.nix8
1 files changed, 6 insertions, 2 deletions
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: