From 22b8748c42d503772557c8b346caf13057918f5c Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 29 Jul 2023 21:45:57 -0700 Subject: [PATCH] python3.pkgs.hydra-core: fix tests with setuptools 67.5.0+ --- pkgs/development/python-modules/hydra-core/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/hydra-core/default.nix b/pkgs/development/python-modules/hydra-core/default.nix index 5bf37b45394b..5cade60d0e38 100644 --- a/pkgs/development/python-modules/hydra-core/default.nix +++ b/pkgs/development/python-modules/hydra-core/default.nix @@ -4,6 +4,7 @@ , antlr4-python3-runtime , buildPythonPackage , fetchFromGitHub +, fetchpatch , importlib-resources , jre_headless , omegaconf @@ -32,6 +33,12 @@ buildPythonPackage rec { src = ./antlr4.patch; antlr_jar = "${antlr4.out}/share/java/antlr-${antlr4.version}-complete.jar"; }) + # https://github.com/facebookresearch/hydra/pull/2731 + (fetchpatch { + name = "setuptools-67.5.0-test-compatibility.patch"; + url = "https://github.com/facebookresearch/hydra/commit/25873841ed8159ab25a0c652781c75cc4a9d6e08.patch"; + hash = "sha256-oUfHlJP653o3RDtknfb8HaaF4fpebdR/OcbKHzJFK/Q="; + }) ]; postPatch = ''