diff options
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 15 | ||||
| -rwxr-xr-x | maintainers/scripts/haskell/merge-and-open-pr.sh | 8 |
2 files changed, 19 insertions, 4 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bec0865f28b1b..4d3d76374d13c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -50,7 +50,8 @@ More fields may be added in the future, however, in order to comply with GDPR this file should stay as minimal as possible. When editing this file: - * keep the list alphabetically sorted + * keep the list alphabetically sorted, check with: + nix-instantiate --eval maintainers/scripts/check-maintainers-sorted.nix * test the validity of the format with: nix-build lib/tests/maintainers.nix @@ -2769,7 +2770,7 @@ name = "Hubert Jasudowicz"; }; chkno = { - email = "chuck@intelligence.org"; + email = "scottworley@scottworley.com"; github = "chkno"; githubId = 1118859; name = "Scott Worley"; @@ -11229,6 +11230,16 @@ githubId = 13920346; name = "Sébastien Iooss"; }; + networkexception = { + name = "networkException"; + email = "nix@nwex.de"; + matrix = "@networkexception:chat.upi.li"; + github = "networkException"; + githubId = 42888162; + keys = [{ + fingerprint = "A0B9 48C5 A263 55C2 035F 8567 FBB7 2A94 52D9 1A72"; + }]; + }; neverbehave = { email = "i@never.pet"; github = "NeverBehave"; diff --git a/maintainers/scripts/haskell/merge-and-open-pr.sh b/maintainers/scripts/haskell/merge-and-open-pr.sh index 8b292ca50c8c9..cdba24f0c2077 100755 --- a/maintainers/scripts/haskell/merge-and-open-pr.sh +++ b/maintainers/scripts/haskell/merge-and-open-pr.sh @@ -53,6 +53,10 @@ if ! gh auth status 2>/dev/null ; then die "You must setup the \`gh\` command. Run \`gh auth login\`." fi +# Make sure this is configured before we start doing anything +push_remote="$(git config branch.haskell-updates.pushRemote \ + || die 'Can'\''t determine pushRemote for haskell-updates. Please set using `git config branch.haskell-updates.pushremote <remote name>`.')" + # Fetch nixpkgs to get an up-to-date origin/haskell-updates branch. echo "Fetching origin..." git fetch origin >/dev/null @@ -89,8 +93,8 @@ echo "Regenerating Hackage packages..." ./maintainers/scripts/haskell/regenerate-hackage-packages.sh --fast --do-commit # Push these new commits to the haskell-updates branch -echo "Pushing commits just created to the remote haskell-updates branch..." -git push +echo "Pushing commits just created to the remote $push_remote/haskell-updates branch..." +git push "$push_remote" haskell-updates # Open new PR new_pr_body=$(cat <<EOF |