python3Packages.lark: rename from lark-parser

With version 1.0 of lark-parser the name was changed to just lark.
This commit is contained in:
Martin Weinelt 2022-01-18 10:26:20 +01:00
parent 705414fcd5
commit 2f4b2e72d0
8 changed files with 17 additions and 17 deletions

View file

@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook makeWrapper ];
buildInputs = [
docker
(python3.withPackages (ps: [ ps.lark-parser ps.requests ]))
(python3.withPackages (ps: [ ps.lark ps.requests ]))
];
configureFlags = let
pythonEnv = python3.withPackages (ps: [ ps.lark-parser ps.requests ]);
pythonEnv = python3.withPackages (ps: [ ps.lark ps.requests ]);
in [
"--with-python=${pythonEnv}/bin/python3"
];

View file

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchFromGitHub, six, lark-parser, pytestCheckHook }:
{ lib, buildPythonPackage, fetchFromGitHub, six, lark, pytestCheckHook }:
buildPythonPackage rec {
pname = "commentjson";
@ -13,13 +13,13 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace setup.py \
--replace "lark-parser>=0.7.1,<0.8.0" "lark-parser"
--replace "lark-parser>=0.7.1,<0.8.0" "lark"
# NixOS is missing test.test_json module
rm -r commentjson/tests/test_json
'';
propagatedBuildInputs = [ lark-parser six ];
propagatedBuildInputs = [ lark six ];
checkInputs = [ pytestCheckHook ];

View file

@ -5,7 +5,7 @@
, packaging
, pynput
, regex
, lark-parser
, lark
, enum34
, pyperclip
, six
@ -34,7 +34,7 @@ buildPythonPackage rec {
};
postPatch = ''
substituteInPlace setup.py --replace 'lark-parser == 0.8.*' 'lark-parser'
substituteInPlace setup.py --replace 'lark-parser == 0.8.*' 'lark'
substituteInPlace dragonfly/actions/keyboard/_x11_xdotool.py \
--replace 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"'
substituteInPlace dragonfly/windows/x11_window.py \
@ -48,7 +48,7 @@ buildPythonPackage rec {
packaging
pynput
regex
lark-parser
lark
enum34
pyperclip
six

View file

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, hypothesis, lark-parser, libcst, black, parso, pytestCheckHook, pytest-cov, pytest-xdist }:
{ lib, buildPythonPackage, fetchPypi, hypothesis, lark, libcst, black, parso, pytestCheckHook, pytest-cov, pytest-xdist }:
buildPythonPackage rec {
pname = "hypothesmith";
@ -9,7 +9,7 @@ buildPythonPackage rec {
sha256 = "0fb7b3fd03d76eddd4474b0561e1c2662457593a74cc300fd27e5409cd4d7922";
};
propagatedBuildInputs = [ hypothesis lark-parser libcst ];
propagatedBuildInputs = [ hypothesis lark libcst ];
checkInputs = [ black parso pytestCheckHook pytest-cov pytest-xdist ];

View file

@ -6,7 +6,7 @@
}:
buildPythonPackage rec {
pname = "lark-parser";
pname = "lark";
version = "1.0.0";
src = fetchFromGitHub {

View file

@ -4,7 +4,7 @@
, fetchpatch
, importlib-metadata
, ipython
, lark-parser
, lark
, networkx
, numpy
, poetry-core
@ -48,7 +48,7 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
lark-parser
lark
networkx
numpy
qcs-api-client
@ -71,7 +71,7 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'lark = "^0.11.1"' 'lark-parser = ">=0.11.1"'
--replace 'lark = "^0.11.1"' 'lark = "*"'
'';
disabledTestPaths = [

View file

@ -6,7 +6,7 @@
, fetchFromGitHub
, freezegun
, humanize
, lark-parser
, lark
, parse-type
, pysingleton
, pytestCheckHook
@ -29,7 +29,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
lark-parser
lark
click
colorful
tag-expressions

View file

@ -4412,7 +4412,7 @@ in {
language-data = callPackage ../development/python-modules/language-data { };
lark-parser = callPackage ../development/python-modules/lark-parser { };
lark = callPackage ../development/python-modules/lark { };
latexcodec = callPackage ../development/python-modules/latexcodec { };