Lluís Batlle i Rossell 719ba63004 Merge branch 'stdenv-updates' into pi-stdenv-updates ... Conflicts: pkgs/development/compilers/gcc/4.6/default.nix pkgs/development/compilers/gcc/4.7/default.nix The 4.7 had some weird parameters added in crossAttrs; I've removed them, but I don't understand where they come from.		2012-12-28 20:14:01 +00:00
..
generic	Merge branch 'stdenv-updates' into pi-stdenv-updates	2012-12-28 20:14:01 +00:00
linux	Merge branch 'stdenv-updates' into pi-stdenv-updates	2012-12-28 20:14:01 +00:00
mingw	removed executable bits from Nix files	2012-04-03 06:31:19 +00:00
native	Add an option ‘stdenv.userHook’ to set a global stdenv setup hook	2012-12-28 16:36:09 +01:00
nix	Remove trailing whitespace	2012-12-28 16:41:56 +01:00
adapters.nix	More renames	2012-12-28 19:42:10 +01:00
common-path.nix
default.nix	Merge branch 'stdenv-updates' into pi-stdenv-updates	2012-12-28 20:14:01 +00:00