Vladimír Čunát 5effa4e0f9 Merge branch 'master' into staging-next ... Comments on conflicts: - llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is to build all targets, so we should be fine - some pypi hashes: they were equivalent, just base16 vs. base32		2019-02-01 09:22:29 +01:00
..
cross
custom	stdenv: allow custom stdenv to take crossOverlays	2019-01-07 20:53:10 -06:00
cygwin
darwin
freebsd
generic	Merge branch 'master' into staging-next	2019-02-01 09:22:29 +01:00
linux
native
nix
adapters.nix
booter.nix
common-path.nix
default.nix