diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-02-19 17:15:31 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-02-19 17:15:31 +0100 |
| commit | 8f50f1ce107914ae5a07bd9aff6649021deb6fca (patch) | |
| tree | 12a65659f7a05af761500651b5260b34eea6abab /maintainers | |
| parent | c34b032ccb5cb1cf282ed141d7f60420879e2b42 (diff) | |
| parent | e4f96ad7d9fa4ff2ada4936cab6abaa8b0e823c0 (diff) | |
| download | nixpkgs-8f50f1ce107914ae5a07bd9aff6649021deb6fca.tar nixpkgs-8f50f1ce107914ae5a07bd9aff6649021deb6fca.tar.gz nixpkgs-8f50f1ce107914ae5a07bd9aff6649021deb6fca.tar.bz2 nixpkgs-8f50f1ce107914ae5a07bd9aff6649021deb6fca.tar.lz nixpkgs-8f50f1ce107914ae5a07bd9aff6649021deb6fca.tar.xz nixpkgs-8f50f1ce107914ae5a07bd9aff6649021deb6fca.tar.zst nixpkgs-8f50f1ce107914ae5a07bd9aff6649021deb6fca.zip | |
Merge branch 'staging-next' into staging
Resolved the following conflicts: - kernel flags between 09176d28a0ebbd8bae35f92406a48cded78ac9f7 and 2b28822d8dec38fd62ef17643ec71da3bb488619 - clojure-lsp between 3fa00685ce21fb1a4218d444d0862ebcb2b99706 and e03c068af5c9ca950214cd6c3b5cfe67f595da88
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index da8fdd1a64a..747ce847541 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2103,6 +2103,12 @@ email = "christoph.senjak@googlemail.com"; name = "Christoph-Simon Senjak"; }; + davhau = { + email = "d.hauer.it@gmail.com"; + name = "David Hauer"; + github = "DavHau"; + githubId = 42246742; + }; david-sawatzke = { email = "d-nix@sawatzke.dev"; github = "david-sawatzke"; |