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	Merge branch 'master' into staging	2018-12-25 17:03:57 +01:00
custom	stdenv: allow custom stdenv to take crossOverlays	2019-01-07 20:53:10 -06:00
cygwin	Fix invalid Baseaddress must be > 0x200000000 on cygwin	2018-04-14 14:06:09 +02:00
darwin	darwin.make-bootstrap-tools: remove dsymutil	2019-01-06 22:15:43 -06:00
freebsd	stdenv: implement crossOverlays	2018-12-04 21:06:46 -06:00
generic	Merge branch 'master' into staging-next	2019-02-01 09:22:29 +01:00
linux	Merge master into staging-next	2019-01-02 21:08:27 +01:00
native	stdenv/native: add missing argument	2019-01-02 12:19:25 -05:00
nix	stdenv: implement crossOverlays	2018-12-04 21:06:46 -06:00
adapters.nix	makeStaticBinaries: add a static glibc when performing a mkDerivation	2018-12-14 11:02:18 +00:00
booter.nix
common-path.nix
default.nix	stdenv: implement crossOverlays	2018-12-04 21:06:46 -06:00