diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-11-17 18:06:22 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-11-17 18:06:22 +0000 |
| commit | 1161741351cbc60581eaecb4df2e1036b1fafd55 (patch) | |
| tree | 6c39e36cc3ebeb91d502900c95d33cc26aec7b22 /lib | |
| parent | eb3653482008bf791da71613714294ed4dbfef52 (diff) | |
| parent | 73598e3787b34385d04e46830e9a7fdf89cc8ede (diff) | |
| download | nixpkgs-1161741351cbc60581eaecb4df2e1036b1fafd55.tar nixpkgs-1161741351cbc60581eaecb4df2e1036b1fafd55.tar.gz nixpkgs-1161741351cbc60581eaecb4df2e1036b1fafd55.tar.bz2 nixpkgs-1161741351cbc60581eaecb4df2e1036b1fafd55.tar.lz nixpkgs-1161741351cbc60581eaecb4df2e1036b1fafd55.tar.xz nixpkgs-1161741351cbc60581eaecb4df2e1036b1fafd55.tar.zst nixpkgs-1161741351cbc60581eaecb4df2e1036b1fafd55.zip | |
Merge branch 'master' into staging
* master: (28 commits) go_1_9: skip flaky TestWaitGroupMisuse2 erlangR18: fix patch hashes with fetchpatch xml2: replace dead links nixos/pam: fix docs about path to u2f_keys file cinelerra: add a note about parallel building msmtp: install docs and examples (#31769) kernel: Fix out-of-tree modules on aarch64 nixos/tests/acme: update terms of service to fix test gixy: init at 0.1.8 pythonPackages.ConfigArgParse: 0.9.3 -> 0.12.0, refactor, move to python-modules mono: init at 4.8 wal-g: fix license so not to break evaluation wal-g: init at 0.1.2 maintainers: add backuitist nixos/prometheus: Correct documentation for external_labels spidermonkey: replace broken links vagrant: removed custom rake gem vagrant: 2.0.0 -> 2.0.1 nixos/prometheus: add external_labels option nixos/prometheus: add scrape_configs.honor_labels ...
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/maintainers.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index f3790d62add..49fdaf08ecd 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -67,6 +67,7 @@ avnik = "Alexander V. Nikolaev <avn@avnik.info>"; aycanirican = "Aycan iRiCAN <iricanaycan@gmail.com>"; bachp = "Pascal Bach <pascal.bach@nextrem.ch>"; + backuitist = "Bruno Bieth"; badi = "Badi' Abdul-Wahid <abdulwahidc@gmail.com>"; balajisivaraman = "Balaji Sivaraman <sivaraman.balaji@gmail.com>"; barrucadu = "Michael Walker <mike@barrucadu.co.uk>"; |