Merge branch 'master' of github.com:NixOS/nixpkgs

This commit is contained in:
Aristid Breitkreuz 2014-08-29 18:33:47 +02:00
commit 89d8d20ac4

View File

@ -2549,11 +2549,11 @@ rec {
radicale = buildPythonPackage rec { radicale = buildPythonPackage rec {
name = "radicale-${version}"; name = "radicale-${version}";
namePrefix = ""; namePrefix = "";
version = "0.9b1"; version = "0.9";
src = fetchurl { src = fetchurl {
url = "http://pypi.python.org/packages/source/R/Radicale/Radicale-${version}.tar.gz"; url = "http://pypi.python.org/packages/source/R/Radicale/Radicale-${version}.tar.gz";
sha256 = "3a8451909de849f173f577ddec0a085f19040dbb6aa13d5256208a0f8e11d88d"; sha256 = "77bf813fd26f0d359c1a7b7bcce9b842b4503c5516989a4a0a4f648e299e41f7";
}; };
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with pythonPackages; [
@ -2566,6 +2566,7 @@ rec {
meta = { meta = {
homepage = "http://www.radicale.org/"; homepage = "http://www.radicale.org/";
description = "CalDAV CardDAV server";
longDescription = '' longDescription = ''
The Radicale Project is a complete CalDAV (calendar) and CardDAV The Radicale Project is a complete CalDAV (calendar) and CardDAV
(contact) server solution. Calendars and address books are available for (contact) server solution. Calendars and address books are available for