summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pkgs/applications/virtualization/charliecloud/default.nix4
-rw-r--r--pkgs/development/python-modules/commentjson/default.nix6
-rw-r--r--pkgs/development/python-modules/dragonfly/default.nix6
-rw-r--r--pkgs/development/python-modules/hypothesmith/default.nix4
-rw-r--r--pkgs/development/python-modules/lark/default.nix (renamed from pkgs/development/python-modules/lark-parser/default.nix)2
-rw-r--r--pkgs/development/python-modules/pyquil/default.nix6
-rw-r--r--pkgs/development/python-modules/radish-bdd/default.nix4
-rw-r--r--pkgs/top-level/python-packages.nix2
8 files changed, 17 insertions, 17 deletions
diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix
index cbd7d8e5512d..2889d09183d7 100644
--- a/pkgs/applications/virtualization/charliecloud/default.nix
+++ b/pkgs/applications/virtualization/charliecloud/default.nix
@@ -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"
];
diff --git a/pkgs/development/python-modules/commentjson/default.nix b/pkgs/development/python-modules/commentjson/default.nix
index 2aefb51d481e..c1d3b8916d91 100644
--- a/pkgs/development/python-modules/commentjson/default.nix
+++ b/pkgs/development/python-modules/commentjson/default.nix
@@ -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 ];
diff --git a/pkgs/development/python-modules/dragonfly/default.nix b/pkgs/development/python-modules/dragonfly/default.nix
index fb3feaae63ee..82e1a645c853 100644
--- a/pkgs/development/python-modules/dragonfly/default.nix
+++ b/pkgs/development/python-modules/dragonfly/default.nix
@@ -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
diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix
index 776ff77fce2f..3ce0f068fec9 100644
--- a/pkgs/development/python-modules/hypothesmith/default.nix
+++ b/pkgs/development/python-modules/hypothesmith/default.nix
@@ -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 ];
diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark/default.nix
index 56a41207d0a6..ea1282386dc7 100644
--- a/pkgs/development/python-modules/lark-parser/default.nix
+++ b/pkgs/development/python-modules/lark/default.nix
@@ -6,7 +6,7 @@
}:
buildPythonPackage rec {
- pname = "lark-parser";
+ pname = "lark";
version = "1.0.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/pyquil/default.nix b/pkgs/development/python-modules/pyquil/default.nix
index f984bcc2dea6..7e2c427f6c23 100644
--- a/pkgs/development/python-modules/pyquil/default.nix
+++ b/pkgs/development/python-modules/pyquil/default.nix
@@ -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 = [
diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix
index ac01b853c873..f75e5cc19ee5 100644
--- a/pkgs/development/python-modules/radish-bdd/default.nix
+++ b/pkgs/development/python-modules/radish-bdd/default.nix
@@ -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
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8e23757769f3..ee8241737e76 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -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 { };