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

..

audio

Merge remote-tracking branch 'eelco/master' into stdenv-updates

2012-12-28 23:28:16 +01:00

display-managers/slim

slim: Really update to 1.3.4

2012-08-17 11:33:59 -04:00

editors

Rename buildNativeInputs -> nativeBuildInputs

2012-12-28 19:20:09 +01:00

graphics

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

networking

Merge remote-tracking branch 'eelco/master' into stdenv-updates

2012-12-28 23:28:16 +01:00

office

Rename buildNativeInputs -> nativeBuildInputs

2012-12-28 19:20:09 +01:00

science

Merge remote-tracking branch 'eelco/master' into stdenv-updates

2012-12-28 23:28:16 +01:00

taxes

* It's that time of year again.

2012-03-10 19:23:04 +00:00

version-management

Merge remote-tracking branch 'eelco/master' into stdenv-updates

2012-12-28 23:28:16 +01:00

video

Merge remote-tracking branch 'eelco/master' into stdenv-updates

2012-12-28 23:28:16 +01:00

virtualization

Rename buildNativeInputs -> nativeBuildInputs

2012-12-28 19:20:09 +01:00

window-managers

Merge pull request #221 from Eelis/master

2012-12-27 05:31:22 -08:00