vdirsyncer: Convert to a python module (#87865)
* vdirsyncer: standardize derivation Use toPythonApplication and use callPackage from python-packages.nix. Make vdirsyncerStable somewhat functional again, but mark it as broken for Python 3.6 or higher. * vdirsyncer: use buildPythonPackage as it's a package now * vdirsyncer: move to python-modules/ * vdirsyncer: Move disabled logic into expression
This commit is contained in:
@@ -1,77 +0,0 @@
|
||||
{ stdenv, python3Packages, fetchFromGitHub, fetchpatch, rustPlatform, pkgconfig, openssl, CoreServices, Security }:
|
||||
|
||||
# Packaging documentation at:
|
||||
# https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst
|
||||
python3Packages.buildPythonApplication rec {
|
||||
version = "unstable-2018-08-05";
|
||||
pname = "vdirsyncer";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spk";
|
||||
repo = pname;
|
||||
# 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 = "0cqy0s55pkg6hww86h7qip4xaidh6g8lcypdj84n2x374jq38c5d";
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
click click-log click-threading
|
||||
requests_toolbelt
|
||||
requests
|
||||
requests_oauthlib # required for google oauth sync
|
||||
atomicwrites
|
||||
milksnake
|
||||
shippai
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3Packages; [ setuptools_scm ];
|
||||
|
||||
checkInputs = with python3Packages; [ hypothesis pytest pytest-localserver pytest-subtesthack ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/pimutils/vdirsyncer/commit/7b636e8e40d69c495901f965b9c0686513659e44.patch";
|
||||
sha256 = "0vl942ii5iad47y63v0ngmhfp37n30nxyk4j7h64b95fk38vfwx9";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# see https://github.com/pimutils/vdirsyncer/pull/805
|
||||
substituteInPlace setup.cfg --replace --duration --durations
|
||||
|
||||
# for setuptools_scm:
|
||||
echo 'Version: ${version}' >PKG-INFO
|
||||
|
||||
sed -i 's/spec.add_external_build(cmd=cmd/spec.add_external_build(cmd="true"/g' setup.py
|
||||
|
||||
# fixing test
|
||||
sed -i "s/invalid value for \"--verbosity\"/invalid value for \\\'--verbosity\\\'/" tests/system/cli/test_sync.py
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p rust/target/release
|
||||
ln -s ${native}/lib/libvdirsyncer_rustext* rust/target/release/
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
rm -rf vdirsyncer
|
||||
make DETERMINISTIC_TESTS=true PYTEST_ARGS="--deselect=tests/unit/utils/test_vobject.py::test_replace_uid --deselect=tests/unit/sync/test_sync.py::TestSyncMachine" test
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/pimutils/vdirsyncer";
|
||||
description = "Synchronize calendars and contacts";
|
||||
maintainers = with maintainers; [ matthiasbeyer gebner ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
@@ -1,52 +0,0 @@
|
||||
{ lib, python3Packages, fetchpatch }:
|
||||
|
||||
# Packaging documentation at:
|
||||
# https://github.com/pimutils/vdirsyncer/blob/0.16.7/docs/packaging.rst
|
||||
python3Packages.buildPythonApplication rec {
|
||||
version = "0.16.7";
|
||||
pname = "vdirsyncer";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "6c9bcfb9bcb01246c83ba6f8551cf54c58af3323210755485fc23bb7848512ef";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
click click-log click-threading
|
||||
requests_toolbelt
|
||||
requests
|
||||
requests_oauthlib # required for google oauth sync
|
||||
atomicwrites
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3Packages; [ setuptools_scm ];
|
||||
|
||||
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";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Invalid argument: 'perform_health_check' is not a valid setting
|
||||
substituteInPlace tests/conftest.py \
|
||||
--replace "perform_health_check=False" ""
|
||||
substituteInPlace tests/unit/test_repair.py \
|
||||
--replace $'@settings(perform_health_check=False) # Using the random module for UIDs\n' ""
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
make DETERMINISTIC_TESTS=true PYTEST_ARGS="--deselect=tests/system/cli/test_sync.py::test_verbosity" test
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/pimutils/vdirsyncer";
|
||||
description = "Synchronize calendars and contacts";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ loewenheim ];
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user