Skip to content

Commit 43ff1c8

Browse files
dezgegdezgeg
committedJul 11, 2017
Merge remote-tracking branch 'upstream/master' into staging
·
branch-off-24.1117.09-beta
2 parents f385e22 + b612382 commit 43ff1c8

File tree

76 files changed

+875
-379
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+875
-379
lines changed
 

‎lib/maintainers.nix

+3-1
Original file line numberDiff line numberDiff line change
@@ -385,11 +385,12 @@
385385
nand0p = "Fernando Jose Pando <nando@hex7.com>";
386386
Nate-Devv = "Nathan Moore <natedevv@gmail.com>";
387387
nathan-gs = "Nathan Bijnens <nathan@nathan.gs>";
388-
nckx = "Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>";
388+
nckx = "Tobias Geerinckx-Rice <github@tobias.gr>";
389389
ndowens = "Nathan Owens <ndowens04@gmail.com>";
390390
neeasade = "Nathan Isom <nathanisom27@gmail.com>";
391391
nequissimus = "Tim Steinbach <tim@nequissimus.com>";
392392
nfjinjing = "Jinjing Wang <nfjinjing@gmail.com>";
393+
nh2 = "Niklas Hambüchen <mail@nh2.me>";
393394
nhooyr = "Anmol Sethi <anmol@aubble.com>";
394395
nickhu = "Nick Hu <me@nickhu.co.uk>";
395396
nicknovitski = "Nick Novitski <nixpkgs@nicknovitski.com>";
@@ -409,6 +410,7 @@
409410
okasu = "Okasu <oka.sux@gmail.com>";
410411
olcai = "Erik Timan <dev@timan.info>";
411412
olejorgenb = "Ole Jørgen Brønner <olejorgenb@yahoo.no>";
413+
olynch = "Owen Lynch <owen@olynch.me>";
412414
orbekk = "KJ Ørbekk <kjetil.orbekk@gmail.com>";
413415
orbitz = "Malcolm Matalka <mmatalka@gmail.com>";
414416
orivej = "Orivej Desh <orivej@gmx.fr>";

‎nixos/modules/module-list.nix

+1
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
./security/apparmor.nix
117117
./security/apparmor-suid.nix
118118
./security/audit.nix
119+
./security/auditd.nix
119120
./security/ca.nix
120121
./security/chromium-suid-sandbox.nix
121122
./security/dhparams.nix

0 commit comments

Comments
 (0)
Please sign in to comment.