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/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation {

    homepage = https://www.gnu.org/software/gnutls/;
    license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ eelco wkennington fpletz ];
+    maintainers = with maintainers; [ eelco fpletz ];
    platforms = platforms.all;
  };
 }