Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar
2021-01-15 17:46:46 +01:00
1804 changed files with 7434 additions and 5627 deletions

View File

@@ -22,8 +22,8 @@ let
};
"2.12" = {
version = "2.12.12";
sha256 = "NSDNHzye//YrrudfMuUtHl3BIL4szzQGSeRw5I9Sfis=";
version = "2.12.13";
sha256 = "17548sx7liskkadqiqaajmwp2w7bh9m2d8hp2mwyg8yslmjx4pcc";
tests = [ nixosTests.scala.scala_2_12 ];
pname = "scala_2_12";
};