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
..
default.nix
doubles.nix
examples.nix
for-meta.nix	Merge branch 'master' into staging	2018-05-26 00:20:17 +00:00
inspect.nix
parse.nix
platforms.nix