Commit graph

8 commits

Author SHA1 Message Date
Vladimír Čunát 6295a3ca36 Merge recent master into x-updates
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-08-02 05:08:07 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Vladimír Čunát 10fe63c05a pixman: bugfix update, remove withPNG option
The option seemed useless.
2014-07-09 20:46:53 +02:00
Vladimír Čunát f7b39cce8c pixman: minor update 0.32.2 -> .4 2013-11-23 10:17:52 +01:00
Vladimír Čunát 2a1cd6433b pixman: major update 0.30.2 -> 0.32.2
This is new major release with performance improvements for image scaling,
and a large number of bug fixes.
2013-11-17 13:44:40 +01:00
Eelco Dolstra 0656eff736 pixman: Update to 0.30.2 2013-08-09 23:53:52 +02:00
Vladimír Čunát 7716b78fc7 pixman: use pixman_cairo for xorg, flatten its includes 2013-04-18 21:31:56 +02:00
Vladimír Čunát d85a587fdd cairo: minor bugfix update, depend on new pixman now 2013-01-31 21:50:30 +01:00