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/interpreters/tcl/generic.nix
+++ b/pkgs/development/interpreters/tcl/generic.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
    homepage = http://www.tcl.tk/;
    license = licenses.tcltk;
    platforms = platforms.all;
-    maintainers = with maintainers; [ wkennington vrthra ];
+    maintainers = with maintainers; [ vrthra ];
  };

  passthru = rec {