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: 50101eaef5a0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fa28fec2d667
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Sep 9, 2019

  1. vdirsyncer: fix build 

    (cherry picked from commit e5bbe65)
    @gebner
    gebner committed Sep 9, 2019
    Copy the full SHA
    fa28fec View commit details
Showing with 2 additions and 5 deletions.
  1. +2 −5 pkgs/tools/misc/vdirsyncer/default.nix
7 changes: 2 additions & 5 deletions pkgs/tools/misc/vdirsyncer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -38,11 +38,8 @@ python3Packages.buildPythonApplication rec {
checkInputs = with python3Packages; [ hypothesis pytest pytest-localserver pytest-subtesthack ];

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' ""
# see https://github.com/pimutils/vdirsyncer/pull/805
substituteInPlace setup.cfg --replace --duration --durations
# for setuptools_scm:
echo 'Version: ${version}' >PKG-INFO