philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
nixpkgs/pkgs/applications
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
..
audio Merge recent master into staging 2014-11-05 15:00:44 +01:00
display-managers
editors Merge recent master into staging 2014-11-05 15:00:44 +01:00
gis qgis: disable parallel building 2014-10-13 15:32:50 +02:00
graphics Fix GeeQie build 2014-11-04 15:12:23 +03:00
inferno
misc Merge recent master into staging 2014-11-05 15:00:44 +01:00
networking Merge recent master into staging 2014-11-05 15:00:44 +01:00
office boost: correct the install names for darwin 2014-11-04 02:28:35 -06:00
science Merge recent master into staging 2014-11-05 15:00:44 +01:00
search
taxes
version-management Merge recent master into staging 2014-11-05 15:00:44 +01:00
video Merge recent master into staging 2014-11-05 15:00:44 +01:00
virtualization virtualbox: 4.3.16 -> 4.3.18 2014-11-03 21:47:59 +01:00
window-managers Better work-around for stumpwmContrib dependency 2014-10-29 15:17:06 +01:00