Merge pull request #188601 from anthonyroussel/pyjson5

python310Packages.pyjson5: remove duplicate package, python310Packages.json5: 0.9.6 -> 0.9.9

pkgs/development/python-modules/json5/default.nix

@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "json5";
-  version = "0.9.6";
+  version = "0.9.9";
 
   src = fetchFromGitHub {
     owner = "dpranke";
     repo = "pyjson5";
     rev = "v${version}";
-    sha256 = "sha256-RJj5KvLKq43tRuTwxq/mB+sU35xTQwZqg/jpdYcMP6A=";
+    hash = "sha256-0ommoTv5q7YuLNF+ZPWW/Xg/8CwnPrF7rXJ+eS0joUs=";
   };
 
   checkInputs = [
@@ -21,7 +21,9 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  pythonImportsCheck = [ "json5" ];
+  pythonImportsCheck = [
+    "json5"
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/dpranke/pyjson5";

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

pkgs/development/python-modules/pyjson5/default.nix

@@ -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 ];
-  };
-}

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

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 { };