Merge remote-tracking branch 'NixOS/master' into staging

2019-01-27 00:01:13 -05:00
parent 319ebef3a3 4866cbe341
commit 92f0f8dd68
403 changed files with 4759 additions and 3164 deletions
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -64,6 +64,6 @@ stdenv.mkDerivation rec {
    homepage = https://curl.haxx.se/docs/caextract.html;
    description = "A bundle of X.509 certificates of public Certificate Authorities (CA)";
    platforms = platforms.all;
-    maintainers = with maintainers; [ wkennington fpletz ];
+    maintainers = with maintainers; [ fpletz ];
  };
 }