Merge pull request #36275 from oxij/lib/maintainers-list

lib: rename maintainers-list.nix into maintainers/maintainer-list.nix
NixOS · Mar 6, 2018 · 1bd790d · 1bd790d
2 parents 346e68d + 610b5b8
commit 1bd790d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/lib/default.nix b/lib/default.nix
@@ -21,7 +21,7 @@ let
 
     # packaging
     customisation = callLibs ./customisation.nix;
-    maintainers = import ./maintainers-list.nix;
+    maintainers = import ../maintainers/maintainer-list.nix;
     meta = callLibs ./meta.nix;
     sources = callLibs ./sources.nix;
     versions = callLibs ./versions.nix;

diff --git a/lib/maintainers-list.nix → maintainers/maintainer-list.nix b/lib/maintainers-list.nix → maintainers/maintainer-list.nix
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
@@ -144,7 +144,7 @@ let
     homepage = either (listOf str) str;
     downloadPage = str;
     license = either (listOf lib.types.attrs) (either lib.types.attrs str);
-    maintainers = listOf str;
+    maintainers = listOf (attrsOf str);
     priority = int;
     platforms = listOf str;
     hydraPlatforms = listOf str;