Commit graph

416 commits

Author SHA1 Message Date
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