Tuomas Tynkkynen 34f95d92a2 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/applications/misc/pytrainer/default.nix pkgs/development/tools/pew/default.nix pkgs/tools/misc/you-get/default.nix		2018-02-28 20:52:49 +02:00
..
cross	prebuilt android tools: Init using SDK	2018-02-27 14:15:39 -05:00
custom
cygwin
darwin	Merge pull request #35071 from oxij/stdenv/infopages	2018-02-26 18:06:11 -05:00
freebsd	fetchurl: cleanup, better errors	2018-02-18 14:24:53 +00:00
generic	libgcrypt: Fix cross-compilation	2018-02-24 22:51:22 -05:00
linux	Merge remote-tracking branch 'upstream/master' into staging	2018-02-28 20:52:49 +02:00
native	fetchurl: cleanup, better errors	2018-02-18 14:24:53 +00:00
nix
adapters.nix	lib, treewide: Add missing MIPS arches, and fix existing usage	2018-02-23 20:43:42 -05:00
booter.nix
common-path.nix
default.nix	lib, treewide: Add missing MIPS arches, and fix existing usage	2018-02-23 20:43:42 -05:00