From 90157969cf10699f9a65077fb709b8935b2612f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 4 May 2022 19:06:43 +0200 Subject: [PATCH 1/3] python310Packages.pygments: adopt, enable tests --- .../python-modules/Pygments/default.nix | 28 ----------- .../python-modules/pygments/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 47 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/python-modules/Pygments/default.nix create mode 100644 pkgs/development/python-modules/pygments/default.nix diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix deleted file mode 100644 index af125e1f40e..00000000000 --- a/pkgs/development/python-modules/Pygments/default.nix +++ /dev/null @@ -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; [ ]; - }; -} diff --git a/pkgs/development/python-modules/pygments/default.nix b/pkgs/development/python-modules/pygments/default.nix new file mode 100644 index 00000000000..6ab6cec4295 --- /dev/null +++ b/pkgs/development/python-modules/pygments/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, docutils +, lxml +, pytestCheckHook +, wcag-contrast-ratio +}: + +let pygments = buildPythonPackage + rec { + pname = "pygments"; + version = "2.11.2"; + + src = fetchPypi { + pname = "Pygments"; + inherit version; + sha256 = "4e426f72023d88d03b2fa258de560726ce890ff3b630f88c21cbb8b2503b8c6a"; + }; + + propagatedBuildInputs = [ + docutils + ]; + + # circular dependencies if enabled by default + doCheck = false; + checkInputs = [ + lxml + pytestCheckHook + wcag-contrast-ratio + ]; + + 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 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dbdaba232b4..7326e68e62d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7192,7 +7192,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 { }; From bad010fae807f2dbf104c1cdd1c98c1d0e6b7a2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 4 May 2022 19:13:24 +0200 Subject: [PATCH 2/3] python310Packages.wcag-contrast-ratio: init at 0.9 --- .../wcag-contrast-ratio/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/wcag-contrast-ratio/default.nix diff --git a/pkgs/development/python-modules/wcag-contrast-ratio/default.nix b/pkgs/development/python-modules/wcag-contrast-ratio/default.nix new file mode 100644 index 00000000000..c7b7e9bc9e8 --- /dev/null +++ b/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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7326e68e62d..23dfa239aa0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10838,6 +10838,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 { }; From bd9f3ec6644117d80fefe2790bb12ee757ca54c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 4 May 2022 22:02:18 +0200 Subject: [PATCH 3/3] python310Packages.pygments: 2.11.2 -> 2.12.0 --- pkgs/development/python-modules/pygments/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygments/default.nix b/pkgs/development/python-modules/pygments/default.nix index 6ab6cec4295..c8759a2fe05 100644 --- a/pkgs/development/python-modules/pygments/default.nix +++ b/pkgs/development/python-modules/pygments/default.nix @@ -10,12 +10,12 @@ let pygments = buildPythonPackage rec { pname = "pygments"; - version = "2.11.2"; + version = "2.12.0"; src = fetchPypi { pname = "Pygments"; inherit version; - sha256 = "4e426f72023d88d03b2fa258de560726ce890ff3b630f88c21cbb8b2503b8c6a"; + sha256 = "sha256-XrEWEY+WEv8e6JrJZDe7a0no8E2KE7UUuib2ICCOJus="; }; propagatedBuildInputs = [ @@ -30,6 +30,11 @@ let pygments = buildPythonPackage wcag-contrast-ratio ]; + disabledTestPaths = [ + # 5 lines diff, including one nix store path in 20000+ lines + "tests/examplefiles/bash/ltmain.sh" + ]; + pythonImportsCheck = [ "pygments" ]; passthru.tests = {