Merge pull request #246922 from tjni/hydra-core

python3.pkgs.hydra-core: fix tests with setuptools 67.5.0+
NixOS · Aug 3, 2023 · d29508c · d29508c
2 parents fef2dfa + 22b8748
commit d29508c
Showing 1 changed file with 7 additions and 0 deletions.
diff --git 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 = ''