From 8eb44ac8a305d3b003e71bf279b057cdd5ed6c32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 23 Feb 2022 21:25:14 +0000
Subject: [PATCH] python3Packages.cssutils: 2.3.0 -> 2.4.0

https://github.com/jaraco/cssutils/blob/v2.4.0/CHANGES.rst
---
 .../python-modules/cssutils/default.nix       | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix
index 6c1c5de2c56a..265504938df9 100644
--- a/pkgs/development/python-modules/cssutils/default.nix
+++ b/pkgs/development/python-modules/cssutils/default.nix
@@ -4,6 +4,7 @@
 , pythonOlder
 , fetchpatch
 , fetchPypi
+, setuptools
 , setuptools-scm
 , toml
 , importlib-metadata
@@ -11,28 +12,24 @@
 , lxml
 , mock
 , pytestCheckHook
+, importlib-resources
 }:
 
 buildPythonPackage rec {
   pname = "cssutils";
-  version = "2.3.0";
+  version = "2.4.0";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
+
+  format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-stOxYEfKroLlxZADaTW6+htiHPRcLziIWvS+SDjw/QA=";
+    hash = "sha256-LZchCoOwo/4eRGn1/5pkILB4VyA1GIsbq3EDw6NtyJs=";
   };
 
-  patches = lib.optionals (pythonAtLeast "3.10") [
-    # fix tests for python3.10
-    (fetchpatch {
-      url = "https://github.com/jaraco/cssutils/pull/17/commits/355b1795dde77bd4b49d8df35377230fdb503802.patch";
-      sha256 = "sha256-hwe8oeZO2rq00cs079lje3wjQDEczAu3Tfy/X/M9+GQ=";
-    })
-  ];
-
   nativeBuildInputs = [
+    setuptools
     setuptools-scm
     toml
   ];
@@ -46,6 +43,8 @@ buildPythonPackage rec {
     lxml
     mock
     pytestCheckHook
+  ] ++ lib.optionals (pythonOlder "3.9") [
+    importlib-resources
   ];
 
   disabledTests = [
@@ -53,11 +52,6 @@ buildPythonPackage rec {
     "test_parseUrl"
     "encutils"
     "website.logging"
-  ] ++ lib.optionals (pythonOlder "3.9") [
-    # AttributeError: module 'importlib.resources' has no attribute 'files'
-    "test_parseFile"
-    "test_parseString"
-    "test_combine"
   ];
 
   pythonImportsCheck = [ "cssutils" ];