diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-07-14 15:50:11 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:01:17 +0000 |
commit | 69a15dd2dc85051ba1436613805f9286850e0596 (patch) | |
tree | d53cec2bb5b8d07df1d1919b212cb2deb3628cd6 /nixpkgs/pkgs/development/python-modules/chardet | |
parent | 6941276da135c3eb3b50e0be33d92e7d01ccba9a (diff) | |
parent | beff2f8d75ef2c65017fb25e251337c6bb2e950d (diff) | |
download | nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.gz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.bz2 nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.lz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.xz nixlib-69a15dd2dc85051ba1436613805f9286850e0596.tar.zst nixlib-69a15dd2dc85051ba1436613805f9286850e0596.zip |
Merge commit 'beff2f8d75ef2c65017fb25e251337c6bb2e950d'
v# modified: nixpkgs/pkgs/tools/networking/dhcpcd/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/chardet')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/chardet/default.nix | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/chardet/default.nix b/nixpkgs/pkgs/development/python-modules/chardet/default.nix index 3509a6469936..829ae0b0f14a 100644 --- a/nixpkgs/pkgs/development/python-modules/chardet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chardet/default.nix @@ -1,5 +1,5 @@ -{ stdenv, buildPythonPackage, fetchPypi -, pytest_3, pytestrunner, hypothesis }: +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch +, pytest, pytestrunner, hypothesis }: buildPythonPackage rec { pname = "chardet"; @@ -10,7 +10,15 @@ buildPythonPackage rec { sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4"; }; - checkInputs = [ pytest_3 pytestrunner hypothesis ]; + patches = [ + # Add pytest 4 support. See: https://github.com/chardet/chardet/pull/174 + (fetchpatch { + url = "https://github.com/chardet/chardet/commit/0561ddcedcd12ea1f98b7ddedb93686ed8a5ffa4.patch"; + sha256 = "1y1xhjf32rdhq9sfz58pghwv794f3w2f2qcn8p6hp4pc8jsdrn2q"; + }) + ]; + + checkInputs = [ pytest pytestrunner hypothesis ]; meta = with stdenv.lib; { homepage = https://github.com/chardet/chardet; |