python39Packages.ruamel-ordereddict: normalise name, adopt

pkgs/development/python-modules/ruamel-ordereddict/default.nix

@@ -6,12 +6,13 @@
 }:
 
 buildPythonPackage rec {
-  pname = "ruamel.ordereddict";
+  pname = "ruamel-ordereddict";
   version = "0.4.15";
   disabled = isPy3k || isPyPy;
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "ruamel.ordereddict";
+    inherit version;
     sha256 = "d7d9cf8b11e7662deb460260cf062980cd84b87a1d0457132060ab9d44e0a5f4";
   };
 
@@ -19,6 +20,6 @@ buildPythonPackage rec {
     description = "A version of dict that keeps keys in insertion resp. sorted order";
     homepage = "https://sourceforge.net/projects/ruamel-ordereddict/";
     license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
-
 }

pkgs/development/python-modules/ruamel_yaml/0.16.nix

@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , ruamel-base
-, ruamel_ordereddict
+, ruamel-ordereddict
 , ruamel_yaml_clib ? null
 , isPy27
 , isPyPy
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   propagatedBuildInputs = [ ruamel-base ]
-    ++ lib.optional isPy27 ruamel_ordereddict
+    ++ lib.optional isPy27 ruamel-ordereddict
     ++ lib.optional (!isPyPy) ruamel_yaml_clib;
 
   # causes namespace clash on py27

pkgs/top-level/python2-packages.nix

@@ -528,8 +528,7 @@ with self; with super; {
 
   robotframework-ride = callPackage ../development/python-modules/robotframework-ride { };
 
-  ruamel-ordereddict = self.ruamel_ordereddict;
-  ruamel_ordereddict = callPackage ../development/python-modules/ruamel_ordereddict { };
+  ruamel-ordereddict = callPackage ../development/python-modules/ruamel-ordereddict { };
 
   ruamel_yaml = self.ruamel-yaml;
   ruamel-yaml = callPackage ../development/python-modules/ruamel_yaml/0.16.nix { };