Merge branch 'master' into staging

* master: (81 commits) Add NixOS 17.09 AMIs gradle: 4.2 -> 4.2.1 maintainers.nix: use my GitHub handle as maintainer name fcitx-engines.rime: init at 0.3.2 brise: init at 2017-09-16 librime: init at 1.2.9 marisa: init at 0.2.4 opencc: build shared library and programs josm: 12712 -> 12914 exa: 0.7.0 -> 0.8.0 krb5: add deprecation date for old configuration rustRegistry: 2017-09-10 -> 2017-10-03 go-ethereum: Fix libusb segmentation faults on Darwin tor-browser-bundle-bin: 7.0.5 -> 7.0.6 libsodium: 1.0.13 -> 1.0.15 tor-browser-bundle: geoip support tor-browser-bundle: support transports obfs2,obfs3 tor-browser-bundle: bump https-everywhere to 2017.9.12 tint2: limit platforms to Linux since macOS is not supported and fails the tests eclipse-plugin-vrapper: init at 0.72.0 ...
NixOS · Oct 3, 2017 · f137004 · f137004
2 parents 3c3d871 + b465d9c
commit f137004
Show file tree

Hide file tree

Showing 88 changed files with 1,414 additions and 653 deletions.
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
@@ -384,7 +384,6 @@
   mikefaille = "Michaël Faille <michael@faille.io>";
   miltador = "Vasiliy Solovey <miltador@yandex.ua>";
   mimadrid = "Miguel Madrid <mimadrid@ucm.es>";
-  mingchuan = "Ming Chuan <ming@culpring.com>";
   mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>";
   mirrexagon = "Andrew Abbott <mirrexagon@mirrexagon.com>";
   mjanczyk = "Marcin Janczyk <m@dragonvr.pl>";
@@ -550,6 +549,7 @@
   shell = "Shell Turner <cam.turn@gmail.com>";
   shlevy = "Shea Levy <shea@shealevy.com>";
   siddharthist = "Langston Barrett <langston.barrett@gmail.com>";
+  sifmelcara = "Ming Chuan <ming@culpring.com>";
   sigma = "Yann Hodique <yann.hodique@gmail.com>";
   simonvandel = "Simon Vandel Sillesen <simon.vandel@gmail.com>";
   sivteck = "Sivaram Balakrishnan <sivaram1992@gmail.com>";
@@ -574,6 +574,7 @@
   sternenseemann = "Lukas Epple <post@lukasepple.de>";
   stesie = "Stefan Siegl <stesie@brokenpipe.de>";
   steveej = "Stefan Junker <mail@stefanjunker.de>";
+  stumoss = "Stuart Moss <samoss@gmail.com>";
   SuprDewd = "Bjarki Ágúst Guðmundsson <suprdewd@gmail.com>";
   swarren83 = "Shawn Warren <shawn.w.warren@gmail.com>";
   swflint = "Samuel W. Flint <swflint@flintfam.org>";

diff --git a/nixos/modules/config/krb5.nix b/nixos/modules/config/krb5.nix