philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
nixpkgs/pkgs
History
Lluís Batlle i Rossell 67aa9243f0 Merge branch 'stdenv-updates' into pi-stdenv-updates 
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial.
2012-12-28 23:30:53 +01:00
..
applications Merge remote-tracking branch 'eelco/master' into stdenv-updates 2012-12-28 23:28:16 +01:00
build-support Merge branch 'stdenv-updates' into pi-stdenv-updates 2012-12-28 23:30:53 +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 branch 'stdenv-updates' into pi-stdenv-updates 2012-12-28 23:30:53 +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 branch 'stdenv-updates' into pi-stdenv-updates 2012-12-28 23:30:53 +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 Adapting make-bootstrap-tools-crosspi.nix to crossDrv 2012-12-28 21:22:13 +01:00
test
tools Merge remote-tracking branch 'eelco/master' into stdenv-updates 2012-12-28 23:28:16 +01:00
top-level Merge branch 'stdenv-updates' into pi-stdenv-updates 2012-12-28 23:30:53 +01:00