diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix new file mode 100644 index 000000000000..dc0f5e1b296a --- /dev/null +++ b/pkgs/development/python-modules/charset-normalizer/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "charset-normalizer"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "Ousret"; + repo = "charset_normalizer"; + rev = version; + sha256 = "04rnyrqay11kma9pzagi1mzhc0sq37ggpv39kad2d4ynm35v2hfq"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=charset_normalizer --cov-report=term-missing" "" + ''; + + pythonImportsCheck = [ "charset_normalizer" ]; + + meta = with lib; { + description = "Python module for encoding and language detection"; + homepage = "https://charset-normalizer.readthedocs.io/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/fpyutils/default.nix b/pkgs/development/python-modules/fpyutils/default.nix index 0120391aee1b..493304428524 100644 --- a/pkgs/development/python-modules/fpyutils/default.nix +++ b/pkgs/development/python-modules/fpyutils/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "fpyutils"; - version = "2.0.0"; + version = "2.0.1"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "frnmst"; repo = pname; rev = version; - sha256 = "1n15fvd6191ixxsza49fdd8j43hs0agagg8k9v6rc7by1ffqnl2b"; + sha256 = "1dksx5ykm7f1bi16wg8kqqqlnc874k3vg9kfjbbbalv8w0g2g2am"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 8b5514f63936..876046066895 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -1,7 +1,9 @@ { lib +, brotlicffi , buildPythonPackage , certifi , chardet +, charset-normalizer , fetchPypi , idna , pytest-mock @@ -9,18 +11,22 @@ , pytestCheckHook , urllib3 , isPy27 +, trustme }: buildPythonPackage rec { pname = "requests"; - version = "2.25.1"; + version = "2.26.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-J5c91KkEpPE7JjoZyGbBO5KjntHJZGVfAl8/jT11uAQ="; + sha256 = "sha256-uKpY+M95P/2HgtPYyxnmbvNverpDU+7IWedGeLAbB6c="; }; - patches = [ ./0001-Prefer-NixOS-Nix-default-CA-bundles-over-certifi.patch ]; + patches = [ + # Use the default NixOS CA bundle from the certifi package + ./0001-Prefer-NixOS-Nix-default-CA-bundles-over-certifi.patch + ]; postPatch = '' # Use latest idna @@ -28,7 +34,9 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + brotlicffi certifi + charset-normalizer chardet idna urllib3 @@ -38,6 +46,7 @@ buildPythonPackage rec { pytest-mock pytest-xdist pytestCheckHook + trustme ]; # AttributeError: 'KeywordMapping' object has no attribute 'get' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 428913333280..e6984fabebc7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1419,6 +1419,8 @@ in { chardet = callPackage ../development/python-modules/chardet { }; + charset-normalizer = callPackage ../development/python-modules/charset-normalizer { }; + chart-studio = callPackage ../development/python-modules/chart-studio { }; check-manifest = callPackage ../development/python-modules/check-manifest { };