Orivej Desh d99a2fc093 Merge branch 'master' into staging ... * master: (293 commits) go_1_9: skip flaky TestServerCancelsReadTimeoutWhenIdle qsyncthingtray: fix build qt56.qtwebengine: fix build stdman: d860212 -> 2017.04.02 jackett: use mono50 hg-git: disable with python3 hg-git: 0.8.5 -> 0.8.10 xfce4-settings: enable parallel building gcc-snapshot: mark as broken heaptrack: 2017-02-14 -> 2017-10-30 nixos-container: Modify existing test to cover show-ip command nixos-container: Make show-ip work together with ipv4 + netmask linux-copperhead: 4.13.12.a -> 4.13.13.a matterbridge: 1.1.0 -> 1.4.1 nixos/nghttpx: add module for the nghttpx proxy server (#31680) mattermost: 4.3.0 -> 4.4.0 breakpad: delete simp_le: 0.2.0 -> 0.6.1 certbot: 0.11.1 -> 0.19.0 afl: 2.51b -> 2.52b ...		2017-11-17 05:35:09 +00:00
..
cross	all-packages: Remove gccCrossStageFinal; any gcc will not work	2017-09-21 15:49:18 -04:00
custom	top-level: {build,host,target}Platform are defined in the stdenv instead	2017-07-07 12:55:02 -04:00
cygwin	cygwin: rebase fixes	2017-06-26 09:26:10 -03:00
darwin	Merge branch 'master' into staging	2017-11-17 05:35:09 +00:00
freebsd	cc-wrapper: Use stdenvNoCC to build	2017-09-26 14:08:21 -04:00
generic	stdenv setup: Run setup hooks and other processing after accumulating deps	2017-11-15 18:51:06 -05:00
linux	Merge branch 'master' into staging	2017-11-17 05:35:09 +00:00
native	cc-wrapper: Use stdenvNoCC to build	2017-09-26 14:08:21 -04:00
nix	cc-wrapper: Use stdenvNoCC to build	2017-09-26 14:08:21 -04:00
adapters.nix	cross stdenv: No more native-fishing hack.	2017-09-21 15:49:54 -04:00
booter.nix	treewide: Depend on targetPackages.stdenv.cc.bintools instead of binutils directly	2017-11-05 17:10:53 -05:00
common-path.nix
default.nix