Vladimír Čunát
9b02635faa
Merge recent master into x-updates
...
Hydra: ?compare=1138350
Conflicts:
nixos/modules/services/x11/desktop-managers/default.nix
Two imports were added independently on the same line.
I split it as well, as it was very long now.
2014-07-21 12:05:57 +02:00
Austin Seipp
f677e843d5
hhvm: remove bash input
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-07-19 19:46:32 -05:00
Austin Seipp
03fd95d248
hhvm: Fix path to /bin/bash
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-07-19 19:44:43 -05:00
Austin Seipp
4b0178d2a4
hhvm: 3.1.0 -> 3.2.0
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-07-19 01:58:09 -05:00
Vladimír Čunát
c63a9c155c
hhvm: fix build with freetype-2.5
2014-06-26 21:56:47 +02:00
Austin Seipp
509beb1f68
Add HHVM packages, replacing old hiphop-php expr
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-10 13:28:35 -05:00
