Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2019-08-18 12:53:44 +02:00
125 changed files with 3217 additions and 885 deletions

View File

@@ -1,11 +1,11 @@
{ stdenv, cmake, python, fetchFromGitHub, emscriptenRev ? null }:
let
defaultVersion = "88";
defaultVersion = "89";
# Map from git revs to SHA256 hashes
sha256s = {
"version_88" = "14vm2hksn696klk97yz562mm5sqd67qbbzmlw4kvy22ldyc6sgmi";
"version_89" = "0rh1dq33ilq54szfgi1ajaiaj7rbylai02rhp9zm9vpwp0rw8mij";
"1.38.28" = "172s7y5f38736ic8ri3mnbdqcrkadd40a26cxcfwbscc53phl11v";
};
in