diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-11-21 22:48:36 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-11-21 22:48:36 +0000 |
| commit | b8e1e7191e99af29125fbb37f42cb68f43af800c (patch) | |
| tree | 1ca52bd4c93d50473ebdb7cebc7721140e84a924 /lib | |
| parent | 71a2a5ae40b2b94150365bb846fb78b620562df8 (diff) | |
| parent | 91d2cf96424cc5209d3cf799bc2b4fa52af34596 (diff) | |
| download | nixpkgs-b8e1e7191e99af29125fbb37f42cb68f43af800c.tar nixpkgs-b8e1e7191e99af29125fbb37f42cb68f43af800c.tar.gz nixpkgs-b8e1e7191e99af29125fbb37f42cb68f43af800c.tar.bz2 nixpkgs-b8e1e7191e99af29125fbb37f42cb68f43af800c.tar.lz nixpkgs-b8e1e7191e99af29125fbb37f42cb68f43af800c.tar.xz nixpkgs-b8e1e7191e99af29125fbb37f42cb68f43af800c.tar.zst nixpkgs-b8e1e7191e99af29125fbb37f42cb68f43af800c.zip | |
Merge branch 'master' into staging
* master: (80 commits) lkl: Supports aarch64 wimlib: nitpicks gitAndTools.git-codeowners: 0.1.1 -> 0.1.2 wimlib: init at 1.12.0 kernel: improve modDirVersion error message releaseTools.sourceTarball: Clean up temporary files dotnetPackages.SmartIrc4net: rehash source migmix: make it a fixed-output derivation vm: Create /dev/full samba: 4.6.8 -> 4.6.11 to address CVEs CVE-2017-14746 & CVE-2017-15275 microcodeIntel: 20170707 -> 20171117 sshd: Remove ripemd160 MACs kernel config: Enable MEDIA_CONTROLLER linux: 4.4.99 -> 4.4.100 linux: 4.9.63 -> 4.9.64 nix-bash-completions: 0.4 -> 0.5 linux: 4.14 -> 4.14.1 linux: 4.13.14 -> 4.13.15 nix-zsh-completions: 0.3.3 -> 0.3.5 dns-root-data: use a stable URL that I maintain anyway ...
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 83ceabf8dcb..db7c8a8dafa 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -415,6 +415,7 @@ michelk = "Michel Kuhlmann <michel@kuhlmanns.info>"; midchildan = "midchildan <midchildan+nix@gmail.com>"; mikefaille = "Michaël Faille <michael@faille.io>"; + mikoim = "Eshin Kunishima <ek@esh.ink>"; miltador = "Vasiliy Solovey <miltador@yandex.ua>"; mimadrid = "Miguel Madrid <mimadrid@ucm.es>"; mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>"; |