Merge pull request #37296 from matthewbauer/fix-maintainers-path

Fix fallout from #36275

maintainers/scripts/hydra-eval-failures.py

@@ -13,7 +13,7 @@ from pyquery import PyQuery as pq
 
 
 maintainers_json = subprocess.check_output([
-    'nix-instantiate', '-E', 'import ./lib/maintainers.nix {}', '--eval', '--json'
+    'nix-instantiate', '-E', 'import ./maintainers/maintainer-list.nix {}', '--eval', '--json'
 ])
 maintainers = json.loads(maintainers_json)
 MAINTAINERS = {v: k for k, v in maintainers.iteritems()}

maintainers/scripts/update.nix

@@ -45,7 +45,7 @@ let
     let
       maintainer =
         if ! builtins.hasAttr maintainer' pkgs.lib.maintainers then
-          builtins.throw "Maintainer with name `${maintainer'} does not exist in `lib/maintainers.nix`."
+          builtins.throw "Maintainer with name `${maintainer'} does not exist in `maintainers/maintainer-list.nix`."
         else
           builtins.getAttr maintainer' pkgs.lib.maintainers;
     in

maintainers/scripts/vanity.sh

@@ -10,7 +10,7 @@ git_data="$(echo "$raw_git_log" | grep 'Author:' |
 
 # Name - nick - email correspondence from log and from maintainer list
 # Also there are a few manual entries
-maintainers="$(cat "$(dirname "$0")/../../lib/maintainers.nix" |
+maintainers="$(cat "$(dirname "$0")/../maintainer-list.nix" |
   grep '=' | sed -re 's/\\"/''/g;
   s/[ 	]*([^ 	=]*)[ 	]*=[ 	]*" *(.*[^ ]) *[<](.*)[>] *".*/\1\t\2\t\3/')"
 git_lines="$( ( echo "$git_data";