From 08ba4b4cb64b86da172858a495a9c8081dd7759d Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sat, 13 Apr 2019 18:15:34 -0400 Subject: [PATCH] pythonPackages.tinycss2: 0.6.1 -> 1.0.2 --- .../python-modules/tinycss2/default.nix | 15 +++++++++------ .../tinycss2/remove-redundant-dependency.patch | 12 ++++++++++++ 2 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/python-modules/tinycss2/remove-redundant-dependency.patch diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 21f89e31f37..894d4f737fb 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -1,19 +1,22 @@ -{ lib, buildPythonPackage, fetchPypi, webencodings, pytest, pytestrunner, pytestcov, pytest-flake8, pytest-isort, glibcLocales }: +{ lib, buildPythonPackage, pythonOlder, fetchPypi +, webencodings +, pytest, pytestrunner, pytestcov, pytest-flake8, pytest-isort }: buildPythonPackage rec { pname = "tinycss2"; - version = "0.6.1"; + version = "1.0.2"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "7c53c2c0e914c7711c295b3101bcc78e0b7eda23ff20228a936efe11cdcc7136"; + sha256 = "1kw84y09lggji4krkc58jyhsfj31w8npwhznr7lf19d0zbix09v4"; }; + patches = [ ./remove-redundant-dependency.patch ]; + propagatedBuildInputs = [ webencodings ]; - checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort glibcLocales ]; - - LC_ALL = "en_US.UTF-8"; + checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; meta = with lib; { description = "Low-level CSS parser for Python"; diff --git a/pkgs/development/python-modules/tinycss2/remove-redundant-dependency.patch b/pkgs/development/python-modules/tinycss2/remove-redundant-dependency.patch new file mode 100644 index 00000000000..27ec511c55f --- /dev/null +++ b/pkgs/development/python-modules/tinycss2/remove-redundant-dependency.patch @@ -0,0 +1,12 @@ +diff --git a/setup.cfg b/setup.cfg +index b3b3c2d..480f3e6 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -33,7 +33,6 @@ project_urls = + + [options] + packages = find: +-setup_requires = pytest-runner + install_requires = + setuptools >= 39.2.0 + webencodings >= 0.4