JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,059 Commits 2 Branches 0 Tags 13 GiB
d5ab3fb887
Commit Graph

332 Commits

Author SHA1 Message Date
Dmitry Malikov
7ad0646dc0 haskellPackages.cabalg: 0.2.9 2014-09-20 13:32:43 +04:00
Luca Bruno
fc265a85aa Fix evaluation 2014-09-18 10:47:01 +02:00
Longrin Wischnewski
960fdf0f2e clamav: add myself to lib.maintainers 2014-09-18 08:15:16 +02:00
Peter Simons
55d5747a90 Merge pull request #4102 from ftrvxmtrx/alock 
added alock package
 2014-09-17 23:42:49 +02:00
Rob Vermaas
f7f9580545 Merge pull request #4092 from ts468/pam_mount 
New packages: pam_mount and libHX
 2014-09-17 13:15:22 +02:00
Edward Tjörnhammar
2bbd01485a init list helper 2014-09-16 18:12:39 +02:00
Siarhei Zirukin
b8848c070c added alock package 2014-09-16 09:25:47 +02:00
koral
ce0dd9e335 Added bashmount package. 2014-09-15 18:29:47 +02:00
Thomas Strobel
7e4c24af7a Fix description in pam_mount and libHX. Add tstrobel as maintainer. 2014-09-15 12:30:19 +02:00
Robert Helgesson
9241dd5671 Add myself to maintainers.nix. 2014-09-13 10:14:26 +02:00
Pascal Wittmann
3c6eceb5fb Merge pull request #4008 from dbohdan/master 
Add Jim Tcl interpreter
 2014-09-12 21:36:58 +02:00
Danyil Bohdan
2a89610d9a jimtcl: add dbohdan as maintainer 2014-09-12 22:23:59 +03:00
cillianderoiste
56f6952f0d Merge pull request #4049 from vandenoever/musescore 
Add MuseScore 1.3.
 2014-09-12 18:53:14 +02:00
Jos van den Oever
8a4ce8cf34 Add MuseScore 1.3. 2014-09-12 16:52:44 +02:00
Vladimír Čunát
963b5e820c lib/licenses: add cc-by-40 (fixes #4035) 2014-09-11 20:03:03 +02:00
Eelco Dolstra
585983bc95 Merge remote-tracking branch 'origin/staging' 
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
 2014-09-08 11:42:09 +02:00
Nicolas Pierron
4ff1ab5a56 Remove types.functionTo. 2014-09-07 19:41:45 +02:00
Nicolas Pierron
b5f0cc3cda Merge options having the submodule type. 
Now we should be able to have multiple declaration of the same option as
long as all declarations have the same type.  If the type has a sub module,
then it is merged with the submodules of other declarations, as done with
option sets.

In addition, the file of the option declaration is passed into the
submodule, such as the documentation can display it correctly.
 2014-09-07 19:03:20 +02:00
Nicolas Pierron
bb944b4dc8 Annotate option-set options with the file in which they are declared. 
This modification improves NixOS manual by listing in which file, each
submodule option is declared.  This solve the issue that files are not
reported when looking at options such as fileSystems.<name?>.neededForBoot
 2014-09-07 19:03:20 +02:00
Bob van der Linden
c839205a69 added libfreefare 
A library on top of libnfc for MIFARE support.
 2014-09-07 16:23:23 +02:00
Aristid Breitkreuz
494ba98e65 fix typo in postgresql license definition 2014-09-04 20:40:03 +02:00
Aristid Breitkreuz
73e569bf01 add postgresql 9.4beta2 2014-09-04 20:36:43 +02:00
Aristid Breitkreuz
0ec38e5b7f Add myself to lib/maintainers.nix 2014-09-04 20:36:43 +02:00
Moritz Heidkamp
6f682f9afb Add Chibi-Scheme expression 2014-09-04 16:06:42 +02:00
Peter Simons
1c0d15b90e Merge branch 'origin/master' into staging. 
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
 2014-09-02 12:31:03 +02:00
Daniel Peebles
3182cf00ff Add xar 2014-08-30 22:52:46 +01:00
Nicolas B. Pierron
a5d6219897 Merge pull request #3864 from nbp/useless-submodules 
Remove useless use of undocumented submodules.
 2014-08-30 18:21:17 +02:00
Florent Becker
59b1bd0607 Add myself to the maintainer list 2014-08-30 19:37:15 +04:00
Vladimír Čunát
e51f73652d Merge recent master into staging 
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
 2014-08-30 10:04:02 +02:00
Vladimír Čunát
3f0ebe7e75 licenses: comment about two versions of MIT 
I decided to follow spdx.org and not to differentiate those two.
Packages would often have the wrong version anyway.
 2014-08-30 07:28:26 +02:00
Nicolas Pierron
eb7a17a1cf Add error an message to prevent use of useless submodules. 2014-08-29 18:54:15 +02:00
Michael Raskin
121050046d Adding flashrom BIOS update utility. Patch by Edward O'Callaghan 2014-08-29 01:27:28 +04:00
Michael Raskin
c7bb162710 Factor out the maintainer 2014-08-29 01:19:24 +04:00
Michael Raskin
f25709c48a List NCSA license properly 2014-08-29 01:14:10 +04:00
lethalman
b722b4c90f Merge pull request #3828 from manveru/di 
Add di package
 2014-08-28 14:23:16 +02:00
Michael Fellinger
e07b5c95af Add di package 2014-08-28 14:16:11 +02:00
Rüdiger Sonderfeld
ae9afc4d31 licenses: Add CC0 license. 
A universal public domain license.

http://creativecommons.org/publicdomain/zero/1.0/
 2014-08-28 13:03:32 +02:00
Eelco Dolstra
b1ce3cc172 Manual: Handle XML files in subdirectories 2014-08-25 14:33:33 +02:00
Rickard Nilsson
684e8b241e Merge pull request #3780 from ip1981/master 
Fixed rewrite rules for Mediawiki
 2014-08-25 12:46:08 +02:00
Igor Pashev
0383b57b3c Added concatMapStringsSep and concatImapStringsSep 
Example: configure rewrite rules for Mediawiki

    RewriteEngine On
    RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f
    RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d
    ${concatMapStringsSep "\n" (u: "RewriteCond %{REQUEST_URI} !^${u.urlPath}") serverInfo.serverConfig.servedDirs}
    RewriteRule ${if config.enableUploads
 2014-08-25 10:23:10 +02:00
Philip Horger
83c5a3d22d pnmixer: Add maintainer and fix name 2014-08-25 10:03:26 +02:00
Cray Elliott
85cdd7ce33 Add SDL2_net v2.0.0 2014-08-24 10:21:47 +02:00
Nathaniel Baxter
33879427b7 maintainers: add myself as a maintainer to obconf and teamspeak_client 2014-08-24 10:10:13 +02:00
Aycan iRiCAN
1ff1fe44d9 Added myself to maintainer of hdaemonize and hweblib 2014-08-23 12:28:35 +03:00
Daniel Bergey
a24775bf22 haskell Diagrams libraries 
latest versions support lens-4.4 - fix broken builds
add bergey as maintainer
 2014-08-23 02:05:39 +00:00
Vladimír Čunát
d4e9fd2a90 Merge recent master into staging 
Hydra: ?compare=1148749

Conflicts (easy):
	nixos/modules/virtualisation/containers.nix
 2014-08-21 15:09:31 +02:00
Eelco Dolstra
f932910323 types.nix: Add ‘either’ type 2014-08-19 18:24:37 +02:00
Nathan Bijnens
23da6f9ca4 mailutils: fix for sendmail path 2014-08-15 21:16:33 +02:00
Eelco Dolstra
df7bc53606 Merge remote-tracking branch 'origin/master' into staging 2014-08-15 02:15:14 +02:00
Vladimír Čunát
5d8c8845ed licenses: add LPL-102 2014-08-15 00:11:09 +02:00
Luca Bruno
b83aceaecb Merge branch 'master' into staging 2014-08-14 23:09:59 +02:00
Vladimír Čunát
7133c791b5 licenses: fixup double isc definition 2014-08-14 21:04:24 +02:00
Vladimír Čunát
d1ed0f44cd Merge #2823: better cygwin support, also add x86_64 
Conflicts (easy):
	pkgs/development/interpreters/perl/5.16/default.nix
 2014-08-14 20:38:09 +02:00
William A. Kennington III
ae48ab82ad license: Add isc 2014-08-13 15:10:04 -05:00
Vladimír Čunát
665b2c8247 Merge #3408: licenses: prefer spdx.org, improve docs 
The patch to allow using license shortnames as attributes
was not included (yet).

Conflicts (auto-solved):
	pkgs/development/libraries/libtiff/default.nix
 2014-08-12 19:08:53 +02:00
Vladimír Čunát
905b163b49 Revert "lib/licenses.nix: allow choosing license by its shortName" 
There's no consensus to adopt that (yet).
This reverts commit 229e5c41df.
 2014-08-12 19:05:54 +02:00
Matt Miemiec
8695c58648 Add the bspwm window manager to Nix. 2014-08-12 18:22:15 +02:00
Christoph Hrdinka
f44e69a55d luminanceHDR: add version 2.4.0 
fixes #3229
 2014-08-12 10:19:35 +02:00
Damien Cassou
fe045a71c4 Adding myself to the maintainers 2014-08-10 15:57:24 +02:00
Luca Bruno
b331ae33d7 Make platforms.allBut accept a list rather than a single platform 2014-08-09 12:31:33 +02:00
NOTtheMessiah
127441813b added license for gcolor2 and myself to maintainers 2014-08-07 01:19:24 +02:00
William A. Kennington III
ede3e60a3c unifi: Add wkennington as a maintainer 2014-08-05 21:48:19 -05:00
Vladimír Čunát
229e5c41df lib/licenses.nix: allow choosing license by its shortName 
Example: license = licenses."GPL-2.0+";
This comes with some performance cost during eval of licenses.nix,
but that's probably negligible.
 2014-07-30 19:22:09 +02:00
Vladimír Čunát
0f2101215d lib/licenses.nix: improve sortedness 2014-07-30 18:16:36 +02:00
Vladimír Čunát
32c237d782 lib/licenses.nix: convert to spdx.org shortnames 
Done where possible, replacing links to point to spdx.org (probably stabler).
Also make libtiff use its dedicated license.
 2014-07-30 18:16:09 +02:00
Paul Colomiets
9bc1676e5a Upgrade docker to 1.1.2 and add docker module 
This version of module has disabled socketActivation, because until
nixos upgrade systemd to at least 214, systemd does not support
SocketGroup. So socket is created with "root" group when
socketActivation enabled. Should be fixed as soon as systemd upgraded.

Includes changes from #3015 and supersedes #3028
 2014-07-28 21:45:49 +02:00
Sven Keidel
ee9ffde1cb added metainformation for gpodder and mygpoclient 2014-07-21 21:41:27 +02:00
tv
c12f6e3ce9 maintainers: add tv 2014-07-12 13:18:46 +02:00
cillianderoiste
d6e8e764ae Merge pull request #3233 from wjlroe/exercism 
New Exercism package
 2014-07-10 18:56:47 +02:00
William Roe
09209878c6 Added wjlroe (me) as maintainer of this new Exercism package 2014-07-10 15:03:50 +01:00
Martin Lavoie
3df7911f35 Add bitbucket-cli to nixpkgs 
Adding refnil as mainteners

Added alias in top-level
 2014-07-09 01:15:49 +02:00
Oliver Charles
847a9a5c30 Merge pull request #3206 from bosu/mp3splt 
Add mp3splt: utility to split mp3 files
 2014-07-07 19:58:00 +01:00
Boris Sukholitko
70ad9ad8f9 Add mp3splt 2014-07-07 21:38:14 +03:00
Jascha Geerds
28322c8d58 Packaging plasma-nm and its dependencies 2014-07-05 13:54:01 +02:00
Oliver Charles
2480f2465c Merge pull request #3138 from flosse/lua5-expat 
added luaexpat 1.3.0
 2014-07-01 08:47:39 +01:00
Michael Raskin
d001de0100 Merge pull request #3102 from auntieNeo/ipafont 
Added package for Japanese IPAFonts.
 2014-06-30 10:19:48 +04:00
Michael Raskin
d41a7bd9e2 Merge pull request #2871 from auntieNeo/kochi-substitute 
Added Kochi substitute Japanese font package
 2014-06-30 10:14:14 +04:00
Markus Kohlhase
7987cd2cc1 added luaexpat 1.3.0 2014-06-30 00:38:05 +02:00
Michael Raskin
a278c3dfa8 Fix tarball by adding the missing maintainer entry; email copied from commit metadata 2014-06-29 10:18:39 +04:00
Vladimír Čunát
c00f589ff2 licenses: add attribute "free" to fix eval of smlnjBootstrap 2014-06-27 09:48:42 +02:00
Jan Malakhovski
0ea84c4445 minor fix in documentation 
Signed-off-by: Domen Kožar <domen@dev.si>
 2014-06-26 11:13:15 +02:00
Jonathan Glines
339b347987 Added package for Japanese IPAFonts. 2014-06-15 10:02:41 -06:00
Jonathan Glines
b913409e0b Removed non-free kochi-substitute and added kochi from Debian package. 2014-06-11 22:08:14 -06:00
Vladimír Čunát
e1775895a6 Merge #2711: add ansible-1.6.1 
Conflicts (trivial):
	lib/maintainers.nix
 2014-06-11 20:29:55 +02:00
Kirill Elagin
751a01063d lib: Do not take string context into account 
Close #2883.
 2014-06-11 20:22:58 +02:00
Jonathan Glines
8e2556bd7f Added auntie as a maintainer, and set license properly. 2014-06-08 23:47:59 -06:00
Austin Seipp
ec1eadf5a0 Merge pull request #2691 from joelteon/cdecl-osx 
Update cdecl to block-supporting version
 2014-06-03 20:37:30 -05:00
Philip Lykke Carlsen
e87da7761a subtitleeditor, gstreamermm: new packages 2014-06-03 22:00:47 +02:00
Peter Simons
ce7be7584f Merge pull request #2790 from ehmry/unbound 
unbound: update from 1.4.21 to 1.4.22, service from Upstart to systemd
 2014-05-30 14:46:29 +02:00
Emery Hemingway
0ddce8db12 unbound: update from 1.4.21 to 1.4.22, service from Upstart to systemd 2014-05-29 09:59:55 -04:00
Sander van der Burg
9ec52d6323 Fixes to make basic builds on Cygwin work again + additions to support x86_64-cygwin 2014-05-29 14:47:07 +02:00
Matthew Brown
3e7f8bce62 maintainers.nix: add missing edeoryd46, fixing channel 
Close #2783.
 2014-05-28 21:51:35 +02:00
Alexei Robyn
4fa4518875 Add TeamSpeak 3 server & service module (close #2056) 
Conflicts (trivial):
	lib/maintainers.nix
	nixos/modules/misc/ids.nix
 2014-05-27 17:30:26 +02:00
Luca Bruno
0f51ae90b9 Revert "typescript: add package. Closes #2712" 
This reverts commit 93a7cf74b9.
 2014-05-21 15:57:34 +02:00
Jussi Maki
93a7cf74b9 typescript: add package. Closes #2712 
Typed superset of JavaScript that compiles to plain JavaScript.

http://www.typescriptlang.org/
 2014-05-21 15:21:48 +02:00
Jussi Maki
75cb485718 ansible: conventions, fix module execution 2014-05-21 14:46:37 +02:00
Jussi Maki
92d8001c25 ansible: Add maintainer 2014-05-21 09:41:48 +02:00
Joel Taylor
d56dcb50f4 add me to maintainers 2014-05-18 20:52:18 -07:00
Vladimír Čunát
4da7eb78ec lib/maintainers: add "berdario", maintain redis 
Relates #2541.
 2014-05-15 21:11:17 +02:00
Eelco Dolstra
168fe56f3b Merge branch 'monit-5.8' of github.com:wmertens/nixpkgs 2014-05-15 14:42:20 +02:00
Vladimír Čunát
bf2bc0f0dc lib/strings: add hasPrefix and simplify hasSuffix 
It was discussed as a part of #2570.
 2014-05-13 11:05:37 +02:00
Vladimír Čunát
180bd65cd0 lib/strings: simplify removePrefix readability 
It was discussed as a part of #2570.
 2014-05-13 11:04:38 +02:00
Eelco Dolstra
ea36f3b868 fetchFromGitHub: Use .tar.gz instead of .zip 
Also clean up the name attribute of fetchzip derivations a bit.
 2014-05-09 15:53:44 +02:00
Rob Vermaas
0d50061b4f Merge pull request #2454 from MarcWeber/submit/document-composableDerivation 
Shea told me composableDerivation is hard to understand.
 2014-05-09 15:16:28 +02:00
cillianderoiste
45ed706cea Merge pull request #2536 from CodeBlock/poly-font 
Poly font
 2014-05-07 09:48:26 +02:00
Ricky Elrod
139c6fb180 Add OFL as an actual license 2014-05-06 04:04:43 -04:00
Ricky Elrod
df0014488a First attempt at data/fonts/poly 2014-05-06 03:48:04 -04:00
Rob Vermaas
90a7711e08 Re-introduce (marked as obsolete) mkStrict function, to allow old nixops deployments to keep working. 2014-05-05 12:29:38 +02:00
Wout Mertens
e017139e70 Add wmertens to maintainers 2014-05-04 09:50:58 +02:00
Austin Seipp
145dcdc539 Add licenses for CompCert/Z3 
Both of these allow for binary redistribution.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-01 19:08:59 -05:00
Shea Levy
da4adc2a4f Fix description to match convention 2014-05-01 11:46:44 -04:00
Shea Levy
ab2cd34076 Add enum option type 2014-05-01 11:30:20 -04:00
Austin Seipp
6d52463bd3 nixpkgs: add alt-ergo 0.95.2 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-05-01 02:42:31 -05:00
Marc Weber
31fc4c6aa4 Shea told me composableDerivation is hard to understand. 
Thus comment it and why it was written long time ago until it'll get replaced piecewise.
 2014-04-30 20:31:40 +02:00
Peter Simons
3445df42a4 Merge pull request #2368 from Chaddai/texmaker 
TeXmaker
 2014-04-28 22:42:47 +02:00
Mateusz Kowalczyk
9a77b8e64f tibia: version 10.38 
Closes #2396
 2014-04-26 12:58:25 -05:00
Charles Strahan
604a4b680c capnproto: Add package 2014-04-25 11:18:18 -04:00
Chaddaï Fouché
3701fdf066 Adding myself to lib/maintainers.nix 2014-04-24 11:40:06 +02:00
Vincent Bernardoff
ce422b4553 Updated OCaml package findlib 2014-04-21 23:06:35 +02:00
John Wiegley
5c18bbe34f Update ledger expression, add myself as a maintainer 2014-04-17 21:47:15 -05:00
Luca Bruno
9d5a06cfe7 gnome3: use package names for environment.gnome3.excludePackages 2014-04-14 09:58:03 +02:00
Luca Bruno
b4096479fa gnome-user-docs: new package licensed under the new licenses.cc-by-30 
User and system administration help for the Gnome

https://help.gnome.org/users/gnome-help/3.10
 2014-04-14 09:58:02 +02:00
Ertugrul Söylemez
7be040cdcb maintainers: ertes: New temporary email address. 2014-04-11 21:17:22 +02:00
Luca Bruno
a3115707dd Add environment.gnome3.excludePackages 
Give the user a full desktop, and the possibility to exclude
non-base packages from the default list of packages.
 2014-04-09 00:36:53 +02:00
Shea Levy
ea9c8d6a13 Merge branch 'rippled' of git://github.com/ehmry/nixpkgs 
rippled: initial pkg and module expressions

Had to change the rippled uid.

Conflicts:
	nixos/modules/misc/ids.nix
 2014-04-05 14:23:29 -04:00
Eelco Dolstra
0469f92faf Bring back mkOrder 2014-03-30 20:35:25 +02:00
Eelco Dolstra
aaf01268ff Revert "slim: remove duplicate code" 
This reverts commit f7d5e83abb.  It
breaks the Firefox and Xfce tests:

  in job ‘tests.firefox.x86_64-linux’:
  cannot coerce a boolean to a string

  in job ‘tests.xfce.x86_64-linux’:
  infinite recursion encountered
 2014-03-30 17:06:01 +02:00
Emery Hemingway
6c77690b28 rippled: initial pkg and module expressions 
rippled is the Ripple P2P payment network reference server
https://ripple.com
 2014-03-29 15:31:37 -04:00
Maxim Ivanov
f949a71aac add libmsgpack C/C++ library (close #2059) 2014-03-29 14:38:53 +01:00
Shea Levy
63f97fe9db Merge branch 'slim_fix' of git://github.com/jagajaga/nixpkgs 
add normal theme support for slim and slimlock
 2014-03-29 00:17:52 -04:00
Shea Levy
8a15cfdaec Merge branch 'mps' of git://github.com/thoughtpolice/nixpkgs 
Add mps 1.113.0, fix usage of Sleepycat license
 2014-03-28 23:03:20 -04:00
_1126
34301c89e1 ncmcp: New expression 2014-03-26 12:15:01 +01:00
Shea Levy
97a733ae57 Merge branch 'submit/sloane' of git://github.com/akc/nixpkgs 
Add sloane -- a command line interface to OEIS
 2014-03-26 02:42:22 -04:00
Austin Seipp
023464f13f licenses: add Sleepycat Public License 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-03-24 19:58:11 -05:00
Shea Levy
fc0ea57efc Merge branch 'misc-gvolicon' of git://github.com/bennofs/nixpkgs 
new expression: gvolicon
 2014-03-22 20:56:00 -04:00
Benno Fünfstück
3f2b74bf08 new expression: gvolicon 2014-03-22 12:50:45 +01:00
AndersonTorres
f7498e5a7e Adding info about maintainer (myself - AndersonTorres) and modifying the meta.license field for some packages I have made. 2014-03-22 01:12:48 -03:00
Anders Claesson
ac3de98f07 Add sloane -- a command line interface to OEIS. 2014-03-18 14:37:56 +00:00
Shea Levy
dddb4f45e9 Merge branch 'pr-wqy' of git://github.com/PkmX/nixpkgs 
Bump wqy-zenhei font to the latest version and add wqy-microhei
 2014-03-15 13:22:31 -04:00
Domen Kozar
059e8e179b set all licenses to be attributes (and wait for Nix 1.7) 2014-03-12 21:20:43 +01:00
Arseniy Seroka
f7d5e83abb slim: remove duplicate code 2014-03-11 16:27:27 +04:00
Domen Kožar
2de56d103c Merge pull request #1837 from falsifian/apt-offline 
apt-offline: offline APT package manager
 2014-03-10 21:39:43 +01:00
Eelco Dolstra
e167cf9f21 Make appendToName do the right thing 
I.e. append a suffix *before* the version, rather than after.  So we
get "sqlite-interactive-3.8.0.2" instead of
"sqlite-3.8.0.2-interactive".  The latter is broken since nix-env just
sees it the suffix as part of the version, so "nix-env -u" will
happily upgrade "sqlite-3.8.0.2-interactive" to "sqlite-3.9".
 2014-03-10 15:01:56 +01:00
José Romildo Malaquias
ab75d0fd77 Add romildo to maintainers list 2014-03-07 21:52:36 +01:00
Thomas Tuegel
9fab4366bf Add ttuegel to maintainers list 2014-03-07 14:49:48 +01:00
Eelco Dolstra
ebe57b1ac8 Remove lib.typeOf 
It clashes with builtins.typeOf.
 2014-02-27 21:27:29 +01:00
Matthew Sackman
5e09175765 add serfdom (close #1672) 2014-02-27 19:18:28 +01:00
James Cook
2294553cb1 apt-offline: offline APT package manager 2014-02-25 21:33:51 -08:00
Ricardo M. Correia
6554a490f6 gradm, pax-utils, paxctl: Add myself as a maintainer 2014-02-22 20:17:00 +01:00
cillianderoiste
f47d6a1314 Merge pull request #1792 from larkery/davmail-and-lxappearance 
Add lxappearance and davmail
 2014-02-20 23:08:04 +01:00