Vladimír Čunát
b770365574
ReRevert Merge x-updates into master
...
This reverts commit ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde.
Conflicts (taken x-updates):
pkgs/development/libraries/libgcrypt/default.nix
pkgs/development/libraries/libgpg-error/default.nix
pkgs/development/libraries/poppler/default.nix
2013-05-29 23:25:02 +02:00
Song Wenwu
170543747f
openbox: upgrade to 3.5.0
2013-05-13 10:33:31 +08:00
Vladimír Čunát
ec3965d8d0
Revert Merge x-updates into master due to mesa bloat
...
See #490 discussion.
This reverts commit 1278859d3167b9f84bfab680d9c8c463adf64a60, reversing
changes made to 0c020c98f9d4f49d5c9907db5f4b35aac7df959b.
Conflicts:
pkgs/desktops/xfce/core/xfce4-session.nix (take master)
pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát
8249695b61
Merge branch 'master' into x-updates
...
Needed that to fix the tarball.
2013-04-11 23:31:33 +02:00
Lluís Batlle i Rossell
2187716c53
dwm: adding a patch I missed in a recent commit
2013-04-05 12:50:42 +02:00
Lluís Batlle i Rossell
5aacc33406
dwm: fix SDL games with fullscreen
...
It worked quite bad when the game resolution was different than the
current.
2013-04-04 23:32:53 +02:00
Vladimír Čunát
eb2e46aab2
Merge branch 'master' into x-updates
...
Conflicts:
pkgs/applications/graphics/rawtherapee/default.nix
pkgs/applications/misc/blender/default.nix
pkgs/applications/networking/browsers/chromium/sources.nix
pkgs/os-specific/linux/kernel/linux-3.9.nix
pkgs/top-level/all-packages.nix
2013-04-04 21:43:40 +02:00
Rok Garbas
6c890824bd
fixed typo from previous commit
2013-03-29 18:28:11 +01:00
Rok Garbas
a9c7252a3e
i3status and i3lock should have same platform as i3wm
2013-03-29 17:38:59 +01:00
Domen Kozar
67ce79f5e4
set platforms for i3wm
2013-03-29 13:27:04 +01:00
Peter Simons
6fc2cccfe6
Add myself as a maintainer to all Haskell packages (re-)generated by hackage4nix.
2013-03-23 15:58:14 +01:00
viric
9dc4ec57a1
Merge pull request #397 from modulistic/master
...
i3 improvements
2013-03-20 13:52:32 -07:00
Peter Simons
7ee8641410
haskell-xmonad-contrib: update to version 0.11.1
2013-03-20 10:44:54 +01:00
modulistic
ae9b33ac51
i3 window manager: version bump from 4.5 to 4.5.1
2013-03-20 00:14:22 +01:00
modulistic
f976962d7b
i3 window manager: enable Pango support for antialiased fonts
2013-03-20 00:13:44 +01:00
Rok Garbas
16f6c3b752
i3: update to 4.5 also updating i3status to 2.7
2013-03-17 14:45:37 +01:00
Carles Pagès
6c949148b6
Merge remote-tracking branch 'upstream/x-updates' into wayland
...
Conflicts:
pkgs/development/libraries/mesa/default.nix
pkgs/top-level/all-packages.nix
2013-03-10 18:19:49 +01:00
Carles Pagès
728116ec3e
weston: don't depend on pixman explicitly.
...
Weston depends on cairo and pixman, but cairo uses a special version of pixman.
In the previous commit I solved a linking problem by specifying the same pixman
version for weston, but it's easier to rely on cairo propagating it. Thanks
viric for the tip!
2013-03-06 22:59:59 +01:00
Carles Pagès
8de5d77e3c
Merge branch 'master' into wayland
...
Conflicts:
pkgs/top-level/all-packages.nix
2013-03-03 11:58:28 +01:00
Vladimír Čunát
26af997d41
Merge branch 'master' into stdenv-updates
...
Conflicts (simple):
pkgs/applications/networking/browsers/chromium/default.nix
pkgs/development/libraries/libsoup/default.nix
pkgs/os-specific/linux/kernel/manual-config.nix
pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +01:00
Lluís Batlle i Rossell
089fd0a769
fvwm: updating license to gplv2+
...
I looked at some src, and it mentions "or later".
2013-03-01 20:38:23 +01:00
Song Wenwu
f5bd4f720a
add fvwm-2.6.5
2013-03-01 13:48:33 +08:00
Vladimír Čunát
4ebcc87f6b
compiz: fix build and update
2013-02-23 15:10:01 +01:00
Carles Pagès
7255ac3a13
Forgot mesa90x references in the previous commit.
2013-02-18 20:43:10 +01:00
Carles Pagès
d09f2424ed
mesa: add support for wayland to default version.
...
Remove duplicated versions now that mesa and libdrm are updated.
2013-02-18 20:32:47 +01:00
Carles Pagès
d32a973fc9
Merge remote-tracking branch 'upstream/x-updates' into wayland
...
Conflicts:
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/wayland/default.nix
2013-02-18 20:15:59 +01:00
Carles Pagès
bd8428efa1
wayland: update to 1.0.5.
...
Also updated weston to 1.0.5, and got rid of the patch that's no longer needed.
They fixed it upstream even if it was actually caused by our pkg-config patch.
2013-02-18 19:57:27 +01:00
Peter Simons
801237ceb2
xmonad: install man page into the proper location
2013-02-11 23:26:06 +01:00
Carles Pagès
bc9a291779
wayland: update to 1.0.4.
...
Also updated weston to 1.0.4, which now fails to build. Doh!
2013-01-28 19:45:07 +01:00
Carles Pagès
29150b43a3
Merge branch 'master' into wayland
2013-01-26 11:13:20 +01:00
Peter Simons
d80bf38daf
haskell-xmonad-extras: update to version 0.11
2013-01-09 16:54:29 +01:00
Carles Pagès
a53a7bc0e4
Update wayland and weston to 1.0.3.
...
I also removed the screenshooter-client-protocol patch as this was fixed
upstream.
2013-01-08 23:21:36 +01:00
Carles Pagès
7d591c23b3
Merge branch 'master' into wayland
2013-01-08 22:28:13 +01:00
Peter Simons
7a92fde4f0
xmonad-extras: jailbreak to support recent versions of xmonad
2013-01-04 19:24:18 +01:00
Peter Simons
84eef6ea21
haskell-xmonad-contrib: update to version 0.11
2013-01-04 19:09:51 +01:00
Peter Simons
1c3182ccdf
haskell-xmonad: update to version 0.11
2013-01-04 19:09:51 +01:00
Michael Raskin
c7a8d9f98d
Merge pull request #221 from Eelis/master
...
Ion3 update to 20090110
2012-12-27 05:31:22 -08:00
Rok Garbas
c90c96572f
i3: update to 4.4
2012-12-22 17:21:17 +01:00
Eelis van der Weegen
01adc95b13
Ion3 update to 20090110
2012-12-18 21:12:17 +01:00
Carles Pagès
c2189c49c6
Weston: prevent install to chown root weston-launch.
...
This operation fails with permission denied, and since this launcher is only
needed when not running under X, I leave it disabled for the moment.
2012-12-07 12:28:35 +01:00
Carles Pagès
ec99d9603c
Weston: add patches to fix the build.
...
The patches fix two issues:
- screenshooter-client-protocol.h missing from tarball
- missing flags for include paths and definitions
I had to add auto* as inputs to be able to call autoreconf, as one patch
modifies a Makefile.am. Both issues are already reported upstream.
2012-12-07 12:10:14 +01:00
Carles Pagès
b60d016a0a
Add Weston 1.0.2.
...
Currently doesn't build. I have to further investigate but there seems to be a
missing file from the tarball.
2012-12-02 12:42:55 +01:00
Eelco Dolstra
5553546c21
Remove a bunch of unreferenced files
...
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Michael Raskin
f995cf6548
Fix at least obvious failures with python path
2012-11-26 01:43:30 +04:00
Michael Raskin
7333c01dba
Update Compiz
2012-11-25 23:58:04 +04:00
Rok Garbas
fc16fb3e28
i3status: update to 2.6
2012-11-17 02:10:21 +01:00
Peter Simons
0bd2f95a31
haskell-xmonad-extras: update to version 0.10.1.2
2012-10-23 18:29:58 +02:00
Eelco Dolstra
31f89ba349
Merge remote-tracking branch 'origin/master' into x-updates
2012-10-03 14:43:10 -04:00
aszlig
7e439ea13c
i3: Update to version 4.3.
...
Though upstream clearly recommends to not deactivate Pango, we currently can't
use Pango right now, as we are stuck at cairo-1.10.2. This version only has
experimental support for XCB which became stable in 1.12.x.
So we need to wait for 21bf5ef509dcadebab10de0ba142d55776a961f1 to be merged
into master before we can enable Pango.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-02 03:46:41 +02:00
Eelco Dolstra
0446a79473
Fix icewm build on libX11-1.5.0
2012-09-26 17:00:55 -04:00
