瀏覽代碼

meta: fix fallout from #36275

nixos-19.03
Matthew Bauer 3 年之前
父節點
當前提交
124d47c65a
共有 5 個文件被更改,包括 4 次插入5 次删除
  1. 0
    1
      .github/CODEOWNERS
  2. 1
    1
      doc/meta.xml
  3. 1
    1
      maintainers/scripts/hydra-eval-failures.py
  4. 1
    1
      maintainers/scripts/update.nix
  5. 1
    1
      maintainers/scripts/vanity.sh

+ 0
- 1
.github/CODEOWNERS 查看文件

@@ -83,7 +83,6 @@
83 83
 /pkgs/applications/editors/eclipse @rycee
84 84
 
85 85
 # https://github.com/NixOS/nixpkgs/issues/31401
86
-/lib/maintainers.nix @ghost
87 86
 /lib/licenses.nix @ghost
88 87
 
89 88
 # Qt / KDE

+ 1
- 1
doc/meta.xml 查看文件

@@ -174,7 +174,7 @@ meta-attributes</title>
174 174
     maintainers of this Nix expression. If
175 175
     you would like to be a maintainer of a package, you may want to add
176 176
     yourself to <link
177
-    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/maintainers.nix"><filename>nixpkgs/lib/maintainers.nix</filename></link>
177
+    xlink:href="https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix"><filename>nixpkgs/maintainers/maintainer-list.nix</filename></link>
178 178
     and write something like <literal>[ stdenv.lib.maintainers.alice
179 179
     stdenv.lib.maintainers.bob ]</literal>.</para></listitem>
180 180
   </varlistentry>

+ 1
- 1
maintainers/scripts/hydra-eval-failures.py 查看文件

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

+ 1
- 1
maintainers/scripts/update.nix 查看文件

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

+ 1
- 1
maintainers/scripts/vanity.sh 查看文件

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

Loading…
取消
儲存