Jan Malakhovski 7079e744d4 Merge branch 'master' into staging ... Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix		2018-03-10 20:38:13 +00: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	stdenv: check-meta: fix fallout from #36119	2018-03-06 14:14:17 +00:00
linux	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
native	fetchurl: cleanup, better errors	2018-02-18 14:24:53 +00:00
nix
adapters.nix	Merge pull request #36401 from obsidiansystems/no-stdenv-cross-adapter	2018-03-06 20:17:13 -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