JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vdirsyncer: fix build with openssl 1.1 (#67445)

Browse Source 
vdirsyncer: fix build with openssl 1.1
This commit is contained in:
Gabriel Ebner 2019-08-25 17:13:56 +02:00 committed by GitHub
commit 4c65809f1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/tools/misc/vdirsyncer/default.nix
View File

@ -8,17 +8,18 @@ python3Packages.buildPythonApplication rec {
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "pimutils";
owner = "spk";
repo = pname;
rev = "ac45cf144b0ceb72cc2a9f454808688f3ac9ba4f";
sha256 = "0hqsjdpgvm7d34q5b2hzmrzfxk43ald1bx22mvgg559kw1ck54s9";
# fix-build-style branch, see https://github.com/pimutils/vdirsyncer/pull/798
rev = "2c62d03bd73f8b44a47c2e769ade046697896ae9";
sha256 = "1q6xvzz5rf5sqdaj3mdvhpgwy5b16isavgg7vardgjwqwv1yal28";
};
native = rustPlatform.buildRustPackage {
name = "${name}-native";
inherit src;
sourceRoot = "source/rust";
cargoSha256 = "1qziwlf6nlkpxb1hamb7qsipqg9ibp871rimgpwil38vqmyd570s";
cargoSha256 = "1n1dxq3klsry5mmbfff2jv7ih8mr5zvpncrdgba6qs93wi77qi0y";
buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;
};
@ -36,18 +37,6 @@ python3Packages.buildPythonApplication rec {
checkInputs = with python3Packages; [ hypothesis pytest pytest-localserver pytest-subtesthack ];
patches = [
# Fixes for hypothesis: https://github.com/pimutils/vdirsyncer/pull/779
(fetchpatch {
url = https://github.com/pimutils/vdirsyncer/commit/22ad88a6b18b0979c5d1f1d610c1d2f8f87f4b89.patch;
sha256 = "0dbzj6jlxhdidnm3i21a758z83sdiwzhpd45pbkhycfhgmqmhjpl";
})
(fetchpatch {
url = https://github.com/pimutils/vdirsyncer/commit/29417235321c249c65904bc7948b066ef5683aee.patch;
sha256 = "0zvr0y88gm3vprjcdzs4m151laa9qhkyi61rvrfdjmf42fwhbm80";
})
];
postPatch = ''
# Invalid argument: 'perform_health_check' is not a valid setting
substituteInPlace tests/conftest.py \
@ -74,7 +63,7 @@ python3Packages.buildPythonApplication rec {
meta = with stdenv.lib; {
homepage = https://github.com/pimutils/vdirsyncer;
description = "Synchronize calendars and contacts";
maintainers = with maintainers; [ matthiasbeyer ];
maintainers = with maintainers; [ matthiasbeyer gebner ];
license = licenses.mit;
};
}