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:
parent
705414fcd5
commit
2f4b2e72d0
|
@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [ autoreconfHook makeWrapper ];
|
nativeBuildInputs = [ autoreconfHook makeWrapper ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
docker
|
docker
|
||||||
(python3.withPackages (ps: [ ps.lark-parser ps.requests ]))
|
(python3.withPackages (ps: [ ps.lark ps.requests ]))
|
||||||
];
|
];
|
||||||
|
|
||||||
configureFlags = let
|
configureFlags = let
|
||||||
pythonEnv = python3.withPackages (ps: [ ps.lark-parser ps.requests ]);
|
pythonEnv = python3.withPackages (ps: [ ps.lark ps.requests ]);
|
||||||
in [
|
in [
|
||||||
"--with-python=${pythonEnv}/bin/python3"
|
"--with-python=${pythonEnv}/bin/python3"
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, buildPythonPackage, fetchFromGitHub, six, lark-parser, pytestCheckHook }:
|
{ lib, buildPythonPackage, fetchFromGitHub, six, lark, pytestCheckHook }:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "commentjson";
|
pname = "commentjson";
|
||||||
|
@ -13,13 +13,13 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace setup.py \
|
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
|
# NixOS is missing test.test_json module
|
||||||
rm -r commentjson/tests/test_json
|
rm -r commentjson/tests/test_json
|
||||||
'';
|
'';
|
||||||
|
|
||||||
propagatedBuildInputs = [ lark-parser six ];
|
propagatedBuildInputs = [ lark six ];
|
||||||
|
|
||||||
checkInputs = [ pytestCheckHook ];
|
checkInputs = [ pytestCheckHook ];
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
, packaging
|
, packaging
|
||||||
, pynput
|
, pynput
|
||||||
, regex
|
, regex
|
||||||
, lark-parser
|
, lark
|
||||||
, enum34
|
, enum34
|
||||||
, pyperclip
|
, pyperclip
|
||||||
, six
|
, six
|
||||||
|
@ -34,7 +34,7 @@ buildPythonPackage rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
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 \
|
substituteInPlace dragonfly/actions/keyboard/_x11_xdotool.py \
|
||||||
--replace 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"'
|
--replace 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"'
|
||||||
substituteInPlace dragonfly/windows/x11_window.py \
|
substituteInPlace dragonfly/windows/x11_window.py \
|
||||||
|
@ -48,7 +48,7 @@ buildPythonPackage rec {
|
||||||
packaging
|
packaging
|
||||||
pynput
|
pynput
|
||||||
regex
|
regex
|
||||||
lark-parser
|
lark
|
||||||
enum34
|
enum34
|
||||||
pyperclip
|
pyperclip
|
||||||
six
|
six
|
||||||
|
|
|
@ -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 {
|
buildPythonPackage rec {
|
||||||
pname = "hypothesmith";
|
pname = "hypothesmith";
|
||||||
|
@ -9,7 +9,7 @@ buildPythonPackage rec {
|
||||||
sha256 = "0fb7b3fd03d76eddd4474b0561e1c2662457593a74cc300fd27e5409cd4d7922";
|
sha256 = "0fb7b3fd03d76eddd4474b0561e1c2662457593a74cc300fd27e5409cd4d7922";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ hypothesis lark-parser libcst ];
|
propagatedBuildInputs = [ hypothesis lark libcst ];
|
||||||
|
|
||||||
checkInputs = [ black parso pytestCheckHook pytest-cov pytest-xdist ];
|
checkInputs = [ black parso pytestCheckHook pytest-cov pytest-xdist ];
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "lark-parser";
|
pname = "lark";
|
||||||
version = "1.0.0";
|
version = "1.0.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
|
@ -4,7 +4,7 @@
|
||||||
, fetchpatch
|
, fetchpatch
|
||||||
, importlib-metadata
|
, importlib-metadata
|
||||||
, ipython
|
, ipython
|
||||||
, lark-parser
|
, lark
|
||||||
, networkx
|
, networkx
|
||||||
, numpy
|
, numpy
|
||||||
, poetry-core
|
, poetry-core
|
||||||
|
@ -48,7 +48,7 @@ buildPythonPackage rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
lark-parser
|
lark
|
||||||
networkx
|
networkx
|
||||||
numpy
|
numpy
|
||||||
qcs-api-client
|
qcs-api-client
|
||||||
|
@ -71,7 +71,7 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace pyproject.toml \
|
substituteInPlace pyproject.toml \
|
||||||
--replace 'lark = "^0.11.1"' 'lark-parser = ">=0.11.1"'
|
--replace 'lark = "^0.11.1"' 'lark = "*"'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
disabledTestPaths = [
|
disabledTestPaths = [
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, freezegun
|
, freezegun
|
||||||
, humanize
|
, humanize
|
||||||
, lark-parser
|
, lark
|
||||||
, parse-type
|
, parse-type
|
||||||
, pysingleton
|
, pysingleton
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
lark-parser
|
lark
|
||||||
click
|
click
|
||||||
colorful
|
colorful
|
||||||
tag-expressions
|
tag-expressions
|
||||||
|
|
|
@ -4412,7 +4412,7 @@ in {
|
||||||
|
|
||||||
language-data = callPackage ../development/python-modules/language-data { };
|
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 { };
|
latexcodec = callPackage ../development/python-modules/latexcodec { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue