diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-02 00:13:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-02 00:13:38 +0000 |
| commit | 615351069b0ada528edceef0bbf86394a02b30bb (patch) | |
| tree | 460a87f62ba8e6696a4ec64d1276966ad88a9fce /maintainers | |
| parent | 2056957bd7591d39eb921c853a72cee278de4510 (diff) | |
| parent | 93f0dfda5b66c6f9ba986dcc644e6dc9145e59a0 (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 6 | ||||
| -rw-r--r-- | maintainers/scripts/eval-release.nix | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 81b4756699977..22f5178de1126 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11511,6 +11511,12 @@ githubId = 3737; name = "Peter Jones"; }; + phip1611 = { + email = "phip1611@gmail.com"; + github = "phip1611"; + githubId = 5737016; + name = "Philipp Schuster"; + }; pkharvey = { email = "kayharvey@protonmail.com"; github = "pkharvey"; diff --git a/maintainers/scripts/eval-release.nix b/maintainers/scripts/eval-release.nix index bb9572cbc7956..4f0ca24650251 100644 --- a/maintainers/scripts/eval-release.nix +++ b/maintainers/scripts/eval-release.nix @@ -17,6 +17,7 @@ let if (builtins.tryEval attrs.drvPath).success then { inherit (attrs) name drvPath; } else { failed = true; } + else if attrs == null then {} else { recurseForDerivations = true; } // mapAttrs (n: v: let path' = path ++ [n]; in trace path' (recurse path' v)) attrs else { }; |