Merge pull request #171573 from SuperSandro2000/pygments

python310Packages.pygments: 2.11.2 -> 2.12.0

pkgs/development/python-modules/Pygments/default.nix

@@ -1,28 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, docutils
-}:
-
-buildPythonPackage rec {
-  pname = "Pygments";
-  version = "2.11.2";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "4e426f72023d88d03b2fa258de560726ce890ff3b630f88c21cbb8b2503b8c6a";
-  };
-
-  propagatedBuildInputs = [ docutils ];
-
-  # Circular dependency with sphinx
-  doCheck = false;
-  pythonImportsCheck = [ "pygments" ];
-
-  meta = {
-    homepage = "https://pygments.org/";
-    description = "A generic syntax highlighter";
-    license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ ];
-  };
-}

pkgs/development/python-modules/pygments/default.nix

@@ -0,0 +1,51 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, docutils
+, lxml
+, pytestCheckHook
+, wcag-contrast-ratio
+}:
+
+let pygments = buildPythonPackage
+  rec {
+    pname = "pygments";
+    version = "2.12.0";
+
+    src = fetchPypi {
+      pname = "Pygments";
+      inherit version;
+      sha256 = "sha256-XrEWEY+WEv8e6JrJZDe7a0no8E2KE7UUuib2ICCOJus=";
+    };
+
+    propagatedBuildInputs = [
+      docutils
+    ];
+
+    # circular dependencies if enabled by default
+    doCheck = false;
+    checkInputs = [
+      lxml
+      pytestCheckHook
+      wcag-contrast-ratio
+    ];
+
+    disabledTestPaths = [
+      # 5 lines diff, including one nix store path in 20000+ lines
+      "tests/examplefiles/bash/ltmain.sh"
+    ];
+
+    pythonImportsCheck = [ "pygments" ];
+
+    passthru.tests = {
+      check = pygments.overridePythonAttrs (_: { doCheck = true; });
+    };
+
+    meta = with lib; {
+      homepage = "https://pygments.org/";
+      description = "A generic syntax highlighter";
+      license = licenses.bsd2;
+      maintainers = with maintainers; [ SuperSandro2000 ];
+    };
+  };
+in pygments

pkgs/development/python-modules/wcag-contrast-ratio/default.nix

@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, hypothesis
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "wcag-contrast-ratio";
+  version = "0.9";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-aRkrjlwKfQ3F/xGH7rPjmBQWM6S95RxpyH9Y/oftNhw=";
+  };
+
+  checkInputs = [
+    hypothesis
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [
+    "test.py"
+  ];
+
+  pythonImportsCheck = [ "wcag_contrast_ratio" ];
+
+  meta = with lib; {
+    description = "Library for computing contrast ratios, as required by WCAG 2.0";
+    homepage = "https://github.com/gsnedders/wcag-contrast-ratio";
+    license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
+  };
+}

pkgs/top-level/python-packages.nix

@@ -7210,7 +7210,7 @@ in {
 
   pygments-better-html = callPackage ../development/python-modules/pygments-better-html { };
 
-  pygments = callPackage ../development/python-modules/Pygments { };
+  pygments = callPackage ../development/python-modules/pygments { };
 
   pygments-markdown-lexer = callPackage ../development/python-modules/pygments-markdown-lexer { };
 
@@ -10862,6 +10862,8 @@ in {
 
   wazeroutecalculator = callPackage ../development/python-modules/wazeroutecalculator { };
 
+  wcag-contrast-ratio = callPackage ../development/python-modules/wcag-contrast-ratio { };
+
   wcmatch = callPackage ../development/python-modules/wcmatch { };
 
   wcwidth = callPackage ../development/python-modules/wcwidth { };