diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:06:19 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:21:18 +0000 |
| commit | 7ac6743433dd45ceaead2ca96f6356dc0d064ce6 (patch) | |
| tree | b68ec89d7d2a8d2b6e6b1ff94ba26d6af4096350 /nixpkgs/pkgs/servers/radicale | |
| parent | c5c7451dbef37b51f52792d6395a670ef5183d27 (diff) | |
| parent | 891f607d5301d6730cb1f9dcf3618bcb1ab7f10e (diff) | |
| download | nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.gz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.bz2 nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.lz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.xz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.zst nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.zip | |
Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'
Diffstat (limited to 'nixpkgs/pkgs/servers/radicale')
| -rw-r--r-- | nixpkgs/pkgs/servers/radicale/1.x.nix | 6 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/radicale/2.x.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/radicale/3.x.nix | 15 |
3 files changed, 11 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/servers/radicale/1.x.nix b/nixpkgs/pkgs/servers/radicale/1.x.nix index 96c94c2bc6b2..3bfab658af6d 100644 --- a/nixpkgs/pkgs/servers/radicale/1.x.nix +++ b/nixpkgs/pkgs/servers/radicale/1.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages }: +{ lib, stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "radicale"; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "0ay90nj6fmr2aq8imi0mbjl4m2rzq7a83ikj8qs9gxsylj71j1y0"; }; - propagatedBuildInputs = stdenv.lib.optionals (!pythonPackages.isPy3k) [ + propagatedBuildInputs = lib.optionals (!pythonPackages.isPy3k) [ pythonPackages.flup pythonPackages.ldap pythonPackages.sqlalchemy @@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { doCheck = !pythonPackages.isPy3k; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.radicale.org/"; description = "CalDAV CardDAV server"; longDescription = '' diff --git a/nixpkgs/pkgs/servers/radicale/2.x.nix b/nixpkgs/pkgs/servers/radicale/2.x.nix index 8d36717ec69b..918dad537a53 100644 --- a/nixpkgs/pkgs/servers/radicale/2.x.nix +++ b/nixpkgs/pkgs/servers/radicale/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3 }: +{ lib, stdenv, fetchFromGitHub, python3 }: python3.pkgs.buildPythonApplication rec { pname = "Radicale"; @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { pytest ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.radicale.org/2.x.nix"; description = "CalDAV CardDAV server"; longDescription = '' diff --git a/nixpkgs/pkgs/servers/radicale/3.x.nix b/nixpkgs/pkgs/servers/radicale/3.x.nix index 4b49b1e40c82..bd781d869e96 100644 --- a/nixpkgs/pkgs/servers/radicale/3.x.nix +++ b/nixpkgs/pkgs/servers/radicale/3.x.nix @@ -1,15 +1,12 @@ -{ lib, python3, fetchFromGitHub }: +{ lib, python3 }: python3.pkgs.buildPythonApplication rec { - pname = "radicale"; - version = "3.0.5"; + pname = "Radicale"; + version = "3.0.6"; - # No tests in PyPI tarball - src = fetchFromGitHub { - owner = "Kozea"; - repo = "Radicale"; - rev = version; - sha256 = "0w8qkjm7b62cr49dbis41kvv3179sfmvvzlhlc0rbqss6vmwbq4p"; + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "a9433d3df97135d9c02cec8dde4199444daf1b73ad161ded398d67b8e629fdc6"; }; propagatedBuildInputs = with python3.pkgs; [ |