Merge branch 'master' into staging

This commit is contained in:
Jan Tojnar
2019-01-17 21:49:16 +01:00
47 changed files with 546 additions and 181 deletions

View File

@@ -1,8 +1,8 @@
{ mkDerivation }:
mkDerivation rec {
version = "21.2";
sha256 = "0v9smdp2vxkpsz65a6ypwzl12fqdfrsi7k29f5i7af0v27r308cm";
version = "21.2.3";
sha256 = "1v47c7bddbp31y6f8yzdjyvgcx9sskxql33k7cs0p5fmr05hhxws";
prePatch = ''
substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'