nixpkgs/pkgs
Lluís Batlle i Rossell b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
2012-12-28 23:28:16 +01:00
..
applications Merge remote-tracking branch 'eelco/master' into stdenv-updates 2012-12-28 23:28:16 +01:00
build-support Merge remote-tracking branch 'eelco/master' into stdenv-updates 2012-12-28 23:28:16 +01:00
data Rename buildNativeInputs -> nativeBuildInputs 2012-12-28 19:20:09 +01:00
desktops Rename buildNativeInputs -> nativeBuildInputs 2012-12-28 19:20:09 +01:00
development Merge remote-tracking branch 'eelco/master' into stdenv-updates 2012-12-28 23:28:16 +01:00
games Rename buildNativeInputs -> nativeBuildInputs 2012-12-28 19:20:09 +01:00
lib Merge remote-tracking branch 'eelco/master' into stdenv-updates 2012-12-28 23:28:16 +01:00
misc Merge remote-tracking branch 'eelco/master' into stdenv-updates 2012-12-28 23:28:16 +01:00
os-specific Merge remote-tracking branch 'eelco/master' into stdenv-updates 2012-12-28 23:28:16 +01:00
servers Merge remote-tracking branch 'eelco/master' into stdenv-updates 2012-12-28 23:28:16 +01:00
shells Rename buildNativeInputs -> nativeBuildInputs 2012-12-28 19:20:09 +01:00
stdenv More renames 2012-12-28 19:42:10 +01:00
test
tools Merge remote-tracking branch 'eelco/master' into stdenv-updates 2012-12-28 23:28:16 +01:00
top-level Merge remote-tracking branch 'eelco/master' into stdenv-updates 2012-12-28 23:28:16 +01:00