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
@@ -77,6 +77,5 @@ stdenv.mkDerivation rec {
    description = "A fork of the bacula project";
    license = licenses.agpl3;
    platforms = platforms.unix;
-    maintainers = with maintainers; [ wkennington ];
  };
 }