Merge remote-tracking branch 'upstream/master' into staging

This commit is contained in:
Jan Tojnar
2018-12-16 22:55:06 +01:00
524 changed files with 14889 additions and 12120 deletions
+2 -2
View File
@@ -1,8 +1,8 @@
{ mkDerivation }:
mkDerivation rec {
version = "21.1.3";
sha256 = "0374qpafrpnfspsvjaa3sgs0h8ryi3ah8fvmr7dm7zsmgb4ihdsg";
version = "21.2";
sha256 = "0v9smdp2vxkpsz65a6ypwzl12fqdfrsi7k29f5i7af0v27r308cm";
prePatch = ''
substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'