From 3a0f6d4e3df333b408e30d88a929ce7016a895ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 29 Oct 2021 13:26:03 +0200
Subject: [PATCH 1/2] python310Packages.ruamel-yaml-clib: 0.2.0 -> 0.2.4, add
 SuperSandro2000 as maintainer

---
 .../python-modules/ruamel_yaml_clib/default.nix    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix
index c403239d5525..c3d752bb55ef 100644
--- a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix
+++ b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix
@@ -1,28 +1,28 @@
 { lib
 , buildPythonPackage
 , fetchhg
-, ruamel_base
-, ruamel_ordereddict ? null
-, isPy3k
 }:
 
 buildPythonPackage rec {
   pname = "ruamel.yaml.clib";
-  version = "0.2.0";
+  version = "0.2.4";
 
   src = fetchhg {
     url = "http://hg.code.sf.net/p/ruamel-yaml-clib/code";
     rev = version;
-    sha256 = "0kq6zi96qlm72lzj90fc2rfk6nm5kqhk6qxdl8wl9s3a42b0v6wl";
+    sha256 = "sha256-HQZY1opUvVQdXUHmsZmcYX2vfgjKsl6xATmVIXjnBlc=";
   };
 
-  # outputs match wheel
+  # no tests
   doCheck = false;
 
+  # circular depedency with ruamel-yaml
+  # pythonImportsCheck = [ "_ruamel_yaml" ];
+
   meta = with lib; {
     description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";
     homepage = "https://sourceforge.net/projects/ruamel-yaml-clib/";
     license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
-
 }

From 418bbe4a6c127d7dd2a43e02d8b23ba4c80cb4dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Mon, 1 Nov 2021 11:20:56 +0100
Subject: [PATCH 2/2] python39Packages.ruamel_yaml: remove python2 compatility
 from python3 file, add SuperSandro2000 as maintainer

---
 pkgs/development/python-modules/ruamel_yaml/0.16.nix   | 10 +++++-----
 .../development/python-modules/ruamel_yaml/default.nix |  9 ++-------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/ruamel_yaml/0.16.nix b/pkgs/development/python-modules/ruamel_yaml/0.16.nix
index ed2ddf330659..b4734d0a53cc 100644
--- a/pkgs/development/python-modules/ruamel_yaml/0.16.nix
+++ b/pkgs/development/python-modules/ruamel_yaml/0.16.nix
@@ -2,9 +2,9 @@
 , buildPythonPackage
 , fetchPypi
 , ruamel_base
-, ruamel_ordereddict ? null
+, ruamel_ordereddict
 , ruamel_yaml_clib ? null
-, isPy3k
+, isPy27
 , isPyPy
 }:
 
@@ -21,11 +21,11 @@ buildPythonPackage rec {
   doCheck = false;
 
   propagatedBuildInputs = [ ruamel_base ]
-    ++ lib.optional (!isPy3k) ruamel_ordereddict
+    ++ lib.optional isPy27 ruamel_ordereddict
     ++ lib.optional (!isPyPy) ruamel_yaml_clib;
 
   # causes namespace clash on py27
-  dontUsePythonImportsCheck = !isPy3k;
+  dontUsePythonImportsCheck = isPy27;
   pythonImportsCheck = [
     "ruamel.yaml"
     "ruamel.base"
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";
     homepage = "https://sourceforge.net/projects/ruamel-yaml/";
     license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
-
 }
diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix
index efd418e454d4..eeb200b57b47 100644
--- a/pkgs/development/python-modules/ruamel_yaml/default.nix
+++ b/pkgs/development/python-modules/ruamel_yaml/default.nix
@@ -2,9 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , ruamel_base
-, ruamel_ordereddict ? null
-, ruamel_yaml_clib ? null
-, isPy3k
+, ruamel_yaml_clib
 , isPyPy
 }:
 
@@ -21,11 +19,8 @@ buildPythonPackage rec {
   doCheck = false;
 
   propagatedBuildInputs = [ ruamel_base ]
-    ++ lib.optional (!isPy3k) ruamel_ordereddict
     ++ lib.optional (!isPyPy) ruamel_yaml_clib;
 
-  # causes namespace clash on py27
-  dontUsePythonImportsCheck = !isPy3k;
   pythonImportsCheck = [
     "ruamel.yaml"
     "ruamel.base"
@@ -35,6 +30,6 @@ buildPythonPackage rec {
     description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";
     homepage = "https://sourceforge.net/projects/ruamel-yaml/";
     license = licenses.mit;
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
-
 }