diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-18 00:16:43 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-18 00:16:43 -0500 |
| commit | 124d47c65adc242374931c290708ff69b1290c67 (patch) | |
| tree | 7719b3af1e2bb41edd492cefa75771b8dccbce1c | |
| parent | 453a60ed9556f4cbbd1d3868419abd0a6c35992b (diff) | |
meta: fix fallout from #36275
| -rw-r--r-- | .github/CODEOWNERS | 1 | ||||
| -rw-r--r-- | doc/meta.xml | 2 | ||||
| -rwxr-xr-x | maintainers/scripts/hydra-eval-failures.py | 2 | ||||
| -rwxr-xr-x | maintainers/scripts/update.nix | 2 | ||||
| -rwxr-xr-x | maintainers/scripts/vanity.sh | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index bac601fbf82e..dde31a2c0c01 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -83,7 +83,6 @@ /pkgs/applications/editors/eclipse @rycee # https://github.com/NixOS/nixpkgs/issues/31401 -/lib/maintainers.nix @ghost /lib/licenses.nix @ghost # Qt / KDE diff --git a/doc/meta.xml b/doc/meta.xml index 356325991860..5dbe810810d1 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -174,7 +174,7 @@ meta-attributes</title> maintainers of this Nix expression. If you would like to be a maintainer of a package, you may want to add yourself to <link - xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/maintainers.nix"><filename>nixpkgs/lib/maintainers.nix</filename></link> + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix"><filename>nixpkgs/maintainers/maintainer-list.nix</filename></link> and write something like <literal>[ stdenv.lib.maintainers.alice stdenv.lib.maintainers.bob ]</literal>.</para></listitem> </varlistentry> diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py index ddc3c7c4a967..d0bd1913ba8a 100755 --- a/maintainers/scripts/hydra-eval-failures.py +++ b/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()} diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index c637540a5aa4..8d1e47c6bc95 100755 --- a/maintainers/scripts/update.nix +++ b/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 diff --git a/maintainers/scripts/vanity.sh b/maintainers/scripts/vanity.sh index 27e7741799f0..aa7d4ec967da 100755 --- a/maintainers/scripts/vanity.sh +++ b/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"; |