Commit Graph

9 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
4b263946dd qt3, graphicsmagick137, fox, neverball: fix build
Broken after freetype propagating libpng, which hid the older ones.
Reordering is enough to ensure the older libpng gets picked.
2014-07-09 21:52:04 +02:00
Nixpkgs Monitor
f3bbb6ff5d fox_1_6: update from 1.6.48 to 1.6.49 2013-12-18 18:18:27 +02:00
Eelco Dolstra
2147a07938 Fix a bunch of Hydra evaluation errors 2013-10-07 17:36:47 +02:00
Lluís Batlle i Rossell
d8f9f47e56 Updating xfe (1.34) and fox (1.6.48) 2013-05-17 16:32:25 +02:00
Lluís Batlle i Rossell
6a4350b68f Making xfe find and load icons fine
I added more dependencies to fox, for that.
I tried to add mesa too, but it wasn't trivial for it to find it, so
I took it out.
2013-05-16 23:40:26 +02:00
Baptist BENOIST
829ad425d3 Add xfe-1.33 and fox-1.6.9
This specific version of fox is required by xfe

Signed-off-by: Baptist BENOIST <return_0@live.com>
2012-10-16 18:03:12 +02:00
Baptist BENOIST
946dcba80b Add fox-1.7.9
Signed-off-by: Baptist BENOIST <return_0@live.com>
2012-10-16 18:03:12 +02:00