Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-06-13 11:02:21 +02:00
201 changed files with 1867 additions and 1351 deletions
@@ -3,7 +3,7 @@
let
version = "1.13.0";
jarName = "bfg-${version}.jar";
mavenUrl = "http://central.maven.org/maven2/com/madgag/bfg/${version}/${jarName}";
mavenUrl = "mirror://maven/com/madgag/bfg/${version}/${jarName}";
in
stdenv.mkDerivation {
inherit version jarName;