Commit graph

581 commits

Author SHA1 Message Date
Robin Gloster
c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Kamil Chmielewski
43e617b487 matchbox: update source urls + libmatchbox: 1.9 -> 1.11 (#15160) 2016-05-02 12:26:32 +02:00
José Romildo Malaquias
9ea3a37767 compton-git: 2015-04-20 -> 2015-09-21 2016-04-29 10:14:36 -03:00
Moritz Ulrich
f503831956 herbstluftwm: 0.6.2 -> 0.7.0. 2016-04-28 18:10:17 +02:00
Frederik Rietdijk
d5e6a4494a Python: use PyPI mirror (#15001)
* mirrors: add pypi

* Python: Use pypi mirror for all PyPI packages
2016-04-26 13:38:03 +01:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Christian Lask
8c21d5a454 bar-xft: 020a3e1 -> 3020df1 2016-04-15 22:57:57 +02:00
joachifm
7beb007a59 Merge pull request #14723 from hiberno/bspwm-update
bspwm: 0.9 -> 0.9.1
2016-04-15 18:04:32 +02:00
Christian Lask
767fdbfe4c sxhkd: 0.5.5 -> 0.5.6 2016-04-15 17:37:07 +02:00
Christian Lask
425258054c bspwm: 0.9 -> 0.9.1
This is more than just a bugfix release. Make sure to read
https://github.com/baskerville/bspwm/wiki/Upcoming-Changes-in-0.9.1.
2016-04-15 17:28:06 +02:00
Vladimír Čunát
39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
José Romildo Malaquias
9d0e57b84e jwm: 1406 -> 1495 (#14629) 2016-04-12 17:18:40 +02:00
Vladimír Čunát
30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Alexander Ried
c6a4bc4ae5 weston: 1.9.0 -> 1.10.0 2016-04-08 23:22:58 +02:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Robin Gloster
f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
José Romildo Malaquias
e39f9a2c11 awesome: include manual pages 2016-03-27 12:14:46 -03:00
Sheena Artrip
7fb57383fc i3: 4.11 -> 4.12 2016-03-23 01:17:16 -04:00
Michael Raskin
74f04dc83c stumpwm: Pass through the sbcl and lispPackages used 2016-03-21 19:55:25 +01:00
Joachim Fasting
9ae0e6633e clfswm: mark as broken
This package has been broken for quite a long time.  I attempted
to fix it, to no avail.

See also: https://hydra.nixos.org/build/33498133/nixlog/2/raw
2016-03-19 15:52:12 +01:00
Robin Gloster
3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
Joachim Fasting
868082f616 sway: fix build
Building the manual requires docbook_xsl; in sandboxed environments,
the build would fail due to being unable to download missing docbook
resources.

Also include some minor improvements to the build recipe:
- use fetchFromGitHub
- move build-time dependencies to nativeBuildInputs

xref: https://github.com/NixOS/nixpkgs/pull/13900
2016-03-14 13:02:01 +01:00
Nikolay Amiantov
db090ce659 openbox: add platforms, split version 2016-03-12 03:19:37 +03:00
José Romildo Malaquias
83d814f600 awesome: 3.5.8 -> 3.5.9 2016-03-09 17:50:28 -03:00
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
José Romildo Malaquias
5856e89b2c jwm: 2.2.2 -> 1406 2016-03-07 16:11:13 -03:00
Franz Pletz
cb3d27df93 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-05 18:55:30 +01:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
joachifm
02327d3a44 Merge pull request #13431 from igsha/i3pystatus
i3pystatus: 3.33 -> 3.34
2016-03-05 13:12:10 +00:00
Robin Gloster
3b4765c9e5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-28 16:32:57 +00:00
zimbatm
17348dc094 Remove all dots at end of descriptions
Specially crafted for @JagaJaga

    find pkgs -name "*.nix" -exec \
      sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
2016-02-27 17:30:29 +00:00
Robin Gloster
3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
Igor Sharonov
00d32bb99f i3pystatus: 3.33 -> 3.34 2016-02-25 21:30:37 +03:00
Robin Gloster
928c904a5b stalonetray: disable format hardening 2016-02-23 00:57:11 +00:00
Frederik Rietdijk
4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Kamil Chmielewski
314e4edf59 qtile: 0.10.2 -> 0.10.4 2016-02-15 14:17:10 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Domen Kožar
e47d323a10 Merge pull request #12904 from tg-x/wayland-wm
wayland window managers: orbment, sway, velox
2016-02-10 16:49:37 +00:00
Eelco Dolstra
aea262f654 Fix misspelled meta.maintainers attributes 2016-02-10 14:59:50 +01:00
tg(x)
877dc973ab wayland window managers: orbment, sway, velox -> latest git 2016-02-09 23:41:01 +01:00
tg(x)
521d74524d Merge branch 'master' of https://github.com/NixOS/nixpkgs into wayland-wm 2016-02-09 22:40:00 +01:00
tg(x)
e1bcc74135 wayland window managers: orbment, sway, velox 2016-02-09 22:35:16 +01:00
Domen Kožar
89fa4724f1 Merge pull request #12873 from ericsagnes/feat/i3
i3: move dependencies to runtime
2016-02-08 13:16:11 +00:00
Eric Sagnes
65beea69d7 i3status: 2.9 -> 2.10, fixes #12872 2016-02-08 05:58:20 +01:00
Eric Sagnes
b2c658ca11 i3: dmenu and i3status as runtime dependencies 2016-02-08 13:29:42 +09:00
Vladimír Čunát
54299b60c4 Merge #12779: Mass replace pkg}/bin-style strings
... to refer to correct outputs
2016-02-03 17:25:22 +01:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Tuomas Tynkkynen
5dfcafb205 treewide: Mass replace 'xwayland}/bin' to refer the 'out' output 2016-02-01 20:46:27 +02:00
José Romildo Malaquias
866937a9f8 awesome: 3.5.7 -> 3.5.8 2016-01-31 11:34:10 -02:00
Alexander V. Nikolaev
c53e932e5b fvwm: Missing libXt build input 2016-01-27 15:37:13 +02:00
Alexander V. Nikolaev
f07a7fc5fd qtile: dlopen'able path now are in "out", not "dev" 2016-01-26 23:01:05 +02:00
José Romildo Malaquias
d9a407a8c4 awesome: 3.5.6 -> 3.5.7 2016-01-22 15:42:52 -02:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
koral
9ed9457846 lemonbar: 1.1 -> 1.2pre
'bar' has been officially renamed 'lemonbar'.
Last release (1.1) is almost a year old, but some bugfixes and new features are available in the repository, let's include them in the derivation.
2016-01-16 16:03:18 +01:00
Michael Raskin
9201598227 compiz: 0.9.12.1 -> 0.9.12.2 2016-01-01 12:30:17 +03:00
Arseniy Seroka
b9bfedd64d Merge pull request #11999 from kamilchm/qtile-0.10.3
qtile: 0.10.2 -> 0.10.3
2015-12-31 14:56:50 +03:00
Emery
952563d620 WindowLab: initial pkg at 1.40
http://nickgravgaard.com/windowlab/
2015-12-30 11:10:30 +01:00
Kamil Chmielewski
cb0ddd9d6a qtile: 0.10.2 -> 0.10.3 2015-12-28 11:02:05 +01:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Birger J. Nordølum
1fe89386fd i3blocks: 1.4 (NEW) (WIP) 2015-12-11 08:55:14 +01:00
Sou Bunnbu
a190cb7636 Merge pull request #11432 from edanaher/fvwm-gestures
Fvwm: add gestures and create libstroke package
2015-12-09 16:25:51 +08:00
Peter Panaguiton
1b0edf40c3 cwm: init at 5.6, fixes #11458 2015-12-05 20:47:09 +01:00
Evan Danaher
523d6846a7 fvwm: add gestures option to use libstroke 2015-12-03 00:31:24 -05:00
Arseniy Seroka
7aa42e1f31 Merge pull request #11402 from robgssp/clfswm-fix
clfswm: fix contrib-dir path
2015-12-02 22:47:11 +03:00
Robert Glossop
cdfd370c9e clfswm: fix contrib-dir path 2015-12-02 04:30:29 -05:00
Alexander V. Nikolaev
28c44a15c7 qtile: rework package
* Use absolute paths to load gobject, pango and cairo.
* Add xcb-cursor support (also with absolute path)
* Avoid tainting child processes environment:
  Save PATH and PYTHONPATH in wrapper, and restore them in python code.
* Alter restart process, using $0 saved in wrapper, which allow user
  to restart qtile after system rebuild to upgrade it.
2015-12-01 13:46:18 +02:00
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Pascal Wittmann
6d25c0f1b3 Remove unneeded 'with's from meta.platforms 2015-11-25 23:06:09 +01:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Joachim Fasting
342cf232ea fbpanel: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Joachim Fasting
fed17b3467 stalonetray: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Pascal Wittmann
7fd2796e99 Replace 'with plaforms; platform' with 'platforms.platform' 2015-11-17 21:30:43 +01:00
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