Merge pull request #249140 from natsukium/dm-haiku/fix

python310Packages.dm-haiku: fix build
NixOS · Aug 22, 2023 · 199b897 · 199b897
2 parents 8c5b429 + 862ba6f
commit 199b897
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix
@@ -1,5 +1,6 @@
 { buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , callPackage
 , lib
 , jmp
@@ -18,6 +19,21 @@ buildPythonPackage rec {
     hash = "sha256-EZx3o6PgTeFjTwI9Ko9H39EqPSE0yLWWpsdqX6ALlo4=";
   };
 
+  patches = [
+    # https://github.com/deepmind/dm-haiku/issues/717
+    (fetchpatch {
+      name = "remove-typing-extensions.patch";
+      url = "https://github.com/deepmind/dm-haiku/commit/c22867db1a3314a382bd2ce36511e2b756dc32a8.patch";
+      hash = "sha256-SxJc8FrImwMqTJ5OuJ1f4T+HfHgW/sGqXeIqlxEatlE=";
+    })
+    # https://github.com/deepmind/dm-haiku/pull/672
+    (fetchpatch {
+      name = "fix-find-namespace-packages.patch";
+      url = "https://github.com/deepmind/dm-haiku/commit/728031721f77d9aaa260bba0eddd9200d107ba5d.patch";
+      hash = "sha256-qV94TdJnphlnpbq+B0G3KTx5CFGPno+8FvHyu/aZeQE=";
+    })
+  ];
+
   outputs = [
     "out"
     "testsout"