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
..
2017-09-16 21:36:43 -04:00
2017-09-16 21:36:43 -04:00
2017-09-16 21:36:43 -04:00
2018-03-24 22:04:25 -07:00
2017-08-22 13:28:55 +03:00
2018-03-04 06:28:34 -08:00