Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2018-11-29 08:12:56 +01:00
177 changed files with 4259 additions and 2087 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
{ callPackage, ... }@args:
callPackage ./generic.nix (args // {
version = "1.15.6";
sha256 = "1ikchbnq1dv8wjnsf6jj24xkb36vcgigyps71my8r01m41ycdn53";
version = "1.15.7";
sha256 = "14yz5cag9jdi088kdyammpi0ixrzi91bc0nwdldj42hfdhpyl8lg";
})