Merge branch 'master' into staging

This commit is contained in:
Vladimír Čunát
2016-11-26 11:27:09 +01:00
173 changed files with 6340 additions and 4415 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
{ callPackage, ... }@args:
callPackage ./generic.nix (args // {
version = "1.11.5";
sha256 = "1xmn5m1wjx1n11lwwlcg71836acb43gwq9ngk088jpx78liqlgr2";
version = "1.11.6";
sha256 = "1gc5phrzm2hbpvryaya6rlvasa00vjips4hv5q1rqbcfa6xsnlri";
})