diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-06-22 15:01:47 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-06-22 16:57:59 +0000 |
commit | 633cab0ecb07627706c6b523e219490f019eaab5 (patch) | |
tree | 4fb472bdfe2723037dad53dc1b8a87c939015f5e /nixpkgs/pkgs/development/python-modules/vdirsyncer | |
parent | ffb691c199e7e0cbc4e45e5310779c9e3f7c2a73 (diff) | |
parent | 432fc2d9a67f92e05438dff5fdc2b39d33f77997 (diff) | |
download | nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.gz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.bz2 nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.lz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.xz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.zst nixlib-633cab0ecb07627706c6b523e219490f019eaab5.zip |
Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997'
# Conflicts: # nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix # nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix # nixpkgs/pkgs/applications/window-managers/sway/default.nix # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/vdirsyncer')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix b/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix index 1f7642bfe347..eb720c7f2066 100644 --- a/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , isPy27 , click , click-log @@ -13,7 +14,7 @@ , pytestCheckHook , pytest-localserver , pytest-subtesthack -, setuptools_scm +, setuptools-scm }: buildPythonPackage rec { @@ -35,7 +36,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - setuptools_scm + setuptools-scm ]; checkInputs = [ @@ -45,6 +46,14 @@ buildPythonPackage rec { pytest-subtesthack ]; + patches = [ + (fetchpatch { + name = "update-usage-deprecated-method.patch"; + url = "https://github.com/pimutils/vdirsyncer/commit/7577fa21177442aacc2d86640ef28cebf1c4aaef.patch"; + sha256 = "0inkr1wfal20kssij8l5myhpjivxg8wlvhppqc3lvml9d1i75qbh"; + }) + ]; + postPatch = '' substituteInPlace setup.py --replace "click>=5.0,<6.0" "click" ''; |