Merge pull request NixOS#256286 from GaetanLepage/hyperpyyaml

python310Packages.hyperpyyaml: fix
khaneliman · Sep 20, 2023 · 86bb247 · 86bb247
2 parents 01636ce + 9dcf79c
commit 86bb247
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/pkgs/development/python-modules/hyperpyyaml/default.nix b/pkgs/development/python-modules/hyperpyyaml/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , pyyaml
 , ruamel-yaml
 , pytestCheckHook
@@ -18,6 +19,15 @@ buildPythonPackage rec {
     hash = "sha256-tC4kLJAY9MVgjWwU2Qu0rPCVDw7CjKVIciRZgYhnR9I=";
   };
 
+  patches = [
+    # This patch is needed to comply with the newer versions of ruamel.yaml.
+    # PR to upstream this change: https://github.com/speechbrain/HyperPyYAML/pull/23
+    (fetchpatch {
+      url = "https://github.com/speechbrain/HyperPyYAML/commit/95c6133686c42764770a77429eab55f6dfe5581c.patch";
+      hash = "sha256-WrHDo17f5pYNXSSqI8t1tlAloYms9oLFup7D2qCKwWw=";
+    })
+  ];
+
   propagatedBuildInputs = [
     pyyaml
     ruamel-yaml
@@ -35,7 +45,5 @@ buildPythonPackage rec {
     changelog = "https://github.com/speechbrain/HyperPyYAML/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ GaetanLepage ];
-    # hyperpyyaml is not compatible with the too new version of `ruaml-yaml`
-    broken = true;
   };
 }