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	lib/systems: Prohibit "gnu" ABI (*-gnu) with 32-bit ARM	2018-05-10 15:05:23 -04:00
doubles.nix	treewide: isArm -> isAarch32	2018-04-25 15:50:41 -04:00
examples.nix	androidndk: Fix usage as crossSystem	2018-05-17 17:22:27 +02:00
for-meta.nix	Merge branch 'master' into staging	2018-05-26 00:20:17 +00:00
inspect.nix	lib/systems/inspect: Fix after assertions	2018-05-11 19:02:50 -04:00
parse.nix	Merge branch 'fix-gcc-with-float'	2018-05-12 15:21:30 -04:00
platforms.nix	lib: Fix float handling for Aarch32	2018-05-12 15:18:31 -04:00