git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #109504 from dotlambda/radicale-3.0.6
commit80bede2af574aa1c0fbee0de3e27ac84767afe48 authorSandro <sandro.jaeckel@gmail.com> dateSun 17 Jan 2021, 10:56 (6 years ago) parent5b93a516cb37d2
2 files changed+10−12
pkgs/applications/misc/etesync-dav/default.nix+4−3 pkgs/servers/radicale/3.x.nix+6−9
pkgs/applications/misc/etesync-dav/default.nix+4−3
@@ -1,12 +1,12 @@
1−{ lib, python3Packages, radicale3 }:
1+{ lib, stdenv, python3Packages, radicale3 }:
22
33python3Packages.buildPythonApplication rec {
44 pname = "etesync-dav";
5− version = "0.30.6";
5+ version = "0.30.7";
66
77 src = python3Packages.fetchPypi {
88 inherit pname version;
9− sha256 = "0cjz4p3a750fwvrxbzwda0sidw7nscahvppdshbsx49i6qrczpbg";
9+ sha256 = "16b3105834dd6d9e374e976cad0978e1acfed0f0328c5054bc214550aea3e2c5";
1010 };
1111
1212 propagatedBuildInputs = with python3Packages; [
@@ -24,5 +24,6 @@ python3Packages.buildPythonApplication rec {
2424 description = "Secure, end-to-end encrypted, and privacy respecting sync for contacts, calendars and tasks";
2525 license = licenses.gpl3;
2626 maintainers = with maintainers; [ valodim ];
27+ broken = stdenv.isDarwin; # pyobjc-framework-Cocoa is missing
2728 };
2829}
pkgs/servers/radicale/3.x.nix+6−9
@@ -1,15 +1,12 @@
1−{ lib, python3, fetchFromGitHub }:
1+{ lib, python3 }:
22
33python3.pkgs.buildPythonApplication rec {
4− pname = "radicale";
5− version = "3.0.5";
4+ pname = "Radicale";
5+ version = "3.0.6";
66
7− # No tests in PyPI tarball
8− src = fetchFromGitHub {
9− owner = "Kozea";
10− repo = "Radicale";
11− rev = version;
12− sha256 = "0w8qkjm7b62cr49dbis41kvv3179sfmvvzlhlc0rbqss6vmwbq4p";
7+ src = python3.pkgs.fetchPypi {
8+ inherit pname version;
9+ sha256 = "a9433d3df97135d9c02cec8dde4199444daf1b73ad161ded398d67b8e629fdc6";
1310 };
1411
1512 propagatedBuildInputs = with python3.pkgs; [