Jan Malakhovski ad35019501 Merge branch 'master' into staging
Fixed conflicts:
- lib/systems/for-meta.nix: in favor of staging
- pkgs/os-specific/darwin/xcode/default.nix: in favor of master
2018-05-26 00:20:17 +00:00
..
2018-05-24 04:40:46 +02:00
2017-12-07 18:51:39 +01:00
2017-10-29 19:29:25 -05:00
2017-10-12 08:51:34 +08:00
2017-09-13 21:55:50 +02:00
2018-04-10 21:19:13 +03:00
2018-05-16 16:54:12 +02:00
2017-10-19 05:15:32 +01:00
2017-12-14 16:03:09 +01:00