From 16e4fc2b25cf9df1fe009d7c3547e6a9a9a9ecf0 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 19 Dec 2022 11:47:29 -0300 Subject: [PATCH] pyparsing: refactor It is ugly and confusing to use `let myself = ... in myself`. --- .../python-modules/pyparsing/default.nix | 80 ++++++++++--------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix index 3d10fca06c05..95b1b5600959 100644 --- a/pkgs/development/python-modules/pyparsing/default.nix +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -5,45 +5,49 @@ , jinja2 , pytestCheckHook , railroad-diagrams +, pyparsing }: -let - pyparsing = buildPythonPackage rec { - pname = "pyparsing"; - version = "3.0.9"; - format = "pyproject"; +buildPythonPackage rec { + pname = "pyparsing"; + version = "3.0.9"; + format = "pyproject"; - src = fetchFromGitHub { - owner = "pyparsing"; - repo = pname; - rev = "pyparsing_${version}"; - sha256 = "sha256-aCRyJQyLf8qQ6NO41q+HC856TjIHzIt0vyVBLV+3teE="; - }; - - nativeBuildInputs = [ - flit-core - ]; - - # circular dependencies with pytest if enabled by default - doCheck = false; - checkInputs = [ - jinja2 - pytestCheckHook - railroad-diagrams - ]; - - pythonImportsCheck = [ "pyparsing" ]; - - passthru.tests = { - check = pyparsing.overridePythonAttrs (_: { doCheck = true; }); - }; - - meta = with lib; { - homepage = "https://github.com/pyparsing/pyparsing"; - description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions"; - license = licenses.mit; - maintainers = with maintainers; [ kamadorueda ]; - }; + src = fetchFromGitHub { + owner = "pyparsing"; + repo = pname; + rev = "pyparsing_${version}"; + sha256 = "sha256-aCRyJQyLf8qQ6NO41q+HC856TjIHzIt0vyVBLV+3teE="; }; -in -pyparsing + + nativeBuildInputs = [ + flit-core + ]; + + # circular dependencies with pytest if enabled by default + doCheck = false; + checkInputs = [ + jinja2 + pytestCheckHook + railroad-diagrams + ]; + + pythonImportsCheck = [ "pyparsing" ]; + + passthru.tests = { + check = pyparsing.overridePythonAttrs (_: { doCheck = true; }); + }; + + meta = with lib; { + homepage = "https://github.com/pyparsing/pyparsing"; + description = "Python library for creating PEG parsers"; + longDescription = '' + The pyparsing module is an alternative approach to creating and executing + simple grammars, vs. the traditional lex/yacc approach, or the use of + regular expressions. The pyparsing module provides a library of classes + that client code uses to construct the grammar directly in Python code. + ''; + license = licenses.mit; + maintainers = with maintainers; [ kamadorueda ]; + }; +}