philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
nixpkgs/pkgs
History
Vladimír Čunát 52404a868d Merge recent master into staging 
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
..
applications Merge recent master into staging 2014-11-05 15:00:44 +01:00
build-support Merge recent master into staging 2014-11-05 15:00:44 +01:00
data junicode: update from 0.6.15 to 0.7.8 2014-11-04 00:04:29 +00:00
desktops Merge recent master into staging 2014-11-05 15:00:44 +01:00
development Merge recent master into staging 2014-11-05 15:00:44 +01:00
games Merge recent master into staging 2014-11-05 15:00:44 +01:00
misc stella-libretro: Bump revision 2014-11-04 18:27:40 +01:00
os-specific Merge recent master into staging 2014-11-05 15:00:44 +01:00
servers Merge recent master into staging 2014-11-05 15:00:44 +01:00
shells
stdenv Set SDKROOT etc. in stdenvNative 2014-11-04 16:35:13 +01:00
test
tools Merge recent master into staging 2014-11-05 15:00:44 +01:00
top-level Merge recent master into staging 2014-11-05 15:00:44 +01:00