Commit Graph

277 Commits

Author SHA1 Message Date
Pascal Wittmann
35fe93797e trayer: update trayer from 1.1.5 to 1.1.6 and adpot it 2014-08-08 10:28:11 +02:00
Michael Raskin
10f9730d64 Update compiz 2014-08-03 22:29:40 +04:00
Rok Garbas
3bf7d7c42a i3lock: update to 2.6 2014-08-03 14:04:44 +02:00
Vladimír Čunát
1b169722a3 Merge branch 'x-updates'
Close #3147.
The only major update is freetype-2.5, I think (it cost lots of work).
2014-08-03 11:29:01 +02:00
aszlig
6aabd17d51
i3: Don't override patchPhase.
Makes easier to provide a patches attribute through packageOverrides.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-02 17:25:16 +02:00
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
aszlig
3d34dc39ac
i3: Only enable tests for x86_64-linux.
Right now, tests for i686-linux fail, see:

https://hydra.nixos.org/build/13024964

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 18:41:39 +02:00
aszlig
32d7c4c435
i3: Remove CarpAlways from buildInputs.
Oops, it was a leftover from debugging.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 11:19:06 +02:00
aszlig
fb1f257189
i3: Don't run test cases in parallel.
Unfortunately, running them in parallel sometimes lead to tests not even
starting up. Probably lock contention is the issue here, but haven't
investigated further so I'm deactivating parallel testing.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 08:04:09 +02:00
aszlig
31e77f5096
i3: Abort build if test suite is failing.
The exit code of the i3 test runner is always 0, regardless of whether
tests were failing or not, so let's quickly grep for a "not ok" in the
test logfile and if it occurs, the whole build is failing now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 05:49:14 +02:00
aszlig
2c1d04a563
i3: Enable running test suite by default.
Finally, after going through the journey of debugging and gathering
dependencies, we now have tests for i3, hooray!

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 05:49:14 +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
16e35532e4 Merge recent master into x-updates 2014-07-17 19:30:56 +02:00
Peter Simons
5bfb58a8a2 Re-generate Haskell packages with cabal2nix. 2014-07-14 17:33:52 +02:00
Peter Simons
d2e731e111 Add "please don't edit" comment at the top of every auto-generated Haskell file. 2014-07-14 13:21:41 +02:00
Vladimír Čunát
aceb30cd93 Merge master into x-updates
Adds the mass-rebuilding python update.
2014-07-02 22:54:41 +02:00
Benno Fünfstück
e10001042d fetchbzr, fetchdarcs, fetchhg: use rev attr
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
2014-06-28 21:06:10 +02:00
Vladimír Čunát
dfd80a1b7e Merge recent master into x-updates
Hydra eval: 1131611
2014-06-26 22:05:15 +02:00
Nikita Mikhailov
724fbd81ff i3: 4.7.2 -> 4.8 2014-06-22 18:17:09 +07:00
Vladimír Čunát
fa1eaf84f4 wayland, weston: update 1.4.0 -> 1.5.0 2014-06-17 09:00:29 +02:00
Jordan Patterson
26f2d67a65 Update Awesome WM to 3.5.5
Fix LGI test
Prefix LD_LIBRARY_PATH instead of clobbering it
2014-05-14 12:25:26 -06:00
cillianderoiste
ca5e65c4bd Merge pull request #2371 from iyzsong/herbstluftwm
herbstluftwm: update to 0.6.2
2014-05-11 10:31:14 +02:00
Peter Simons
f9f19ee938 haskell-xmonad-contrib: update to version 0.11.3 2014-05-03 20:03:30 +02:00
Michael Raskin
87304674a6 Update JWM to an easily available version 2014-05-03 00:42:12 +04:00
Peter Simons
a77e380454 xmonad-contrib: patch to fix build with GHC 7.8.2 2014-05-01 22:28:13 +02:00
宋文武
af72c7dddd herbstluftwm: update to 0.6.2 2014-04-24 21:30:03 +08:00
Peter Simons
c394d4079d xmonad: fix build with ghc 7.8.1 2014-03-30 16:46:02 +02:00
Alexei Robyn
a7070743a3 Openbox: Added wrapping for XDG_DATA_DIRS
Fixes issue with Openbox failing to start due to not finding its default
theme
2014-03-23 21:48:36 +11:00
viric
0c11d4aa1f Merge pull request #1448 from pSub/dwm-remove-patch
Removed confnotify-6.0.patch.
2014-02-24 22:48:48 +01:00
Vladimír Čunát
64c44fa508 weston: fix build by updating (after wayland update)
Also add dbus support, which seemed potentionally important to me.
2014-01-26 00:42:17 +01:00
Domen Kožar
c4cb65187e i3: 4.6 -> 4.7.2 2014-01-24 14:33:40 +01:00
Shea Levy
ca116f76f9 Unmaintain a bunch of packages
Trying to take maintainership more seriously...

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-21 22:34:41 -05:00
Nixpkgs Monitor
baa1bba420 i3status: update from 2.7 to 2.8 2014-01-13 17:28:42 +01:00
Peter Simons
5ef34645f3 ratpoison: update to version 1.4.6 2014-01-13 17:05:45 +01:00
Pascal Wittmann
fc2580ad87 Removed confnotify-6.0.patch.
I don't think it is a good idea to hardcode this patch in nixpkgs as it is likely that
a patch provided by a user will conflict with this patch. This is for instance the case
with the patch "single_tagset" (http://dwm.suckless.org/patches/single_tagset).
2014-01-02 11:53:25 +01:00
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