radicale: 1.1.4 -> 2.1.2

This commit readds and updates the 1.x package from 1.1.4 to 1.1.6 which
also includes the needed command for migrating to 2.x

The module is adjusted to the version change, defaulting to radicale2 if
stateVersion >= 17.09 and radicale1 otherwise. It also now uses
ExecStart instead of the script service attribute. Some missing dots at
the end of sentences were also added.

I added a paragraph in the release notes on how to update to a newer
version.
This commit is contained in:
Silvan Mosberger
2017-08-13 17:23:43 +02:00
parent 5bc183ebf8
commit e16a0988bc
7 changed files with 112 additions and 86 deletions
+34
View File
@@ -0,0 +1,34 @@
{ stdenv, fetchurl, pythonPackages }:
pythonPackages.buildPythonApplication rec {
name = "radicale-${version}";
version = "1.1.6";
src = fetchurl {
url = "mirror://pypi/R/Radicale/Radicale-${version}.tar.gz";
sha256 = "0ay90nj6fmr2aq8imi0mbjl4m2rzq7a83ikj8qs9gxsylj71j1y0";
};
propagatedBuildInputs = stdenv.lib.optionals (!pythonPackages.isPy3k) [
pythonPackages.flup
pythonPackages.ldap
pythonPackages.sqlalchemy
];
doCheck = !pythonPackages.isPy3k;
meta = with stdenv.lib; {
homepage = http://www.radicale.org/;
description = "CalDAV CardDAV server";
longDescription = ''
The Radicale Project is a complete CalDAV (calendar) and CardDAV
(contact) server solution. Calendars and address books are available for
both local and remote access, possibly limited through authentication
policies. They can be viewed and edited by calendar and contact clients
on mobile phones or computers.
'';
license = licenses.gpl3Plus;
platforms = platforms.all;
maintainers = with maintainers; [ edwtjo pSub aneeshusa ];
};
}
+19 -13
View File
@@ -1,21 +1,27 @@
{ stdenv, fetchurl, pythonPackages }:
{ stdenv, fetchFromGitHub, python3Packages }:
pythonPackages.buildPythonApplication rec {
let
version = "2.1.2";
sha256 = "0gmbnvm17j0ilcnci1k2jh0vkbz5g8xlk9lgia5mlx790048hlm8";
in
python3Packages.buildPythonApplication {
name = "radicale-${version}";
version = "1.1.4";
inherit version;
src = fetchurl {
url = "mirror://pypi/R/Radicale/Radicale-${version}.tar.gz";
sha256 = "17p0hayyw30pfb81xqvd7jhjm6yrk2dnbgvqagx1nqdsr89ar0ss";
src = fetchFromGitHub {
owner = "Kozea";
repo = "Radicale";
rev = version;
inherit sha256;
};
propagatedBuildInputs = stdenv.lib.optionals (!pythonPackages.isPy3k) [
pythonPackages.flup
pythonPackages.ldap
pythonPackages.sqlalchemy
];
doCheck = false;
doCheck = !pythonPackages.isPy3k;
propagatedBuildInputs = with python3Packages; [
vobject
passlib
];
meta = with stdenv.lib; {
homepage = http://www.radicale.org/;
@@ -29,6 +35,6 @@ pythonPackages.buildPythonApplication rec {
'';
license = licenses.gpl3Plus;
platforms = platforms.all;
maintainers = with maintainers; [ edwtjo pSub aneeshusa ];
maintainers = with maintainers; [ edwtjo pSub aneeshusa infinisil ];
};
}