Commit Graph

608 Commits

Author SHA1 Message Date
William A. Kennington III
9579c9ec7f Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Matthias Beyer
050b462b3b dwm: 6.0 -> 6.1 2015-11-12 12:38:26 +01:00
Robert Glossop
a911a4f4c5 clfswm: add maintainer 2015-11-11 00:57:09 -05:00
Robert Glossop
5623e1b145 Add the CLFSWM window manager 2015-11-08 18:49:40 -05:00
William A. Kennington III
dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
wedens
1b0ba9525d kbdd: init 2015-10-24 17:15:15 +06:00
Vladimír Čunát
4917a4f8b3 Merge master into staging 2015-10-23 01:57:14 +02:00
Kamil Chmielewski
e4927ee346 qtile: 0.10.1 -> 0.10.2 2015-10-22 00:34:07 +02:00
Domen Kožar
efb8cadcc3 Merge pull request #10447 from anderspapitto/i3
i3: 4.10.4 -> 4.11
2015-10-18 12:46:38 +02:00
Anders Papitto
888a7358f5 i3: 4.10.4 -> 4.11 2015-10-17 21:14:39 -07:00
Vladimír Čunát
783c40eb68 dbus: split into multiple outputs and fix referrers 2015-10-13 20:19:01 +02:00
Vladimír Čunát
cba6641623 cairo, pango: fix some string references 2015-10-13 20:18:51 +02:00
Vladimír Čunát
99e4371526 curl: split into multiple outputs
Also use pkgconfig to be safer and fix (some) referrers.
2015-10-13 20:18:48 +02:00
William A. Kennington III
98172435f7 Merge branch 'master.upstream' into staging.upstream 2015-10-01 10:43:44 -07:00
Matthias Beyer
9d66251812 openbox: 3.5.2 -> 3.6.1 2015-09-29 10:10:31 +02:00
William A. Kennington III
d3f4ba9d6f Merge branch 'master.upstream' into staging.upstream 2015-09-23 14:44:21 -07:00
William A. Kennington III
fdf2c3d130 weston: 1.8.0 -> 1.9.0 2015-09-22 14:30:16 -07:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát
21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Matthias Beyer
a3a1bcb40a i3: 4.10.3 -> 4.10.4 2015-09-11 12:19:46 +02:00
Moritz Ulrich
3e03b921a1 Herbstluftwm: Fix zsh completion.
Files where installed in the wrong directory. This commit also replaces
sed with substituteInPlace.
2015-09-10 19:44:17 +02:00
Domen Kožar
a414391fd0 i3lock: 2.6 -> 2.7 2015-09-04 20:01:57 +02:00
Domen Kožar
950d9de3c9 i3: 4.10.2 -> 4.10.3 2015-09-04 18:47:40 +02:00
Kovacsics Robert (NixOS-SSD2)
b22e6cb299 wiimenu, wmiiSnap, libixp_for_wmii: removed, fixes #9609
wiimenu superseded by wimenu from wmii
wmiiSnap superseded by wmii_hg
libixp_for_wmii superseded by libixp_hg
2015-09-03 12:58:24 +02:00
Kovacsics Robert (NixOS-SSD2)
c0b710fc68 wmii-hg: init at 2012-12-09 2015-09-03 12:58:11 +02:00
Vladimír Čunát
b92c4a51e6 desktop and xmonad wrappers: preferLocalBuild
Also no substitution.
2015-09-01 09:43:37 +02:00
William Casarin
f51546888d spectrwm: 2.6.2 -> 2.7.2 2015-08-17 00:25:07 -07:00
Arseniy Seroka
7d98ce9d9a Merge pull request #9198 from Epitrochoid/master
bspwm: 0.8.9 -> 0.9
2015-08-13 11:07:42 +03:00
hiberno
b48640c5a5 bar-xft: init at version 2015-07-23
This a fork of the `bar` by lemonboy with support for xft.
2015-08-12 19:05:19 +02:00
Mabry Cervin
0b6a75dc1a bspwm: 0.8.9 -> 0.9 2015-08-12 11:28:36 -04:00
hiberno
2104e01ec7 bar: 1.0 -> 1.1 2015-08-08 23:55:28 +02:00
Nikolay Amiantov
fcc6716680 openbox: propagate some dependencies 2015-08-03 17:16:07 +03:00
Kamil Chmielewski
e610f27c43 qtile: init at 0.10.1 2015-07-28 22:55:32 +02:00
Arseniy Seroka
adedca45d5 Merge pull request #8994 from AndersonTorres/icewm
IceWM: 1.3.8 -> 1.3.10
2015-07-26 20:04:54 +03:00
Arseniy Seroka
558dbbc7f3 Merge pull request #8947 from AndersonTorres/oroborus
Oroborus (2.0.20): New Package
2015-07-26 20:03:47 +03:00
AndersonTorres
bdd20cedc1 IceWM: 1.3.8 -> 1.3.10
A complete rewrite in comparision to previous expression.
2015-07-26 01:08:05 -03:00
Vladimír Čunát
99457b40ac compiz: fix build by dontMoveLib64 = true; 2015-07-25 08:54:31 +02:00
AndersonTorres
d004ac6857 Oroborus: init at 2.0.20
Oroborus (named after the self-eating snake) is a minimalistic window manager.
2015-07-23 13:50:26 -03:00
Luca Bruno
14d36053b1 weston: use version 1.8.0 instead of wayland version (ZHF) 2015-07-22 11:23:17 +02:00
William A. Kennington III
25e60feb72 Merge branch 'master.upstream' into staging.upstream 2015-07-15 02:02:46 -07:00
James Felix Black
9b863fac6b notion: init at 3-2015061300
The notion (not-ion) window manager [1], plus optional (defaulted to
true) Xft/pango support (via [2]). Defined a license (notion uses a
modified LGPL).

As per [3], changes:

  1. renamed option from pango -> xft, better to reflect the actual
     nature of the patch;
  2. modified the patch to replace the postPatch changes to system-autodeteck.mk;
  3. commited the patch to the nixpkgs repo;
  4. removed 'fallbackFont' as an option. Use a sensible default, instead.

Many stylistic changes, thanks to @lethalman.

[1] http://notion.sourceforge.net
[2] http://sourceforge.net/p/notion/feature-requests/47/
[3] https://github.com/NixOS/nixpkgs/pull/8789
2015-07-13 12:08:05 -04:00
William A. Kennington III
ae28ff8b91 Merge branch 'master.upstream' into staging.upstream 2015-07-06 17:15:11 -07:00
Domen Kožar
87697fb583 Merge pull request #8399 from anderspapitto/pr
dont test i3
2015-07-06 12:35:32 +01:00
William A. Kennington III
612f0bdd67 Merge branch 'master.upstream' into staging.upstream 2015-06-30 23:58:07 -07:00
Charles Strahan
433a13d12a taffybar: init with-packages wrapper
This provides a wrapper around taffybar, in a fashion similar to how
package xmonad.
2015-06-30 11:11:43 -04:00
William A. Kennington III
ef253212f4 Merge branch 'master.upstream' into staging.upstream 2015-06-26 17:25:49 -07:00
Damien Cassou
8b86e245bc stumpwm: use full-path of xdpyinfo, closes #8518 2015-06-26 16:23:48 +02:00
William A. Kennington III
282d03befa Merge branch 'master.upstream' into staging.upstream 2015-06-22 10:57:36 -07:00
Anders Papitto
4ac7c02d8e Disable i3 tests due to unfixed errors 2015-06-19 12:14:10 -07:00
Kirill Elagin
1bb72a8198 tabbed: update and add xft patch 2015-06-19 21:28:52 +03:00
William A. Kennington III
9d6555dc0a Merge branch 'master.upstream' into staging.upstream 2015-06-06 12:04:42 -07:00
_1126
98e698fad2 maintainers: change of nickname. 2015-06-01 11:00:57 +02:00
William A. Kennington III
e5bf20a6c6 Merge branch 'master' into staging 2015-05-29 14:52:51 -07:00
Tobias Geerinckx-Rice
158e1cfdd0 Don't use "with licenses;" for single licences
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Tobias Geerinckx-Rice
b2d7f4b1ba Use common licence attributes from lib/licenses.nix
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
2015-05-27 22:00:06 +02:00
Vladimír Čunát
edeab75913 xcompmgr: generate along with xorg stuff
Also a minor update.
/cc maintainer @astsmtl.
2015-05-26 20:06:53 +02:00
Peter Simons
324719a5a6 Drop obsolete pre-NG Haskell builds. 2015-05-05 21:44:47 +02:00
Joachim Fasting
bf7ad2d84f meta.description fixups
Mostly scripted substitutions with a couple of subjective enhancements.
2015-04-30 18:17:42 +02:00
Pascal Wittmann
fc61106ae7 Merge pull request #7608 from joachifm/sawfish-updates
Sawfish updates
2015-04-28 17:56:48 +02:00
Joachim Fasting
db5623fd3e sawfish: git -> 1.11.90
This is the latest release (more recent than the GIT revision
previously pointed to). There is no release tarball, however.
2015-04-28 11:53:02 +02:00
Jaka Hudoklin
6e79ba48f9 Merge pull request #7567 from joachifm/sxhkd-0_5_5
sxhkd: 0.5.4 -> 0.5.5
2015-04-25 17:51:09 +02:00
Joachim Fasting
d455153a9b sxhkd: 0.5.4 -> 0.5.5 2015-04-25 17:28:33 +02:00
Ertugrul Söylemez
60c18ca586 compton: Removed unnecessary optimisation flags. 2015-04-23 22:04:28 +02:00
Ertugrul Söylemez
a4e976c752 Added compton-git, the Git version of compton. 2015-04-23 21:22:19 +02:00
Arseniy Seroka
2c2467df72 Merge pull request #7416 from nmikhailov/i3update
i3: 4.10.1 -> 4.10.2
2015-04-16 20:03:57 +03:00
Nikita Mikhailov
a01d3dd240 i3: 4.10.1 -> 4.10.2 2015-04-16 16:17:43 +00:00
Domen Kožar
ee69867e98 Merge pull request #7320 from nslqqq/i3update
i3: fix testsuite
2015-04-11 10:18:27 -04:00
Nikita Mikhailov
5f2c1f7397 i3: fix testsuite 2015-04-11 14:10:39 +00:00
Rok Garbas
bdcdc183a4 i3status: update to 2.9 2015-04-11 15:49:56 +02:00
Nikita Mikhailov
93f277f1d4 i3: 4.9.1 -> 4.10.1 2015-04-11 12:48:39 +02:00
Moritz Ulrich
4eaf2f1114 Stumpwm: Fix contrib modules, install stumpish.
This was caused by multiple things: First, the module-path was wrong in
the release. Second, when modules tried to load stumpwm, asdf searched
for its sources in /tmp/nix-build-*.

Both of these issues are fixed by a nix-specific patch that tells adsf
to *never* try to load stumpwm (and others) from the filesystem. This is
fine as those modules are already available in the image anyway.

We also refactor some stuff & clean up the build. Stumpish works now
too.
2015-04-05 14:09:16 +02:00
Aristid Breitkreuz
69874c27ec awesome manpage is broken in chroot builds, disable for now 2015-03-29 11:08:11 +00:00
William Casarin
ea2baa8abf spectrwm window manager 2015-03-21 11:02:44 -07:00
lethalman
e8ff24b034 Merge pull request #6759 from bstrik/master
2 more windowmaker dockapps
2015-03-12 11:33:01 +01:00
bstrik
9d7f4843d8 2 more windowmaker dockapps 2015-03-11 17:10:31 +01:00
Nikita Mikhailov
54290aaa35 i3: 4.9 -> 4.9.1 2015-03-10 16:18:50 +01:00
William A. Kennington III
dec84fd52c Merge pull request #6686 from blueyed/update-awesome-3.5.6
Update awesome 3.5.6
2015-03-08 16:09:11 -07:00
Michael Raskin
66b99b7d23 Update comiz 2015-03-09 01:03:01 +03:00
Nikolay Amiantov
9545c0b80e xmonad: cleanup wrapper 2015-03-08 18:38:04 +03:00
Daniel Hahler
421e79b8d1 awesome: do not depend on rxvt_unicode, but xterm
xterm is being used as terminal in the default configuration.
2015-03-06 00:04:48 +01:00
Daniel Hahler
0f7c125ca4 awesome: 3.5.5 -> 3.5.6 2015-03-05 23:56:32 +01:00
lethalman
e5dd67fc1e Merge pull request #6619 from bobvanderlinden/i3-4.9
i3: upgrade to 4.9
2015-03-02 18:04:19 +01:00
Bob van der Linden
97079a044d i3: upgrade to 4.9 2015-03-01 22:56:51 +01:00
Peter Simons
d8a586427b Merge pull request #6363 from anderspapitto/master
replace use of `which` with `command -v` in i3 scripts
2015-03-01 20:36:02 +01:00
AndersonTorres
5472af91f2 Fluxbox: update to 1.3.7 2015-02-28 11:04:20 -03:00
lethalman
c0b75a5785 Merge pull request #6443 from bstrik/master
dockapps for windowmaker
2015-02-26 10:00:01 +01:00
William A. Kennington III
3d2c7d791e weston: Update to 1.7.0 2015-02-19 10:13:44 -08:00
bstrik
6920d4fbeb dockapps for windowmaker 2015-02-18 21:53:47 +01:00
Anders Papitto
ec437bff92 replace use of which with command -v in i3 scripts 2015-02-16 08:08:16 +00:00
AndersonTorres
f19ed980a2 Sawfish (git): New Package
Sawfish is a versatile, Lisp-based window manager

In that commit I include all Sawfish stack:
- librep, a lisp system;
- rep-gtk, bindings for gtk
- sawfish, the window manager
2015-02-15 19:42:53 +03:00
Marcus Crestani
8e2fb7c816 i3: Set checkPhase only when on Linux. 2015-02-04 20:44:19 +01:00
Peter Simons
b7ecd5e729 Merge pull request #5025 from abbradar/xmonad-wrapper
nixos/xmonad: make a wrapper
2015-02-03 11:52:09 +01:00
AndersonTorres
1c0c07c2ed WindowMaker: adding support for more image formats
Now Windowmaker is built with support for almost all image formats
(except WEBP - its autodetection is failing)
2015-02-02 23:45:59 -02:00
Nikolay Amiantov
b7bb524f04 nixos/xmonad: move to haskell-ng and make a wrapper 2015-02-03 01:05:23 +03:00
Rok Garbas
21db3eaa60 i3lock: it's cleaner to use $out/share/man in the first place.
it is true that $out/man is automatically moved to $out/share/man, but using
"share" folder is cleaner solutions suggested by @edolstra here #6014
2015-01-28 19:56:13 +01:00
lethalman
136eea2c16 Merge pull request #6014 from malyn/fix-i3lock-man
i3lock: Make sure that man pages get installed
2015-01-28 10:25:06 +01:00
Michael Alyn Miller
ed359e453c
i3: Make sure that man pages get installed 2015-01-28 08:00:30 +01:00
Michael Alyn Miller
264da9e509 i3lock: Make sure that man pages get installed 2015-01-27 20:49:09 -08:00
Michael Raskin
dfb944087b Update StumpWM 2015-01-12 02:11:13 +03:00
Vladimír Čunát
081e5c8387 Merge #5061: add xwayland
Also resolve minor nitpicks -- *during* the merge commit.
2014-12-25 09:25:05 +01:00
Michael Raskin
19dd1be06c compiz: 0.9.11.2 → 0.9.12.0 2014-12-21 11:14:24 +03:00
Pascal Wittmann
f94580da69 Fix license attribute of many bsd-like licensed packages 2014-12-21 00:00:35 +01:00
Luca Bruno
614162ee6c Some lua and awesome improvements
- Move lgi to luaPackages
- Use luaPackages in awesome and passthru lua
- Allow to pass lua modules to the awesome WM so that those can be used in the configuration
2014-12-17 15:08:21 +01:00
Jaka Hudoklin
6b2e5c3262 i3: make i3-save-workspace work 2014-11-30 18:40:03 +01:00
David Virgilio
1d131a09a4 update weston: add xwayland support 2014-11-20 06:21:47 -06:00
Mateusz Kowalczyk
007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Moritz Heidkamp
083040a77e Better work-around for stumpwmContrib dependency 2014-10-29 15:17:06 +01:00
Moritz Heidkamp
5f07d275f8 Remove stumpwmContrib from top-level and fix runtime dependency on it
This patch removes the stumpwmContrib package from the top-level since
it can't sensibly be used on its own. Also, it wraps the stumpwm
executable with a dummy reference to the contrib dir to work around the
issue that the stumpwm executable doesn't reference the contrib dir
that's passed in the configure phase for some reason.
2014-10-29 15:17:06 +01:00
Nikolay Amiantov
9c665a8590 xmonad_log_applet: add packages 2014-10-27 02:07:32 +03:00
William A. Kennington III
e7c1c1d97a weston: 1.5.0 -> 1.6.0 2014-10-17 14:26:45 -07:00
Michael Raskin
2ef0a17561 Merge pull request #4387 from 1126/refactor-stumpwm
stumpwm: update and refactoring
2014-10-13 17:50:46 +04:00
Aristid Breitkreuz
982364b212 awesome: generate manpages 2014-10-11 21:56:50 +02:00
_1126
7536d41287 stumpwm: update and refactoring
This commit updates the stumpwm to version 0.9.8. Futhermore, it
refactors the expression quite a lot:

* stumpwm has been moved from lisp modules to window-managers.
* stumpwm has been added to the window managers NixOS knows about, this
  enables the user to add stumpwm as a default window manager in his
  NixOS configuration like with Xmonad or i3.
* the package has been split into stumpwm and stumpwmContrib. This is
  due to the fact that development of stumpwm and its extension modules
  has been split into two repositories. As of today, the release is the
  last one before this split. This split into two packages only reflect
  those upcoming upstream changes already.

It is planned to make the addition of the extension modules voluntarily,
like with Xmonads option "enableContribAndExtras". Furthermore it might
be possible to add an option to compile stumpwm with clisp instead of
sbcl.
2014-10-05 14:50:08 +02:00
Pascal Wittmann
bee638d269 icewm: update from 1.3.7 to 1.3.8 and removed obsolete patch 2014-09-29 19:39:35 +02:00
AndersonTorres
fb184b0316 Windowmaker: update to 0.95.6 2014-09-27 17:23:38 -03:00
Pascal Wittmann
d346a9cc07 fixed some meta.maintainers attributes 2014-09-26 23:44:29 +02:00
AndersonTorres
9c25f350a8 Ratpoison: updated for 1.4.8
Also, adding the infamous service file

Closes #4192
2014-09-21 20:05:12 +01:00
AndersonTorres
90fcd66599 AfterStep (version 2.2.12): New Package
AfterStep is a beautiful window manager, inspired by NEXTStep interface

Closes #4177
2014-09-21 00:03:44 +01:00
AndersonTorres
c6f28f988c Windowmaker: adding system service file, and a long description
Closes #4066
2014-09-20 23:36:07 +01:00
José Romildo Malaquias
69446d1461 openbox window manager: add tool to set desktop layout 2014-09-15 08:40:41 -03:00
Pascal Wittmann
8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
William A. Kennington III
686a139f29 Merge pull request #4030 from AndersonTorres/small-fixups
Small style fixups
2014-09-11 21:27:54 -07:00
Michael Raskin
bdea812836 Fix JWM source URL 2014-09-11 15:54:10 +04:00
AndersonTorres
b39e5ce957 Small style fixups
In this commit, I modified some files, conforming them to a
idiosyncratic standard - mainly, a template for meta attribs.
2014-09-10 21:34:50 -03:00
Bjørn Forsman
c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
AndersonTorres
49fcac0d6b Fluxbox: adding system support (as a module) 2014-08-21 07:03:37 -03:00
AndersonTorres
fe270c011c Fluxbox: new package (1.3.5) 2014-08-19 06:19:33 -03:00
Steve Bigham
df8e7f5614 Remove unnecessary dependencies and centralize version string. 2014-08-14 21:01:20 -04:00
Matt Miemiec
8695c58648 Add the bspwm window manager to Nix. 2014-08-12 18:22:15 +02:00
Peter Simons
5ebc4d829b Re-generate Haskell expressions with latest cabal2nix. 2014-08-09 13:49:24 +02:00
Peter Simons
18250b97ae Remove 'andres' from the meta.maintainer section of all Haskell package where I
had added him earlier.
2014-08-09 13:49:24 +02:00
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
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
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 21bf5ef509 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
Eelco Dolstra
d5758c99a3 Merge remote-tracking branch 'origin/master' into x-updates
Conflicts:
	pkgs/misc/maven/maven-1.0.nix
	pkgs/os-specific/linux/xf86-input-wacom/default.nix
2012-09-26 14:51:51 -04:00
Peter Simons
9a6c3c8f60 xmonad-extras: patch to allow building with split 0.2.x 2012-09-17 15:50:11 +02:00
Peter Simons
7596ce3dbb Remove myself as maintainer of these packages. 2012-09-11 18:22:31 +02:00
Carles Pagès
dabc583abb awesome: update to 3.4.13
I removed some patches that were no longer needed. Russian manpages still fail.
2012-08-06 17:43:30 +02:00
Rickard Nilsson
1786bef686 trayer: Update to 1.1.5 2012-07-26 17:02:36 +02:00
Shea Levy
4497344e49 Merge branch 'master' into x-updates 2012-07-18 23:24:10 -04:00
Peter Simons
7e2979b56f i3: fix build some more
The build process depends on a script that relies on /usr/bin/env to find Perl.
Running 'patchShebangs' early fixes that script.
2012-07-17 14:44:23 +02:00