From 9dcf79c2443a2d1b372802fbe70525e70ba9bab5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 20 Sep 2023 12:03:35 +0200 Subject: [PATCH] python310Packages.hyperpyyaml: fix --- .../python-modules/hyperpyyaml/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hyperpyyaml/default.nix b/pkgs/development/python-modules/hyperpyyaml/default.nix index 4e59a0ce771b..66207b734e45 100644 --- 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; }; }