Commit graph

242 commits

Author SHA1 Message Date
Michael Raskin
6177a4f556 Merge pull request #1410 from ktosiek/pr/compton
Bump compton to v0.1_beta2
2013-12-29 07:01:53 -08:00
Moritz Ulrich
5890215501 windowManager.xmonad: Make it configurable and extensible.
PR #1366
The previous windowManager.xmonad option only starts xmonad and
doesn't make ghc available. This assumes that the user has GHC with
access to the xmonad package in his PATH when using xmonad.

Xmonad in Nix is now patched to accept the XMONAD_{GHC,XMESSAGE}
environment variables which define the path to either ghc or xmessage.
These are set automatically when using xmonad through
windowManager.xmonad.

My (or specific: @aristidb and my) changes make it possible to use
Xmonad without adding GHC to any profile. This is useful if you want
to add a different GHC to your profile.

This commit introduces some options:

- xmonad.haskellPackages: Controls which Haskell package set & GHC set
  is used to (re)build Xmonad

- xmonad.extraPackages: Function returning a list of additional
  packages to make available to GHC when rebuilding Xmonad

- xmonad.enableContribExtras: Boolean option to build xmonadContrib
  and xmonadExtras.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-12-28 09:29:53 +01:00
Tomasz Kontusz
37a3f21799 Bump compton to v0.1_beta2 2013-12-26 01:22:24 +01:00
Vladimír Čunát
4c5a71f777 Merge master into x-updates
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
2013-12-18 23:21:29 +01:00
David Virgilio
84b09e26e5 dzen2: new package
"Dzen is a general purpose messaging, notification and menuing program for X11. It was designed to be fast, tiny and scriptable in any language." -- https://github.com/robm/dzen
2013-12-17 12:05:42 +00:00
Nixpkgs Monitor
d2bb4dc100 windowmaker: update from 0.95.4 to 0.95.5 2013-12-16 01:36:17 +02:00
Nixpkgs Monitor
209ff52d0b stalonetray: update from 0.8.0 to 0.8.1 2013-12-14 00:36:24 +02:00
Vladimír Čunát
5c1e8fc56d weston: clean the expression (no semantic change) 2013-11-23 23:56:38 +01:00
Vladimír Čunát
30666ed5ad wayland, weston: update to 1.3.1, fix weston build
Also make Hydra build weston, so we can see the breakages in future.
2013-11-23 23:31:48 +01:00
Michael Raskin
935e586050 Merge pull request #1245 from nathanielbaxter/dev/openbox
openbox: Update to 3.5.2
2013-11-21 00:34:19 -08:00
Nathaniel Baxter
2bf530ab4b openbox: Update to 3.5.2 2013-11-20 14:27:13 +11:00
Jason "Don" O'Conal
76ab3916de awesome-3-5: add expression and nixos module 2013-11-20 01:05:09 +00:00
Jason "Don" O'Conal
d680003157 awesome: add which to build inputs (for awesome-client) 2013-11-11 01:40:17 +00:00
Michael Raskin
764508874e Updating Compiz 2013-10-20 21:06:48 +04:00
Michael Raskin
a1394551d2 Replacing StumpWM with a fresh lisp-packages version 2013-10-13 11:00:18 +04:00
Bjørn Forsman
083d0890f5 More description fixes
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
2013-10-06 12:01:38 +02:00
Peter Simons
f497ef9689 haskell-xmonad-extras: update to version 0.12 2013-08-30 10:53:02 +02:00
modulistic
cca6a6724c i3 window manager: version bump from 4.5.1 to 4.6 2013-08-23 14:05:36 +02:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
aszlig
23a53b8dfa
windowmaker: New package in version 0.95.4.
Packaged this for @devhell sometime ago and adding it here so maybe it's
useful for other people using Nix(OS).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-08-14 20:50:59 +02:00
Song Wenwu
7ffb3a4ba5 add herbstluftwm 0.5.2 2013-07-18 00:02:53 +08:00
Peter Simons
f8d885344a haskell-xmonad-contrib: update to version 0.11.2 2013-07-16 15:41:33 +02:00
Evgeny Egorochkin
fba8b902da fix packages to use mirror://xorg 2013-07-14 05:39:02 +03:00
Evgeny Egorochkin
da4be371e9 make package use mirror:// for gnu, savannah and gnome repositories where possible 2013-07-14 05:23:06 +03:00
Evgeny Egorochkin
1d07e3ef77 wmii: fix version to match tarball 2013-07-14 02:08:53 +03:00
Evgeny Egorochkin
64d5bf475c matchbox: fix version to match tarball 2013-07-14 02:08:50 +03:00
Rok Garbas
6b6eaf3bf3 i3lock: updating to 2.5 2013-07-08 01:18:12 +02:00
Vladimír Čunát
b770365574 ReRevert Merge x-updates into master
This reverts commit ec3965d8d0.

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 1278859d31, reversing
changes made to 0c020c98f9.

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