From 02bb6d6d22dff3ff754ebbaad803cba9b3bcbb68 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Thu, 6 Nov 2025 10:48:52 -0800
Subject: [PATCH 1/4] python3Packages.yamlloader: cleanup

---
 pkgs/development/python-modules/yamlloader/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/yamlloader/default.nix b/pkgs/development/python-modules/yamlloader/default.nix
index 0add590d5bfb..2836ab6c78e8 100644
--- a/pkgs/development/python-modules/yamlloader/default.nix
+++ b/pkgs/development/python-modules/yamlloader/default.nix
@@ -7,7 +7,6 @@
   pytestCheckHook,
   pyyaml,
   hypothesis,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -15,8 +14,6 @@ buildPythonPackage rec {
   version = "1.5.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-wQrBMhpiaxyosJ0/Ov6YVbgYORxZmSp2tl5KLZXqxBs=";
@@ -39,11 +36,11 @@ buildPythonPackage rec {
     "yamlloader"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Case-insensitive list for Python";
     homepage = "https://github.com/Phynix/yamlloader";
     changelog = "https://github.com/Phynix/yamlloader/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ freezeboy ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ freezeboy ];
   };
 }

From 195b457d0017758b93cb313cfc8d7bc6884f6942 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Thu, 6 Nov 2025 10:52:23 -0800
Subject: [PATCH 2/4] python3Packages.yamlloader: build from GitHub source

---
 pkgs/development/python-modules/yamlloader/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/yamlloader/default.nix b/pkgs/development/python-modules/yamlloader/default.nix
index 2836ab6c78e8..354c735461d3 100644
--- a/pkgs/development/python-modules/yamlloader/default.nix
+++ b/pkgs/development/python-modules/yamlloader/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   hatch-vcs,
   hatchling,
   pytestCheckHook,
@@ -14,9 +14,11 @@ buildPythonPackage rec {
   version = "1.5.2";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-wQrBMhpiaxyosJ0/Ov6YVbgYORxZmSp2tl5KLZXqxBs=";
+  src = fetchFromGitHub {
+    owner = "Phynix";
+    repo = "yamlloader";
+    tag = version;
+    hash = "sha256-SNb1iXao+TNW872qDtEldZj6S+yJxRlsnw6ye92RFSk=";
   };
 
   build-system = [

From a508472eb413ed9b5a2c0ec28c24f6e9d0803e4d Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Thu, 6 Nov 2025 10:55:03 -0800
Subject: [PATCH 3/4] python3Packages.yamlloader: disable broken test file due
 to pickling error

---
 pkgs/development/python-modules/yamlloader/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/yamlloader/default.nix b/pkgs/development/python-modules/yamlloader/default.nix
index 354c735461d3..207e3dd7151e 100644
--- a/pkgs/development/python-modules/yamlloader/default.nix
+++ b/pkgs/development/python-modules/yamlloader/default.nix
@@ -33,6 +33,12 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTestPaths = [
+    # TypeError: cannot pickle '_thread.RLock' object
+    # https://github.com/Phynix/yamlloader/issues/64
+    "tests/test_ordereddict.py"
+  ];
+
   pythonImportsCheck = [
     "yaml"
     "yamlloader"

From fd1431e8d70e3fd69c8edbe6e2d7cbc0306f70c1 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Thu, 6 Nov 2025 11:10:57 -0800
Subject: [PATCH 4/4] python3Packages.yamlloader: add sarahec as maintainer

---
 pkgs/development/python-modules/yamlloader/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/yamlloader/default.nix b/pkgs/development/python-modules/yamlloader/default.nix
index 207e3dd7151e..d2e79d4d1bf0 100644
--- a/pkgs/development/python-modules/yamlloader/default.nix
+++ b/pkgs/development/python-modules/yamlloader/default.nix
@@ -49,6 +49,9 @@ buildPythonPackage rec {
     homepage = "https://github.com/Phynix/yamlloader";
     changelog = "https://github.com/Phynix/yamlloader/releases/tag/${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ freezeboy ];
+    maintainers = with lib.maintainers; [
+      freezeboy
+      sarahec
+    ];
   };
 }