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/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -168,7 +168,6 @@ stdenv.mkDerivation rec {

    license = lib.licenses.mit;
    platforms = lib.platforms.all;
-    maintainers = [ lib.maintainers.wkennington ];
  };

  passthru = {