diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-08-30 02:17:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-30 02:17:34 +0200 |
| commit | 7d1d0196502d9a81841334e65fb73e4b5e3c604a (patch) | |
| tree | 6d7c8b556f4eaf55a5abe17fb51bd6da606bdb5c /pkgs/servers | |
| parent | b91ed353250990b7efdc956ffd3490b0155392b3 (diff) | |
| parent | e16a0988bc18be3997f5c475f373a8ac127d3fa0 (diff) | |
| download | nixlib-7d1d0196502d9a81841334e65fb73e4b5e3c604a.tar nixlib-7d1d0196502d9a81841334e65fb73e4b5e3c604a.tar.gz nixlib-7d1d0196502d9a81841334e65fb73e4b5e3c604a.tar.bz2 nixlib-7d1d0196502d9a81841334e65fb73e4b5e3c604a.tar.lz nixlib-7d1d0196502d9a81841334e65fb73e4b5e3c604a.tar.xz nixlib-7d1d0196502d9a81841334e65fb73e4b5e3c604a.tar.zst nixlib-7d1d0196502d9a81841334e65fb73e4b5e3c604a.zip | |
Merge pull request #27826 from Infinisil/radicale
radicale: update to version 2
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/radicale/1.x.nix | 34 | ||||
| -rw-r--r-- | pkgs/servers/radicale/default.nix | 32 |
2 files changed, 53 insertions, 13 deletions
diff --git a/pkgs/servers/radicale/1.x.nix b/pkgs/servers/radicale/1.x.nix new file mode 100644 index 000000000000..13db868845a0 --- /dev/null +++ b/pkgs/servers/radicale/1.x.nix @@ -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 ]; + }; +} diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix index b6d61e293951..ee38783a899e 100644 --- a/pkgs/servers/radicale/default.nix +++ b/pkgs/servers/radicale/default.nix @@ -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 ]; }; } |