diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index 62730df149ea..38f146a71d13 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -7,7 +7,7 @@ , pythonOlder , requests , pytestCheckHook -, pyjson5 +, json5 , babel , jupyter_server , openapi-core @@ -40,7 +40,7 @@ buildPythonPackage rec { hatchling ]; - propagatedBuildInputs = [ requests jsonschema pyjson5 babel jupyter_server ]; + propagatedBuildInputs = [ requests jsonschema json5 babel jupyter_server ]; checkInputs = [ openapi-core diff --git a/pkgs/development/python-modules/pyjson5/default.nix b/pkgs/development/python-modules/pyjson5/default.nix deleted file mode 100644 index 232bafd3ba7e..000000000000 --- a/pkgs/development/python-modules/pyjson5/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ buildPythonPackage, lib, nose, fetchFromGitHub }: - -buildPythonPackage rec { - pname = "pyjson5"; - version = "0.8.5"; - - src = fetchFromGitHub { - owner = "dpranke"; - repo = pname; - rev = "v${version}"; - sha256 = "0nyngj18jlkgvm1177lc3cj47wm4yh3dqigygvcvw7xkyryafsqn"; - }; - - doCheck = true; - checkInputs = [ nose ]; - checkPhase = '' - nosetests - ''; - - meta = with lib; { - description = "Python implementation of the JSON5 data format"; - license = licenses.asl20; - homepage = "https://github.com/dpranke/pyjson5"; - maintainers = with maintainers; [ isgy ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 68c1ac090161..501c2acf079a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -126,6 +126,7 @@ mapAliases ({ pycryptodome-test-vectors = throw "pycryptodome-test-vectors has been removed because it is an internal package to pycryptodome"; # added 2022-05-28 pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07 pyialarmxr-homeassistant = throw "The package was removed together with the component support in home-assistant 2022.7.0"; # added 2022-07-07 + pyjson5 = json5; # added 2022-08-28 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 PyLD = pyld; # added 2022-06-22 pymc3 = pymc; # added 2022-06-05, module was rename starting with 4.0.0 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a66e6d5a87da..a34a02470f55 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7788,8 +7788,6 @@ in { pyjks = callPackage ../development/python-modules/pyjks { }; - pyjson5 = callPackage ../development/python-modules/pyjson5 { }; - pyjsparser = callPackage ../development/python-modules/pyjsparser { }; pyjwkest = callPackage ../development/python-modules/pyjwkest { };