From f43ea6e7ff63d672fcefc2959bf03e66aefee750 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 6 Mar 2018 16:06:03 +0000
Subject: [PATCH] Merge pull request #36275 from oxij/lib/maintainers-list

lib: rename maintainers-list.nix into maintainers/maintainer-list.nix
(cherry picked from commit 1bd790d613d28d40e5ac999639602768b39d74b3)
The intention is to reduce conflicts during maintenance.
---
 lib/default.nix                                             | 2 +-
 lib/maintainers-list.nix => maintainers/maintainer-list.nix | 0
 pkgs/stdenv/generic/check-meta.nix                          | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/maintainers-list.nix => maintainers/maintainer-list.nix (100%)

diff --git a/lib/default.nix b/lib/default.nix
index 4c36f3b0d790..7bd02106f7b6 100644
--- 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 b/maintainers/maintainer-list.nix
similarity index 100%
rename from lib/maintainers-list.nix
rename to maintainers/maintainer-list.nix
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 93d0f4cc9805..a1878dc01367 100644
--- 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;