Skip to content

Commit

Permalink
python3Packages.js2py: remove
Browse files Browse the repository at this point in the history
  • Loading branch information
ruby0b committed Oct 18, 2024
1 parent cff2da8 commit 0f79dd4
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 82 deletions.
36 changes: 17 additions & 19 deletions pkgs/applications/networking/pyload-ng/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,25 +30,23 @@ python3.pkgs.buildPythonApplication rec {
sed -i -E 's/([A-z0-9]*)~=[^;]*(.*)/\1\2/' setup.cfg
'';

dependencies =
with python3.pkgs;
[
bitmath
certifi
cheroot
cryptography
filetype
flask
flask-babel
flask-caching
flask-compress
flask-session
flask-themes2
pycurl
semver
setuptools
]
++ (if pythonOlder "3.12" then [ js2py ] else [ dukpy ]);
dependencies = with python3.pkgs; [
bitmath
certifi
cheroot
cryptography
dukpy
filetype
flask
flask-babel
flask-caching
flask-compress
flask-session
flask-themes2
pycurl
semver
setuptools
];

optional-dependencies = {
plugins = with python3.pkgs; [
Expand Down
5 changes: 3 additions & 2 deletions pkgs/development/python-modules/django-js-reverse/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
django,
packaging,
nodejs,
js2py,
six,
}:

Expand All @@ -25,9 +24,11 @@ buildPythonPackage rec {

propagatedBuildInputs = [ django ] ++ lib.optionals (pythonAtLeast "3.7") [ packaging ];

# Js2py is needed for tests but it's unmaintained and insecure
doCheck = false;

nativeCheckInputs = [
nodejs
js2py
six
];

Expand Down
47 changes: 0 additions & 47 deletions pkgs/development/python-modules/js2py/default.nix

This file was deleted.

5 changes: 3 additions & 2 deletions pkgs/development/python-modules/jupysql/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
grpcio,
ipython,
ipywidgets,
js2py,
matplotlib,
numpy,
pandas,
Expand Down Expand Up @@ -69,7 +68,6 @@ buildPythonPackage rec {
grpcio
ipython
ipywidgets
js2py
matplotlib
numpy
pandas
Expand Down Expand Up @@ -101,6 +99,9 @@ buildPythonPackage rec {
"src/tests/test_plot.py"
"src/tests/test_magic.py"
"src/tests/test_magic_plot.py"

# require js2py (which is unmaintained and insecure)
"src/tests/test_widget.py"
];

preCheck = ''
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/lark/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ buildPythonPackage rec {
"lark.grammars"
];

# Js2py is needed for tests but it's marked as insecure
# Js2py is needed for tests but it's unmaintained and insecure
doCheck = false;

meta = with lib; {
Expand Down
10 changes: 1 addition & 9 deletions pkgs/development/python-modules/pyjsparser/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
fetchFromGitHub,
buildPythonPackage,
pytestCheckHook,
js2py,
}:

let
Expand All @@ -21,18 +20,11 @@ let

nativeCheckInputs = [
pytestCheckHook
js2py
];

# escape infinite recursion with js2py
# js2py is needed for tests but it's unmaintained and insecure
doCheck = false;

passthru.tests = {
check = pyjsparser.overridePythonAttrs (_: {
doCheck = true;
});
};

pythonImportsCheck = [ "pyjsparser" ];

meta = with lib; {
Expand Down
1 change: 1 addition & 0 deletions pkgs/top-level/python-aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ mapAliases ({
jinja2_pluralize = jinja2-pluralize; # added 2023-11-01
jinja2_time = jinja2-time; # added 2022-11-07
JPype1 = jpype1; # added 2023-02-19
js2py = throw "js2py has been removed, as it is unmaintained and insecure"; # added 2024-10-17
jsonpath_rw = jsonpath-rw; # added 2024-01-06
jsonschema_3 = throw "jsonschema 3 is neither the latest version nor needed inside nixpkgs anymore"; # added 2023-06-28
jupyter_client = jupyter-client; # added 2021-10-15
Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6476,8 +6476,6 @@ self: super: with self; {
inherit (pkgs) jq;
};

js2py = callPackage ../development/python-modules/js2py { };

jsbeautifier = callPackage ../development/python-modules/jsbeautifier { };

jschema-to-python = callPackage ../development/python-modules/jschema-to-python { };
Expand Down

0 comments on commit 0f79dd4

Please sign in to comment.