Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c62e88ab8177
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e1efaa951f0a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jul 1, 2020

  1. vdirsyncerStable: 0.16.7 -> 0.16.8

    @DamienCassou @marsam
    DamienCassou authored and marsam committed Jul 1, 2020
    Copy the full SHA
    318fd31 View commit details

Commits on Jul 11, 2020

  1. Merge pull request #91918 from DamienCassou/vdirsync-0.16.8 

    vdirsyncer: 0.16.7 -> 0.16.8
    @DamienCassou
    DamienCassou authored Jul 11, 2020
    Copy the full SHA
    e1efaa9 View commit details
Showing with 9 additions and 33 deletions.
  1. +9 −33 pkgs/development/python-modules/vdirsyncer/stable.nix
42 changes: 9 additions & 33 deletions pkgs/development/python-modules/vdirsyncer/stable.nix
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,29 @@
{ stdenv
, pythonAtLeast
, buildPythonPackage
, fetchPypi
, isPy27
, fetchpatch
, click
, click-log
, click-threading
, requests_toolbelt
, requests
, requests_oauthlib # required for google oauth sync
, atomicwrites
, milksnake
, shippai
, hypothesis
, pytest
, pytestCheckHook
, pytest-localserver
, pytest-subtesthack
, setuptools_scm
}:

# Packaging documentation at:
# https://github.com/pimutils/vdirsyncer/blob/0.16.7/docs/packaging.rst
buildPythonPackage rec {
version = "0.16.7";
version = "0.16.8";
pname = "vdirsyncer";
disabled = isPy27;

src = fetchPypi {
inherit pname version;
sha256 = "6c9bcfb9bcb01246c83ba6f8551cf54c58af3323210755485fc23bb7848512ef";
sha256 = "bfdb422f52e1d4d60bd0635d203fb59fa7f613397d079661eb48e79464ba13c5";
};

propagatedBuildInputs = [
@@ -46,43 +40,25 @@ buildPythonPackage rec {

checkInputs = [
hypothesis
pytest
pytestCheckHook
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' ""
substituteInPlace setup.py --replace "click>=5.0,<6.0" "click"
'';

checkPhase = ''
make DETERMINISTIC_TESTS=true PYTEST_ARGS="--deselect=tests/system/cli/test_sync.py::test_verbosity" test
preCheck = ''
export DETERMINISTIC_TESTS=true
'';
# Tests started to fail lately, for any python version even as low as 3.5 but
# if you enable the check, you'll see even severer errors with a higher then
# 3.5 python version. Hence it's marked as broken for higher then 3.5 and the
# checks are disabled unconditionally. As a general end user advice, use the
# normal "unstable" `vdirsyncer` derivation, not this one.
doCheck = false;

disabledTests = [ "test_verbosity" ];

meta = with stdenv.lib; {
homepage = "https://github.com/pimutils/vdirsyncer";
description = "Synchronize calendars and contacts";
license = licenses.mit;
# vdirsyncer (unstable) works with mainline python versions
broken = (pythonAtLeast "3.6");
maintainers = with maintainers; [ loewenheim ];
};
}