Vladimír Čunát 1575bc652e Merge branch 'master' into staging ... Conflicts (simple): pkgs/os-specific/linux/util-linux/default.nix It seems this merge creates a new stdenv hash, because we had changes on both branches :-/		2015-01-13 18:07:11 +01:00
..
darwin	I think this should fix the evaluation errors in hydra	2014-12-27 12:02:58 -05:00
generic	Merge branch 'master' into staging	2015-01-13 18:07:11 +01:00
linux	restore pkgs.gcc = stdenv.cc	2015-01-03 09:54:02 -05:00
native	I think this should fix the evaluation errors in hydra	2014-12-27 12:02:58 -05:00
nix
adapters.nix	Restore accidentally-dropped stdenv adapter	2014-12-26 12:38:18 -05:00
common-path.nix
default.nix