From b592957ea148b619abca944c8a2a772809f51416 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 1 Nov 2021 22:00:09 +0100
Subject: [PATCH] python39Packages.ruamel-yaml-clib: normalise name, adopt

---
 .../{ruamel_yaml_clib => ruamel-yaml-clib}/default.nix        | 2 +-
 pkgs/development/python-modules/ruamel-yaml/0.16.nix          | 4 ++--
 pkgs/development/python-modules/ruamel-yaml/default.nix       | 4 ++--
 pkgs/top-level/python-aliases.nix                             | 1 +
 pkgs/top-level/python-packages.nix                            | 3 +--
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename pkgs/development/python-modules/{ruamel_yaml_clib => ruamel-yaml-clib}/default.nix (95%)

diff --git a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix b/pkgs/development/python-modules/ruamel-yaml-clib/default.nix
similarity index 95%
rename from pkgs/development/python-modules/ruamel_yaml_clib/default.nix
rename to pkgs/development/python-modules/ruamel-yaml-clib/default.nix
index c3d752bb55ef..b12920fc7640 100644
--- a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix
+++ b/pkgs/development/python-modules/ruamel-yaml-clib/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildPythonPackage rec {
-  pname = "ruamel.yaml.clib";
+  pname = "ruamel-yaml-clib";
   version = "0.2.4";
 
   src = fetchhg {
diff --git a/pkgs/development/python-modules/ruamel-yaml/0.16.nix b/pkgs/development/python-modules/ruamel-yaml/0.16.nix
index b5ca3fb6e78d..0d9b1b4a1637 100644
--- a/pkgs/development/python-modules/ruamel-yaml/0.16.nix
+++ b/pkgs/development/python-modules/ruamel-yaml/0.16.nix
@@ -3,7 +3,7 @@
 , fetchPypi
 , ruamel-base
 , ruamel-ordereddict
-, ruamel_yaml_clib ? null
+, ruamel-yaml-clib ? null
 , isPy27
 , isPyPy
 }:
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ ruamel-base ]
     ++ lib.optional isPy27 ruamel-ordereddict
-    ++ lib.optional (!isPyPy) ruamel_yaml_clib;
+    ++ lib.optional (!isPyPy) ruamel-yaml-clib;
 
   # causes namespace clash on py27
   dontUsePythonImportsCheck = isPy27;
diff --git a/pkgs/development/python-modules/ruamel-yaml/default.nix b/pkgs/development/python-modules/ruamel-yaml/default.nix
index 1d7773be0bf3..2a30bd95f968 100644
--- a/pkgs/development/python-modules/ruamel-yaml/default.nix
+++ b/pkgs/development/python-modules/ruamel-yaml/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , ruamel-base
-, ruamel_yaml_clib
+, ruamel-yaml-clib
 , isPyPy
 }:
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   propagatedBuildInputs = [ ruamel-base ]
-    ++ lib.optional (!isPyPy) ruamel_yaml_clib;
+    ++ lib.optional (!isPyPy) ruamel-yaml-clib;
 
   pythonImportsCheck = [ "ruamel.yaml" ];
 
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 8fdf532415e2..613593ecab75 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -81,6 +81,7 @@ mapAliases ({
   rotate-backups = throw "rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01
   ruamel_base = ruamel-base; # added 2021-11-01
   ruamel_yaml = ruamel-yaml; # added 2021-11-01
+  ruamel_yaml_clib = ruamel-yaml-clib; # added 2021-11-01
   scikitlearn = scikit-learn; # added 2021-07-21
   selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10
   setuptools_scm = setuptools-scm; # added 2021-06-03
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ce39b368af54..45f5b1f505f3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8206,8 +8206,7 @@ in {
 
   ruamel-yaml = callPackage ../development/python-modules/ruamel-yaml { };
 
-  ruamel-yaml-clib = self.ruamel_yaml_clib;
-  ruamel_yaml_clib = callPackage ../development/python-modules/ruamel_yaml_clib { };
+  ruamel-yaml-clib = callPackage ../development/python-modules/ruamel-yaml-clib { };
 
   rubymarshal = callPackage ../development/python-modules/rubymarshal { };